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

Master server



查看合并请求 !915

@@ -25,6 +25,9 @@ class OperationHeartbeatController extends BaseController
      * @time   :2024/8/28 14:03
      * @time   :2024/8/28 14:03
      */
      */
     public function saveHeartbeat(){
     public function saveHeartbeat(){
+        if($this->user['project_id'] == 1){
+            $this->response('success');
+        }
         $this->request->validate([
         $this->request->validate([
             'source'=>'required',
             'source'=>'required',
             'source_id'=>'required',
             'source_id'=>'required',
@@ -64,6 +67,10 @@ class OperationHeartbeatController extends BaseController
      * @time   :2024/8/28 14:29
      * @time   :2024/8/28 14:29
      */
      */
     public function getInfo(){
     public function getInfo(){
+        if($this->user['project_id'] == 1){
+            $info['status'] = 0;
+            $this->response('success',Code::SUCCESS,$info);
+        }
         $this->request->validate([
         $this->request->validate([
             'source'=>'required',
             'source'=>'required',
             'source_id'=>'required',
             'source_id'=>'required',

@@ -273,7 +273,7 @@ class KeywordController extends BaseController
             'keyword_id.required' => '关键词id不能为空',
             'keyword_id.required' => '关键词id不能为空',
             'product_id.required' => '产品id不为空',
             'product_id.required' => '产品id不为空',
         ]);
         ]);
-        $logic->delRelated($this->param['keyword'],$this->param['product_id']);
+        $logic->delRelated($this->param['keyword_id'],$this->param['product_id']);
         $this->response('success');
         $this->response('success');
     }
     }
 }
 }