合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !1997

@@ -46,10 +46,10 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-        $projectIds = DB::table('gl_project_ai_setting')
+        $projectIds = DB::table('gl_project_ai_setting_copy1')
             ->whereIn('mch_id', function ($query) {
             ->whereIn('mch_id', function ($query) {
                 $query->select('mch_id')
                 $query->select('mch_id')
-                    ->from('gl_project_ai_setting')
+                    ->from('gl_project_ai_setting_copy1')
                     ->groupBy('mch_id')
                     ->groupBy('mch_id')
                     ->havingRaw('COUNT(*) > 1');
                     ->havingRaw('COUNT(*) > 1');
             })
             })
@@ -92,13 +92,13 @@ class lyhDemo extends Command
             if(empty($info['is_ai_blog'])){
             if(empty($info['is_ai_blog'])){
                 $info['is_ai_blog'] = 1;
                 $info['is_ai_blog'] = 1;
             }
             }
-            try {
+//            try {
                 $this->setAiBlog($info['id'],$info['main_lang_id'],$info['is_ai_blog'] ?? 0,
                 $this->setAiBlog($info['id'],$info['main_lang_id'],$info['is_ai_blog'] ?? 0,
                     $info['company']??"", $info['deploy_optimize']['company_en_name'] ?? '',
                     $info['company']??"", $info['deploy_optimize']['company_en_name'] ?? '',
                     $info['deploy_optimize']['company_en_description'] ?? '',$info['is_ai_video'] ?? 0,$info['is_related_video'] ?? 0);
                     $info['deploy_optimize']['company_en_description'] ?? '',$info['is_ai_video'] ?? 0,$info['is_related_video'] ?? 0);
-            }catch (\Exception $e){
-                continue;
-            }
+//            }catch (\Exception $e){
+//                continue;
+//            }
 
 
         }
         }
         return true;
         return true;
@@ -107,6 +107,7 @@ class lyhDemo extends Command
         if(empty($main_lang_id) || (empty($is_ai_blog) && empty($is_ai_video))){
         if(empty($main_lang_id) || (empty($is_ai_blog) && empty($is_ai_video))){
             echo '创建失败：'.$project_id.PHP_EOL;
             echo '创建失败：'.$project_id.PHP_EOL;
         }
         }
+        $this->model = new Project();
         $projectInfo = $this->model->read(['id'=>$project_id],['title','main_lang_id','company']);
         $projectInfo = $this->model->read(['id'=>$project_id],['title','main_lang_id','company']);
         $projectOptimize = DeployOptimize::where('project_id', $project_id)->first();
         $projectOptimize = DeployOptimize::where('project_id', $project_id)->first();
         //获取项目主语种
         //获取项目主语种