周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 2eed45b8ef321b414048f0b4b90fe88cd16d6f32 2 个父辈 cfd2c5cc 9a2453f2

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 7 行增加 和 3 行删除
@@ -133,7 +133,7 @@ class HtmlCollect extends Command @@ -133,7 +133,7 @@ class HtmlCollect extends Command
133 //关闭数据库 133 //关闭数据库
134 DB::disconnect('custom_mysql'); 134 DB::disconnect('custom_mysql');
135 135
136 - sleep(2); 136 +// sleep(2);
137 return true; 137 return true;
138 } 138 }
139 139
@@ -126,7 +126,7 @@ class HtmlLanguageCollect extends Command @@ -126,7 +126,7 @@ class HtmlLanguageCollect extends Command
126 //关闭数据库 126 //关闭数据库
127 DB::disconnect('custom_mysql'); 127 DB::disconnect('custom_mysql');
128 128
129 - sleep(2); 129 +// sleep(2);
130 return true; 130 return true;
131 } 131 }
132 132
@@ -65,7 +65,11 @@ class OptimizeController extends BaseController @@ -65,7 +65,11 @@ class OptimizeController extends BaseController
65 * @time :2024/1/25 14:36 65 * @time :2024/1/25 14:36
66 */ 66 */
67 public function importOptimize(Project $project){ 67 public function importOptimize(Project $project){
68 - $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']) 68 + $query = $project->select(['gl_project.title AS title',
  69 + 'gl_project_deploy_optimize.domain AS domain',
  70 + 'gl_project.is_translate AS is_translate',
  71 + 'gl_project.is_translate_tag AS is_translate_tag',
  72 + 'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid'])
69 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 73 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
70 ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id'); 74 ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
71 $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目 75 $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目