Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

Your Name
app/Console/Commands/Domain/DomainInfo.php
app/Console/Commands/Update/UpdateKeyword.php
app/Console/Kernel.php
app/Http/Controllers/Bside/Product/KeywordController.php
app/Http/Logic/Aside/Domain/DomainInfoLogic.php
app/Http/Logic/Bside/BaseLogic.php
app/Models/Product/KeywordPage.php
--- a/app/Console/Commands/Domain/DomainInfo.php
查看文件 @8ee2294
+++ b/app/Console/Commands/Domain/DomainInfo.php
查看文件 @8ee2294
@@ -10,6 +10,7 @@
 namespace App\Console\Commands\Domain;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\ServersIp;
 use App\Models\Project\CountryCustom;
 use App\Models\Project\Project;
 use Illuminate\Console\Command;
@@ -98,13 +99,18 @@ class DomainInfo extends Command
             $ssl['to'] && $data['certificate_end_time'] = $ssl['to'];
             $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
-            if ($v['type'] == 1 && $ssl['to'] < $end_day && $project_info && $project_info['serve_id'] != ServerConfig::SELF_SITE_ID) {
-                //非自建站项目，申请免费证书
-                $this->updatePrivate($v);
+            if ($v['type'] == 1 && $ssl['to'] < $end_day && $project_info) {
+                $serverIpModel = new ServersIp();
+                $servers_ip_info = $serverIpModel->read(['id' => $project_info['serve_id']], ['servers_id']);
+                if ($servers_ip_info && $servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
+                    //非自建站项目，申请免费证书
+                    $this->updatePrivate($v);
+
+                    $ssl_new = $this->updateDomainSsl($v['domain']);
+                    $ssl_new['from'] && $data['certificate_start_time'] = $ssl_new['from'];
+                    $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
+                }
-                $ssl_new = $this->updateDomainSsl($v['domain']);
-                $ssl_new['from'] && $data['certificate_start_time'] = $ssl_new['from'];
-                $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
             }
             $domainModel->edit($data, ['id' => $v['id']]);
@@ -142,13 +148,17 @@ class DomainInfo extends Command
             $ssl['to'] && $data['amp_certificate_end_time'] = $ssl['to'];
             $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
-            if ($v['amp_type'] == 1 && $ssl['to'] < $end_day && $project_info && $project_info['serve_id'] != ServerConfig::SELF_SITE_ID) {
-                //非自建站项目，申请免费证书
-                $this->updateAmpPrivate($v['domain']);
+            if ($v['amp_type'] == 1 && $ssl['to'] < $end_day && $project_info) {
+                $serverIpModel = new ServersIp();
+                $servers_ip_info = $serverIpModel->read(['id' => $project_info['serve_id']], ['servers_id']);
+                if ($servers_ip_info && $servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
+                    //非自建站项目，申请免费证书
+                    $this->updateAmpPrivate($v['domain']);
-                $ssl_new = $this->updateDomainSsl($v['domain']);
-                $ssl_new['from'] && $data['certificate_start_time'] = $ssl_new['from'];
-                $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
+                    $ssl_new = $this->updateDomainSsl($v['domain']);
+                    $ssl_new['from'] && $data['certificate_start_time'] = $ssl_new['from'];
+                    $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
+                }
             }
             $domainModel->edit($data, ['id' => $v['id']]);
--- a/app/Console/Commands/Update/UpdateKeyword.php 0 → 100644
查看文件 @8ee2294
+++ b/app/Console/Commands/Update/UpdateKeyword.php 0 → 100644
查看文件 @8ee2294
+<?php
+/**
+ * @remark :
+ * @name   :UpdateKeyword.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/7/3 9:23
+ */
+
+namespace App\Console\Commands\Update;
+
+use App\Models\Domain\DomainInfo;
+use App\Models\Product\Keyword;
+use App\Models\Product\KeywordPage;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class UpdateKeyword extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'update_keyword';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '批量更新关键词内容';
+
+
+    public function handle(){
+        while (true){
+            $keywordPageModel = new KeywordPage();
+            $lists = $keywordPageModel->list(['status'=>0]);
+            if(empty($lists)){
+                sleep(100);
+                continue;
+            }
+            $domainModel = new DomainInfo();
+            foreach ($lists as $v){
+                ProjectServer::useProject($v['project_id']);
+                $this->saveKeywordContent($v);
+                DB::disconnect('custom_mysql');
+                //获取当前项目的域名
+                $domainInfo = $domainModel->read(['project_id'=>$v['project_id']]);
+                if($domainInfo !== false){
+                    $this->curlDelRoute($domainInfo['domain'],$v['project_id']);
+                }
+            }
+            sleep(10);
+        }
+
+    }
+
+    /**
+     * @remark :更新关键词内容
+     * @name   :saveKeywordContent
+     * @author :lyh
+     * @method :post
+     * @time   :2024/7/3 10:25
+     */
+    public function saveKeywordContent($info){
+        $keywordModel = new Keyword();
+        $updateObject = json_decode($info['update_object'],true);
+        $text = json_decode($info['text'],true);
+        if(empty($text)){
+            return false;
+        }
+        $number = count($info['text']);
+        $randomNumber = rand(0, $number - 1);
+        if($updateObject['type'] == 0){//更新所有关键字
+            $keywordModel->edit(['keyword_content'=>$text[$randomNumber]],['status'=>1]);
+        }else{
+            //按传递的关键字更新
+            if(!empty($updateObject['keyword'])){
+                $updateObject['keyword'] = (array)$updateObject['keyword'];
+                $keywordModel->edit(['keyword_content'=>$text[$randomNumber]],['title'=>['in',$updateObject['keyword']]]);
+            }
+            //按给定的数量更新
+            if(!empty($updateObject['number']) && ($updateObject['number'] != 0)){
+                $keywordIdArr = $keywordModel->where("status",1)->inRandomOrder()->take($updateObject['number'])->pluck('id')->toArray();
+                $keywordModel->edit(['keyword_content'=>$text[$randomNumber]],['id'=>['in',$keywordIdArr]]);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * @remark :删除路由通知C端
+     * @name   :curlDelRoute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/30 14:43
+     */
+    public function curlDelRoute($domain,$project_id){
+        if (strpos($domain, 'https://') === false) {
+            $domain = 'https://' . $domain . '/';
+        }
+        $url = $domain.'api/update_page/?project_id='.$project_id.'&route=4';
+        shell_exec('curl -k "'.$url.'"');
+        return true;
+    }
+}
--- a/app/Console/Kernel.php
查看文件 @8ee2294
+++ b/app/Console/Kernel.php
查看文件 @8ee2294
@@ -49,6 +49,8 @@ class Kernel extends ConsoleKernel
         $schedule->command('update_keyword_route')->dailyAt('01:00')->withoutOverlapping(1); //升级项目--清除路由相同的关键字
         $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
         // 每日推送视频任务
+        $schedule->command('update_keyword')->hourly()->withoutOverlapping(1);
+        // 每日推送视频任务
         $schedule->command('video_task')->hourly()->withoutOverlapping(1);
         // 每日推送已完成视频任务项目生成对应界面
         $schedule->command('notice_c')->dailyAt('04:00')->withoutOverlapping(1);
--- a/app/Http/Controllers/Bside/Product/KeywordController.php
查看文件 @8ee2294
+++ b/app/Http/Controllers/Bside/Product/KeywordController.php
查看文件 @8ee2294
@@ -256,6 +256,7 @@ class KeywordController extends BaseController
         $keywordPageModel = new KeywordPage();
         $this->param['text'] = json_encode($this->param['text']);
         $this->param['update_object'] = json_encode($this->param['update_object']);
+        $this->param['project_id'] = $this->user['project_id'];
         $id = $keywordPageModel->addReturnId($this->param);
         $this->response('success',Code::SUCCESS,['id'=>$id]);
     }
--- a/app/Http/Logic/Aside/Domain/DomainInfoLogic.php
查看文件 @8ee2294
+++ b/app/Http/Logic/Aside/Domain/DomainInfoLogic.php
查看文件 @8ee2294
@@ -268,10 +268,10 @@ class DomainInfoLogic extends BaseLogic
         $serverModel = new Servers();
         $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
         $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
-        if($project_info['serve_id'] == 9){
+        if($serversIpInfo['servers_id'] == 7){
             $this->fail('请切换服务器,生成站点不能使用测试服务器');
         }
-        if($project_info['serve_id'] == ServerConfig::SELF_SITE_ID){
+        if($serversIpInfo['servers_id'] == ServerConfig::SELF_SITE_ID){
             $this->model->edit(['amp_status' => $this->param['amp_status'] ?? 0,],['id'=>$this->param['id']]);
             $this->fail('自建站服务器无法生成站点');
         }
@@ -391,6 +391,12 @@ class DomainInfoLogic extends BaseLogic
             $serverModel = new Servers();
             $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
             $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
+            if($serversIpInfo['servers_id'] == 7){
+                $this->fail('请切换服务器,生成站点不能使用测试服务器');
+            }
+            if($serversIpInfo['servers_id'] == ServerConfig::SELF_SITE_ID){
+                $this->fail('自建站服务器无法生成站点');
+            }
             //域名是否都已经解析
             if(strpos($this->param['custom_domain'],'//') === false){
                 $this->param['custom_domain'] = '//'.$this->param['custom_domain'];
--- a/app/Http/Logic/Bside/BaseLogic.php
查看文件 @8ee2294
+++ b/app/Http/Logic/Bside/BaseLogic.php
查看文件 @8ee2294
@@ -8,6 +8,7 @@ use App\Exceptions\BsideGlobalException;
 use App\Http\Logic\Logic;
 use App\Models\Com\UpdateNotify;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\ServersIp;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteDelete;
 use App\Models\Service\Service;
@@ -175,11 +176,13 @@ class BaseLogic extends Logic
         $data['project_id'] = $this->user['project_id'];
         $str = http_build_query($data);
         $url = $this->user['domain'].'api/delHtml/?'.$str;
-        if(isset($this->project['serve_id']) && ($this->project['serve_id'] == ServerConfig::SELF_SITE_ID)){
+        $serverIpModel = new ServersIp();
+        $serversIpInfo = $serverIpModel->read(['id'=>$this->project['serve_id']],['servers_id']);
+        if($serversIpInfo && ($serversIpInfo['servers_id'] == ServerConfig::SELF_SITE_ID)){
             //自建站服务器直接返回
             return $this->success();
         }
-        if(isset($this->project['serve_id']) && ($this->project['serve_id'] != 1)){//TODO::当前项目通知不过 ，跳过自动更新
+        if($serversIpInfo && ($serversIpInfo['servers_id'] != 1)){//TODO::当前项目通知不过 ，跳过自动更新
             exec('curl -k "'.$url.'" > /dev/null 2>&1 &');
         }else{
             shell_exec('curl -k "'.$url.'"');
--- a/app/Models/Product/KeywordPage.php
查看文件 @8ee2294
+++ b/app/Models/Product/KeywordPage.php
查看文件 @8ee2294
@@ -14,6 +14,4 @@ use App\Models\Base;
 class KeywordPage extends Base
 {
     protected $table = 'gl_product_keyword_page';
-    //连接数据库
-    protected $connection = 'custom_mysql';
 }