Explorar o código

添加规则任务

the_bug hai 4 meses
pai
achega
21e48a83e7
Modificáronse 1 ficheiros con 22 adicións e 18 borrados
  1. 22 18
      app/Controller/CollectorController.php

+ 22 - 18
app/Controller/CollectorController.php

@@ -194,21 +194,24 @@ class CollectorController extends AbstractController
                         'second_start' => 'required',
                         'second_num' => 'required',
                         'second_end' => 'required',
+                        'end_pagenum' => 'required',
                         'start' => 'required',
                         'title' => 'required',
-                        'content' => 'required',
+                        'content' => 'required'
                     ],
                     [
                         'first_url.required' => '第1页网址不能为空',
                         'second_start.required' => '第2页网址开头不能为空',
                         'second_num.required' => '第2页代码页数不能为空',
                         'second_end.required' => '第2页网址结束字符串不能为空',
+                        'end_pagenum.required' => '列表页结束页码不能为空',
                         'start.required' => '开始代码不能为空',
                         'title.required' => '标题标签类名不能为空',
-                        'content.required' => '内容标签类名不能为空',
+                        'content.required' => '内容标签类名不能为空'
                     ]
-                );      
-                // var_dump("============1============");                
+                );     
+                // var_dump("============1============");       
+                break;         
             case 2:
                 $validator = $this->validationFactory->make(
                     $requireData,
@@ -226,27 +229,28 @@ class CollectorController extends AbstractController
                         'title.required' => '标题标签不能为空',
                         'content.required' => '内容标签不能为空'
                     ]
-                );   
+                ); 
                 // var_dump("============2============";                    
                 break;
             default:
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'rule' => 'required'
-                ],
-                [
-                    'rule.required' => '采集规则不能为空'
-                ]
-            );        
-            // var_dump("============3============");  
-            break;
+                $validator = $this->validationFactory->make(
+                    $requireData,
+                    [
+                        'diy_rule' => 'required'
+                    ],
+                    [
+                        'diy_rule.required' => '采集规则不能为空'
+                    ]
+                );  
+                // var_dump("============3============");  
+                break;
         }
-        // return Result::success($requireData);
+       
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        // return Result::success($requireData);
         $result = $this->collectorServiceClient->addRule($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -295,7 +299,7 @@ class CollectorController extends AbstractController
         return Result::success($result['data']);
     }
     /**
-     * 修改规则任务待开发
+     * 获取某个规则任务
      * @return array
      */
     public function getOneRule()