Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -68,6 +68,7 @@ class RecommendedSuppliers extends Command
                     if(!empty($title)){
                     if(!empty($title)){
                         $this->savePurchaser($v['project_id'],$title);
                         $this->savePurchaser($v['project_id'],$title);
                     }else{
                     }else{
+                        $this->deployBuildModel->edit(['is_supplier'=>0],['project_id'=>$v['project_id']]);
                         echo '关键词已取完'.PHP_EOL;
                         echo '关键词已取完'.PHP_EOL;
                     }
                     }
                     DB::disconnect('custom_mysql');
                     DB::disconnect('custom_mysql');
@@ -152,14 +153,14 @@ class RecommendedSuppliers extends Command
         ];
         ];
         ksort($data);
         ksort($data);
         $token = 'company_list+'.date('Y-m-d').'+'.http_build_query($data);
         $token = 'company_list+'.date('Y-m-d').'+'.http_build_query($data);
-//        echo date('Y-m-d H:i:s') . '加密token:'.md5($token) . PHP_EOL;
+        $keyword = rtrim($keyword, "\r");
         $param = [
         $param = [
             'prod_desc'=>$keyword,
             'prod_desc'=>$keyword,
             'token'=>md5($token),
             'token'=>md5($token),
             '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']?? '').json_encode($res,true).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'])){
             //保存多条数据
             //保存多条数据
@@ -172,6 +173,10 @@ class RecommendedSuppliers extends Command
             $purchaserModel->add($saveData);
             $purchaserModel->add($saveData);
             $this->savePurchaserInfo($project_id,$keyword,$res['data']);
             $this->savePurchaserInfo($project_id,$keyword,$res['data']);
         }else{
         }else{
+            if(isset($res['code']) && $res['code'] == 403){
+                echo '请求错误，跳过当前项目。避免进入死循环'.PHP_EOL;
+                return true;
+            }
             $title = $this->getKeywords($project_id);
             $title = $this->getKeywords($project_id);
             $this->savePurchaser($project_id,$title);
             $this->savePurchaser($project_id,$title);
         }
         }

@@ -37,6 +37,7 @@ class CheckListController extends BaseController
      * @time   :2025/4/17 9:31
      * @time   :2025/4/17 9:31
      */
      */
     public function lists(){
     public function lists(){
+        $this->map['status'] = 1;
         $field = ['id','status','sort','text','created_at'];
         $field = ['id','status','sort','text','created_at'];
         $data = $this->model->lists($this->map,$this->page,$this->row,'id',$field);
         $data = $this->model->lists($this->map,$this->page,$this->row,'id',$field);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);