|
@@ -165,6 +165,7 @@ class CollectorController extends AbstractController
|
|
|
* 添加规则任务
|
|
|
* @return array
|
|
|
*/
|
|
|
+
|
|
|
public function addRule()
|
|
|
{
|
|
|
|
|
@@ -214,8 +215,14 @@ class CollectorController extends AbstractController
|
|
|
if ($validator->fails()) {
|
|
|
$errorMessage = $validator->errors()->first();
|
|
|
return Result::error($errorMessage);
|
|
|
+<<<<<<< HEAD
|
|
|
}
|
|
|
break;
|
|
|
+=======
|
|
|
+ }
|
|
|
+
|
|
|
+ break;
|
|
|
+>>>>>>> collector_1106_fr
|
|
|
case 2:
|
|
|
$validator = $this->validationFactory->make(
|
|
|
$requireData,
|
|
@@ -313,6 +320,7 @@ class CollectorController extends AbstractController
|
|
|
}
|
|
|
return Result::success($result['data']);
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 获取并搜索任务规则
|
|
|
* @return array
|