Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -133,7 +133,7 @@ class HtmlCollect extends Command
         //关闭数据库
         DB::disconnect('custom_mysql');
 
-        sleep(2);
+//        sleep(2);
         return true;
     }
 

@@ -126,7 +126,7 @@ class HtmlLanguageCollect extends Command
         //关闭数据库
         DB::disconnect('custom_mysql');
 
-        sleep(2);
+//        sleep(2);
         return true;
     }
 

@@ -65,7 +65,11 @@ class OptimizeController extends BaseController
      * @time   :2024/1/25 14:36
      */
     public function importOptimize(Project $project){
-        $query = $project->select(['gl_project.title AS title','gl_project_deploy_optimize.domain AS domain','gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid'])
+        $query = $project->select(['gl_project.title AS title',
+            'gl_project_deploy_optimize.domain AS domain',
+            'gl_project.is_translate AS is_translate',
+            'gl_project.is_translate_tag AS is_translate_tag',
+            'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid'])
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目