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

Lyh server



查看合并请求 !1844

@@ -55,19 +55,26 @@ class RecommendedSuppliers extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
-        $project_list =  $this->deployBuildModel->list(['is_supplier'=>1]);//TODO::已开启推荐供应商
+        $projectModel = new Project();
+        $projectArr = $projectModel->selectField(['delete_status'=>0,'type'=>['in',[2,3,4]]],'id');
+        $project_list =  $this->deployBuildModel->list(['is_supplier'=>1,'project_id'=>['in',$projectArr]]);//TODO::已开启推荐供应商
         foreach ($project_list as $v){
         foreach ($project_list as $v){
-            echo date('Y-m-d H:i:s') . '推荐供应商执行的project_id:'.$v['project_id'] . PHP_EOL;
-            $result = $this->countPurchaser($v);
-            if($result !== false){
-                ProjectServer::useProject($v['project_id']);
-                $title = $this->getKeywords($v['project_id']);
-                if(!empty($title)){
-                    $this->savePurchaser($v['project_id'],$title);
-                }else{
-                    echo '关键词已取完'.PHP_EOL;
+            try {
+                echo date('Y-m-d H:i:s') . '推荐供应商执行的project_id:'.$v['project_id'] . PHP_EOL;
+                $result = $this->countPurchaser($v);
+                if($result !== false){
+                    ProjectServer::useProject($v['project_id']);
+                    $title = $this->getKeywords($v['project_id']);
+                    if(!empty($title)){
+                        $this->savePurchaser($v['project_id'],$title);
+                    }else{
+                        echo '关键词已取完'.PHP_EOL;
+                    }
+                    DB::disconnect('custom_mysql');
                 }
                 }
-                DB::disconnect('custom_mysql');
+            }catch (\Exception $e){
+                echo date('Y-m-d hH:i:s').'当前项目执行错误：'.$e->getMessage().PHP_EOL;
+                continue;
             }
             }
         }
         }
         return true;
         return true;
@@ -152,7 +159,7 @@ class RecommendedSuppliers extends Command
             'total'=>$this->param['row'] ?? 10,
             'total'=>$this->param['row'] ?? 10,
         ];
         ];
         $res = http_post($url,json_encode($param));
         $res = http_post($url,json_encode($param));
-        echo '请求返回状态'. $res['code']?? ''.PHP_EOL;
+        echo '请求返回状态'. ($res['code']?? '').PHP_EOL;
 //        echo date('Y-m-d H:i:s') . json_encode($res) . PHP_EOL;
 //        echo date('Y-m-d H:i:s') . json_encode($res) . PHP_EOL;
         if(!empty($res) && isset($res['code']) && $res['code'] == 200 && !empty($res['data'])){
         if(!empty($res) && isset($res['code']) && $res['code'] == 200 && !empty($res['data'])){
             //保存多条数据
             //保存多条数据