不同类型的规则任务添加、删除网站、删除规则任务的修改

.env

@@ -1,4 +1,4 @@
-APP_NAME=user_producer
+APP_NAME=admin_consumer
 APP_ENV=dev
 HOST = http://192.168.1.201:9501/
 DB_DRIVER=mysql

app/Controller/CollectorController.php

@@ -135,7 +135,7 @@ class CollectorController extends AbstractController
         return Result::success($result['data']);
     }
     /**
-     * 修改网站
+     * 删除网站 
      * @return array
      */
     public function delWeb()
@@ -160,6 +160,7 @@ class CollectorController extends AbstractController
         }
         return Result::success($result['data']);
     }
+    
     /**
      * 添加规则任务
      * @return array
@@ -171,36 +172,81 @@ class CollectorController extends AbstractController
             $requireData,
             [
                 'name' => 'required',
-                'first_url' => 'required',
-                'second_start' => 'required',
-                'second_num' => 'required',
-                'second_end' => 'required',
-                'start' => 'required',
-                'title' => 'required',
-                'content' => 'required',
-                'source' => 'required',
-                'writer_class' => 'required',
-                'writer' => 'required',
-                'web_id' => 'required'
+                'web_id' => 'required',
+                'type' => 'required'
             ],
             [
                 'name.required' => '任务规则名称不能为空',
-                'first_url.required' => '第2页网址开头不能为空',
-                'second_num.required' => '第2页代码页数不能为空',
-                'second_end.required' => '第2页网址结束字符串不能为空',
-                'start.required' => '开始代码不能为空',
-                'title.required' => '标题标签类名不能为空',
-                'content.required' => '内容标签类名不能为空',
-                'source.required' => '来源标签类名不能为空',
-                'writer_class.required' => '作者标签类名不能为空',
-                'writer.required' => '作者名称不能为空',
-                'web_id.required' => '网站id不能为空'
+                'web_id.required' => '网站id不能为空',
+                'type.required' => '网站类型不能为空'
             ]
-        );        
+        );  
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
-        }        
+        }
+        switch ($requireData['type']){
+            case 1:
+                $validator = $this->validationFactory->make(
+                    $requireData,
+                    [
+                        'first_url' => 'required',
+                        'second_start' => 'required',
+                        'second_num' => 'required',
+                        'second_end' => 'required',
+                        'start' => 'required',
+                        'title' => 'required',
+                        'content' => 'required',
+                    ],
+                    [
+                        'first_url.required' => '第1页网址不能为空',
+                        'second_start.required' => '第2页网址开头不能为空',
+                        'second_num.required' => '第2页代码页数不能为空',
+                        'second_end.required' => '第2页网址结束字符串不能为空',
+                        'start.required' => '开始代码不能为空',
+                        'title.required' => '标题标签类名不能为空',
+                        'content.required' => '内容标签类名不能为空',
+                    ]
+                );      
+                // var_dump("============1============");                
+            case 2:
+                $validator = $this->validationFactory->make(
+                    $requireData,
+                    [
+                        'first_url' => 'required',
+                        'parameter' => 'required',
+                        'start' => 'required',
+                        'title' => 'required',
+                        'content' => 'required',
+                    ],
+                    [
+                        'first_url.required' => '开始采集地址不能为空',
+                        'parameter.required' => '接口参数不能为空',
+                        'start.required' => '列表标签不能为空',
+                        'title.required' => '标题标签不能为空',
+                        'content.required' => '内容标签不能为空'
+                    ]
+                );   
+                // var_dump("============2============";                    
+                break;
+            default:
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'rule' => 'required'
+                ],
+                [
+                    'rule.required' => '采集规则不能为空'
+                ]
+            );        
+            // var_dump("============3============");  
+            break;
+        }
+        // return Result::success($requireData);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
         $result = $this->collectorServiceClient->addRule($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);

config/api/collector.php

@@ -21,7 +21,7 @@ Router::addGroup(
 
         //查看并搜索任务
         Router::post('/getRule', [CollectorController::class, 'getRule']);
-        //添加规则
+        //添加规则型任务
         Router::post('/addRule', [CollectorController::class, 'addRule']);
         //获取某个规则
         Router::get('/getOneRule', [CollectorController::class, 'getOneRule']);