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

Lyh server



查看合并请求 !1992

@@ -43,7 +43,7 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-        $projectIds = DB::table('gl_project_ai_setting_copy1')
+        $projectIds = DB::table('gl_project_ai_setting')
             ->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')
@@ -57,39 +57,47 @@ class lyhDemo extends Command
         $projectIds[] = 2201;
         $projectIds[] = 2201;
         $projectIds[] = 2260;
         $projectIds[] = 2260;
         $projectIds[] = 2259;
         $projectIds[] = 2259;
-        foreach ($projectIds as $item){
-            $projectAiSettingModel = new ProjectAiSetting();
-            $settingInfo = $projectAiSettingModel->read(['project_id'=>$item]);
-            ProjectServer::useProject($item);
-            $aiBlogService = new AiBlogService();
-            $aiBlogService->mch_id = $settingInfo['mch_id'];
-            $aiBlogService->key = $settingInfo['key'];
-            $result = $aiBlogService->createAuthor();
-            $aiBlogTaskModel = new AiBlogTask();
-            if($result['status'] == 200){
-                //查看当前是否已有未执行的
-                $aiBlogTaskModel->add(['project_id'=>$item,'status'=>1,'type'=>1]);
-            }
-            DB::disconnect('custom_mysql');
-        }
+//        foreach ($projectIds as $item){
+////            echo '执行的项目id:'.$item.PHP_EOL;
+//            $projectAiSettingModel = new ProjectAiSetting();
+//            $settingInfo = $projectAiSettingModel->read(['project_id'=>$item]);
+//            if($settingInfo === false){
+//                echo '未查询到：'.$item;
+//                continue;
+//            }
+//            ProjectServer::useProject($item);
+//            $aiBlogService = new AiBlogService();
+//            $aiBlogService->mch_id = $settingInfo['mch_id'];
+//            $aiBlogService->key = $settingInfo['key'];
+//            $result = $aiBlogService->createAuthor();
+//            $aiBlogTaskModel = new AiBlogTask();
+//            if($result['status'] == 200){
+//                //查看当前是否已有未执行的
+//                $aiBlogTaskModel->add(['project_id'=>$item,'status'=>1,'type'=>1]);
+//            }
+//            DB::disconnect('custom_mysql');
+//        }
 
 
 //        $projectAiSettingModel = new ProjectAiSetting();
 //        $projectAiSettingModel = new ProjectAiSetting();
 //        $projectAiSettingModel->del(['project_id'=>['in',$projectIds]]);
 //        $projectAiSettingModel->del(['project_id'=>['in',$projectIds]]);
-//        $projectModel = new Project();
-//        $logic = new ProjectLogic();
-//        $lists = $projectModel->list(['delete_status' => 0,'extend_type'=>0,'id'=>['in',$projectIds]], 'id', ['id']);
-//        foreach ($lists as $val) {
-//            //清空作者
-//            ProjectServer::useProject($val['id']);
-//            AiBlogAuthor::truncate();
-//            DB::disconnect('custom_mysql');
-//            //重新创建项目拉取作者
-//            $info = $logic->getProjectInfo($val['id']);
+        $projectModel = new Project();
+        $logic = new ProjectLogic();
+        $lists = $projectModel->list(['delete_status' => 0,'extend_type'=>0,'id'=>['in',$projectIds]], 'id', ['id']);
+        $title = [];
+        foreach ($lists as $val) {
+            //清空作者
+            ProjectServer::useProject($val['id']);
+            AiBlogAuthor::truncate();
+            DB::disconnect('custom_mysql');
+            //重新创建项目拉取作者
+            $info = $logic->getProjectInfo($val['id']);
 //            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $val['id'] . PHP_EOL;
 //            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $val['id'] . PHP_EOL;
+            $title[] = $info['company']?:$info['title'];
 //            $logic->setAiBlog($info['id'],$info['main_lang_id'],$info['is_ai_blog'] ?? 0,
 //            $logic->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);
-//        }
+        }
+        dd($title);
         return true;
         return true;
     }
     }