采集器接口行任务规则添加字段

app/JsonRpc/CollectorService.php

@@ -120,9 +120,9 @@ class CollectorService implements CollectorServiceInterface
             $where = [
                 ['web_id','=',$data['id']]
             ];
-            //判断此网站下是否规则任务
+            //判断此网站下是否规则u任务
             $rule = Rule::where($where)->get();
-            if(empty($rule)){
+            if(empty($rle)){
                 //若没有直接删除网站
                 $result['web'] = Web::where('id',$data['id'])->delete();
             }else{
@@ -203,6 +203,10 @@ class CollectorService implements CollectorServiceInterface
                         // var_dump("============3============");       
                         break;              
                 }
+                if(!empty($data['parameter']) && $data['type'] == 1){
+
+                    $rule ['parameter'] = $data['parameter'];
+                }
                 if(!empty($data['source']) && $data['type'] != 3){
 
                     $rule ['source'] = $data['source'];

composer.json

@@ -34,7 +34,7 @@
         "hyperf/nacos": "^3.1",
         "hyperf/process": "~3.1.0",
         "hyperf/redis": "~3.1.0",
-        "hyperf/rpc-server": "*",
+        "hyperf/rpc-server": "^3.1",
         "hyperf/service-governance": "^3.1",
         "hyperf/service-governance-consul": "^3.1",
         "hyperf/service-governance-nacos": "^3.1",

config/autoload/amqp.php

@@ -1,6 +1,11 @@
 <?php
+<<<<<<< HEAD
 
 declare(strict_types=1);
+=======
+declare(strict_types=1);
+
+>>>>>>> collector_1106_fr
 use function Hyperf\Support\env;
 return [
     'enable' => true,
@@ -31,7 +36,10 @@ return [
             'close_on_destruct' => false,
         ],
     ],
+<<<<<<< HEAD
     'pool2' => [
 
     ]
+=======
+>>>>>>> collector_1106_fr
 ];

runtime/hyperf.pid

@@ -1 +0,0 @@
-31785