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

赵彬吉
app/Console/Commands/Domain/DomainInfo.php
app/Console/Commands/Project/CopyOldProject.php
app/Console/Commands/Project/CopyProject.php
app/Http/Controllers/Aside/Optimize/OptimizeController.php
app/Models/GoogleKeywordInsight/GoogleKeywordInsightDetail.php
--- a/app/Console/Commands/Domain/DomainInfo.php
查看文件 @e15efc5
+++ b/app/Console/Commands/Domain/DomainInfo.php
查看文件 @e15efc5
@@ -68,9 +68,10 @@ class DomainInfo extends Command
         $domainModel = new DomainInfoModel();
         $projectModel = new Project();
         $serverIpModel = new ServersIp();
+        $domainCreateTaskModel = new DomainCreateTask();
         $list = $domainModel->where('status', '=', 1)->get();
         foreach ($list as $v) {
-            $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']);
+            $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id', 'project_type']);
             if (!$project_info) {
                 continue;
             }
@@ -89,6 +90,17 @@ class DomainInfo extends Command
                 }
             }
+            //判断是否已经建站
+            if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
+                $type = DomainCreateTask::TYPE_BLOG;
+            } else {
+                $type = DomainCreateTask::TYPE_MAIN;
+            }
+            $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => DomainCreateTask::STATUS_SUC], ['id']);
+            if (!$task_info) {
+                continue;
+            }
+
             //获取主站证书有效期并更新
             $ssl_time = $this->getDomainSslTime($v['domain']);
             if ($ssl_time['from'] && $ssl_time['to']) {
@@ -168,7 +180,7 @@ class DomainInfo extends Command
             }
             //创建更新站点证书任务
-            $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]);
+            $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
             if (!$task_info) {
                 $domainCreateTaskModel->add([
                     'server_id' => $servers_ip_info['servers_id'],
@@ -225,7 +237,7 @@ class DomainInfo extends Command
             }
             //创建更新站点证书任务
-            $task_info = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_AMP, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]);
+            $task_info = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_AMP, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
             if (!$task_info) {
                 $domainCreateTaskModel->add([
                     'server_id' => $servers_ip_info['servers_id'],
@@ -273,7 +285,7 @@ class DomainInfo extends Command
             }
             //创建更新站点证书任务
-            $task_info = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_CUSTOM, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]);
+            $task_info = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_CUSTOM, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
             if (!$task_info) {
                 $domainCreateTaskModel->add([
                     'server_id' => $servers_ip_info['servers_id'],
--- a/app/Console/Commands/Project/CopyOldProject.php
查看文件 @e15efc5
+++ b/app/Console/Commands/Project/CopyOldProject.php
查看文件 @e15efc5
@@ -84,7 +84,11 @@ class CopyOldProject extends Command
                 'gl_customer_visit_item',
                 'gl_inquiry_other',
                 'gl_inquiry_form_data',
-                'gl_inquiry_form'
+                'gl_inquiry_form',
+                'gl_ai_blog',
+                'gl_ai_blog_author',
+                'gl_ai_blog_list',
+                'gl_ai_blog_log',
             ])) {
                 continue;
             }
--- a/app/Console/Commands/Project/CopyProject.php
查看文件 @e15efc5
+++ b/app/Console/Commands/Project/CopyProject.php
查看文件 @e15efc5
@@ -238,17 +238,20 @@ class CopyProject extends Command
         $tables = array_column($tables, 'Tables_in_' . $database_name);
         foreach ($tables as $table) {
             // 1. 删除目标数据库中的表
-            DB::connection('custom_mysql')->statement("DROP TABLE IF EXISTS {$table}");
+            $result = DB::connection('custom_mysql')->statement("DROP TABLE IF EXISTS {$table}");
+            @file_put_contents(storage_path('logs/copy_mysql_error.log'), var_export('先删除对应数据库的对应表返回结果：'.$result, true) . PHP_EOL, FILE_APPEND);
             // 2. 复制建表 SQL
             $sql = DB::connection('custom_tmp_mysql_copy')->select("SHOW CREATE TABLE `{$table}`");
-            DB::connection('custom_mysql')->statement(get_object_vars($sql[0])['Create Table']);
+            $result1 = DB::connection('custom_mysql')->statement(get_object_vars($sql[0])['Create Table']);
+            @file_put_contents(storage_path('logs/copy_mysql_error.log'), var_export('创建对应表数据：'.$result1, true) . PHP_EOL, FILE_APPEND);
             // 3. 跳过指定的表
-            if (in_array($table, ['gl_customer_visit', 'gl_customer_visit_item', 'gl_inquiry_other', 'gl_inquiry_form_data', 'gl_inquiry_form'])) {
+            if (in_array($table, ['gl_customer_visit', 'gl_customer_visit_item', 'gl_inquiry_other', 'gl_inquiry_form_data', 'gl_inquiry_form','gl_ai_blog', 'gl_ai_blog_author', 'gl_ai_blog_list','gl_ai_blog_log'])) {
                 continue;
             }
             // 4. 原生 SQL 插入数据（完全复制）
             $insert_sql = "INSERT INTO `{$table}` SELECT * FROM `gl_data_{$project_id}`.`{$table}`";
-            DB::connection('custom_mysql')->statement($insert_sql);
+            $result2 = DB::connection('custom_mysql')->statement($insert_sql);
+            @file_put_contents(storage_path('logs/copy_mysql_error.log'), var_export('对应表插入数据：'.$result2, true) . PHP_EOL, FILE_APPEND);
             // 5. 更新 project_id（如果存在）
             if (Schema::connection('custom_mysql')->hasColumn($table, 'project_id')) {
                 DB::connection('custom_mysql')->table($table)->update(['project_id' => $news_project_id]);
--- a/app/Http/Controllers/Aside/Optimize/OptimizeController.php
查看文件 @e15efc5
+++ b/app/Http/Controllers/Aside/Optimize/OptimizeController.php
查看文件 @e15efc5
@@ -249,7 +249,7 @@ class OptimizeController extends BaseController
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
         }
         if(isset($this->map['site_status'])){
-            $query = $query->where('gl_project_deploy_build.site_status',$this->map['site_status']);
+            $query = $query->where('gl_project.site_status',$this->map['site_status']);
         }
         if(isset($this->map['seo_plan'])){
             $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
--- a/app/Models/GoogleKeywordInsight/GoogleKeywordInsightDetail.php
查看文件 @e15efc5
+++ b/app/Models/GoogleKeywordInsight/GoogleKeywordInsightDetail.php
查看文件 @e15efc5
@@ -27,6 +27,9 @@ class GoogleKeywordInsightDetail extends Base
         $saveData = [];
         $textArr = array_column($data, 'text');
         $transData = Translate::tran($textArr, 'zh');
+        if(!is_array($transData)){
+            $transData = [$transData];
+        }
         foreach ($data as $key => $val){
             $saveData[] = [
                 'search'=>$keyword,