接口已完成1.0

app/Controller/CollectorController.php

@@ -167,25 +167,27 @@ class CollectorController extends AbstractController
             [
                 'name' => 'required',
                 'first_url' => 'required',
-                'second_url' => 'required',
+                'second_start' => 'required',
+                'second_num' => 'required',
+                'second_end' => 'required',
                 'start' => 'required',
-                'end' => 'required',
-                'tit_start' => 'required',
-                'tit_end' => 'required',
-                'con_start' => 'required',
-                'con_end' => 'required',
+                'title' => 'required',
+                'content' => 'required',
+                'source' => 'required',
+                'writer_class' => 'required',
+                'writer' => 'required',
                 'web_id' => 'required'
             ],
             [
                 'name.required' => '任务规则名称不能为空',
-                'first_url.required' => '第1页网址不能为空',
-                'second_url.required' => '第2页网址不能为空',
+                'first_url.required' => '第2页网址开头不能为空',
+                'second_num.required' => '第2页代码页数不能为空',
+                'second_end.required' => '第2页网址结束字符串不能为空',
                 'start.required' => '开始代码不能为空',
-                'end.required' => '结束代码不能为空',
-                'tit_start.required' => '标题开始字符串不能为空',
-                'tit_end.required' => '标题结束字符串不能为空',
-                'con_start.required' => '内容开始字符串不能为空',
-                'con_end.required' => '内容结束字符串不能为空',
+                'title.required' => '标题标签类名不能为空',
+                'content.required' => '内容标签类名不能为空',
+                'source.required' => '来源标签类名不能为空',
+                'writer_class.required' => '作者标签类名不能为空',
                 'writer.required' => '作者名称不能为空',
                 'web_id.required' => '网站id不能为空'
             ]
@@ -241,6 +243,32 @@ class CollectorController extends AbstractController
         }
         return Result::success($result['data']);
     }
+    /**
+     * 修改规则任务待开发
+     * @return array
+     */
+    public function getOneRule()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required'
+            ],
+            [
+                'id.required' => '任务规则id不能为空'
+            ]
+        );        
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }        
+        $result = $this->collectorServiceClient->getOneRule($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    } 
     /**
      * 修改规则任务待开发
      * @return array
@@ -254,25 +282,27 @@ class CollectorController extends AbstractController
                 'id' => 'required',
                 'name' => 'required',
                 'first_url' => 'required',
-                'second_url' => 'required',
+                'second_start' => 'required',
+                'second_num' => 'required',
+                'second_end' => 'required',
                 'start' => 'required',
-                'end' => 'required',
-                'tit_start' => 'required',
-                'tit_end' => 'required',
-                'con_start' => 'required',
-                'con_end' => 'required'
+                'title' => 'required',
+                'content' => 'required',
+                'source' => 'required',
+                'writer_class' => 'required',
+                'writer' => 'required'
             ],
             [
                 'id.required' => '任务规则id不能为空',
                 'name.required' => '任务规则名称不能为空',
-                'first_url.required' => '第1页网址不能为空',
-                'second_url.required' => '第2页网址不能为空',
+                'first_url.required' => '第2页网址开头不能为空',
+                'second_num.required' => '第2页代码页数不能为空',
+                'second_end.required' => '第2页网址结束字符串不能为空',
                 'start.required' => '开始代码不能为空',
-                'end.required' => '结束代码不能为空',
-                'tit_start.required' => '标题开始字符串不能为空',
-                'tit_end.required' => '标题结束字符串不能为空',
-                'con_start.required' => '内容开始字符串不能为空',
-                'con_end.required' => '内容结束字符串不能为空',
+                'title.required' => '标题标签类名不能为空',
+                'content.required' => '内容标签类名不能为空',
+                'source.required' => '来源标签类名不能为空',
+                'writer_class.required' => '作者标签类名不能为空',
                 'writer.required' => '作者名称不能为空'
             ]
         );        
@@ -395,7 +425,7 @@ class CollectorController extends AbstractController
             }
         }
         $result = $this->collectorServiceClient->getInfo($requireData);        
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
     /**
      * 获取某个资讯
@@ -418,7 +448,7 @@ class CollectorController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->collectorServiceClient->getOneInfo($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
     /**
      *修改资讯
@@ -489,7 +519,75 @@ class CollectorController extends AbstractController
             }
         }
         $result = $this->collectorServiceClient->upInfo($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /**
+     * 删除资讯
+     * @return array
+     */
+    public function delInfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'art_id' => 'required'
+            ],
+            [
+                'art_id.required' => '资讯id不能为空'
+            ]
+        ); 
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->collectorServiceClient->delInfo($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /**
+     * 关联导航池
+     * @return array
+     */
+    public function addCatid()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'rule_id' => 'required'
+            ],
+            [
+                'rule_id.required' => '任务规则id不能为空'
+            ]
+        ); 
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->collectorServiceClient->addCatid($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+     /**
+     * 导入资讯
+     * @return array
+     */
+    public function addArt()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'rule_id' => 'required'
+            ],
+            [
+                'rule_id.required' => '任务规则id不能为空'
+            ]
+        ); 
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->collectorServiceClient->addArt($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
-
 }

app/JsonRpc/CollectorService.php

@@ -62,6 +62,14 @@ class CollectorService extends AbstractServiceClient implements CollectorService
      * @return array|mixed
      */
     public function getRule(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getOneRule(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
@@ -115,5 +123,28 @@ class CollectorService extends AbstractServiceClient implements CollectorService
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function delInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function addCatid(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function addArt(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/CollectorServiceInterface.php

@@ -31,6 +31,11 @@ interface CollectorServiceInterface
      * @return mixed
      */
     public function getRule(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getOneRule(array $data);
     /**
      * @param array $data
      * @return mixed
@@ -63,4 +68,19 @@ interface CollectorServiceInterface
      * @return mixed
      */
     public function upInfo(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delInfo(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addCatid(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addArt(array $data);
 }

config/api/collector.php

@@ -23,6 +23,8 @@ Router::addGroup(
         Router::post('/getRule', [CollectorController::class, 'getRule']);
         //添加规则
         Router::post('/addRule', [CollectorController::class, 'addRule']);
+        //获取某个规则
+        Router::get('/getOneRule', [CollectorController::class, 'getOneRule']);
         //修改规则
         Router::post('/upRule', [CollectorController::class, 'upRule']);
         //删除规则
@@ -41,7 +43,7 @@ Router::addGroup(
         Router::get('/delInfo', [CollectorController::class, 'delInfo']);
 
         //关联导航
-        Router::get('/addCatid', [CollectorController::class, 'addCatid']);
+        Router::post('/addCatid', [CollectorController::class, 'addCatid']);
         //导入数据
         Router::get('/addArt', [CollectorController::class, 'addArt']);