collector addArt

app/Controller/CollectorController.php

@@ -11,7 +11,7 @@ use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use App\Constants\ErrorCode;
 use Hyperf\Context\Context;
-use App\Service\GatherQueueService;
+//use App\Service\GatherQueueService;
 use App\Service\ImportQueueService;
 /**
  * ClassCollectorController
@@ -22,8 +22,8 @@ class CollectorController extends AbstractController
 {
     #[Inject]
     protected ValidatorFactoryInterface $validationFactory;
-    #[Inject]
-    protected GatherQueueService $Gservice;
+//    #[Inject]
+//    protected GatherQueueService $Gservice;
     #[Inject]
     protected ImportQueueService $Iservice;
 
@@ -263,7 +263,7 @@ class CollectorController extends AbstractController
                 break;
                 
         }
-        
+
         if(isset($requireData['writer_class']) && $requireData['type'] != 3){
             $validator = $this->validationFactory->make(
                 $requireData,
@@ -279,6 +279,7 @@ class CollectorController extends AbstractController
                 return Result::error($errorMessage);
             }  
         }
+
         if(isset($requireData['writer']) && $requireData['type'] != 3){
             $validator = $this->validationFactory->make(
                 $requireData,
@@ -331,6 +332,7 @@ class CollectorController extends AbstractController
                 ]
             ); 
         }      
+
         if(isset($requireData['web_id'])){
             $validator = $this->validationFactory->make(
                 $requireData,
@@ -341,7 +343,8 @@ class CollectorController extends AbstractController
                     'web_id.required' => '网站id不能为空'
                 ]
             ); 
-        }        
+        }   
+             
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
@@ -479,21 +482,7 @@ class CollectorController extends AbstractController
                 break;
                 
         }
-        if(isset($requireData['source']) && $requireData['type'] != 3){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'source' => 'required'
-                ],
-                [
-                    'source.required' => '文章来源不能为空'
-                ]
-            ); 
-            if ($validator->fails()) {
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }  
-        }
+
         if(isset($requireData['writer_class']) && $requireData['type'] != 3){
             $validator = $this->validationFactory->make(
                 $requireData,
@@ -530,6 +519,7 @@ class CollectorController extends AbstractController
             return Result::error($result['message'],0,[]);
         }
         return Result::success($result['data']);
+
     } 
     /**
     * 删除任务规则
@@ -567,9 +557,25 @@ class CollectorController extends AbstractController
         $data = [];
         $data['admin_user_id'] = Context::get("UserId");
         $data['time'] = microtime();
+        $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);
+        }
 //        $b  = $this->Iservice->push($data,1);
-        $result = $this->Gservice->push($data,1);
-        return Result::success($result);
+        $data['id'] = $requireData['id'];
+        var_dump("发送数据：",$data);
+        $result =  $this->collectorServiceClient->sendCrawler($data);
+        return $result['code']==200?Result::success($result['data']):Result::error('采集失败');
 
     }
 
@@ -578,6 +584,7 @@ class CollectorController extends AbstractController
      * @param $data
      * @return array
      */
+
     public function goSendCrawler($data=[])
     {
         var_dump("我要开始采集了！！！");
@@ -638,6 +645,7 @@ class CollectorController extends AbstractController
                 return Result::error($errorMessage);
             }
 
+
         }
         if(isset($requireData['state'])){
             $validator = $this->validationFactory->make(
@@ -823,21 +831,9 @@ class CollectorController extends AbstractController
         $data['time'] = microtime();
         
         // var_dump("=====111");
-        $result  = $this->Iservice->push($data,1);
+        $result  = $this->collectorServiceClient->addArt($data);
         // var_dump("=====111",$result);
         return Result::success($result);
     }
-    /**
-     * 导入中
-     * @return array
-     */
-    public function goaddArt($data=[])
-    {
-        if(is_array($data)){
-            var_dump("我要开始导入了！！！");
-            $this->collectorServiceClient->addArt($data);
-            return Result::success([]);
-        }
-        
-    }
+   
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "408b8e53c4a0d313ed75355b91296895",
+    "content-hash": "3b325c616f7faa9a2ba0b92efe126cac",
     "packages": [
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -3571,6 +3571,74 @@
             ],
             "time": "2024-09-25T02:54:12+00:00"
         },
+        {
+            "name": "hyperf/paginator",
+            "version": "v3.1.42",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hyperf/paginator.git",
+                "reference": "b637a3deeee69f4a3e5a6d62ab8214244b98412a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hyperf/paginator/zipball/b637a3deeee69f4a3e5a6d62ab8214244b98412a",
+                "reference": "b637a3deeee69f4a3e5a6d62ab8214244b98412a",
+                "shasum": ""
+            },
+            "require": {
+                "hyperf/contract": "~3.1.0",
+                "hyperf/support": "~3.1.0",
+                "hyperf/utils": "~3.1.0",
+                "php": ">=8.1"
+            },
+            "suggest": {
+                "hyperf/event": "Reqiured to use PageResolverListener.",
+                "hyperf/framework": "Reqiured to use PageResolverListener.",
+                "hyperf/http-server": "Reqiured to use PageResolverListener."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                },
+                "hyperf": {
+                    "config": "Hyperf\\Paginator\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hyperf\\Paginator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A paginator component for hyperf.",
+            "homepage": "https://hyperf.io",
+            "keywords": [
+                "hyperf",
+                "paginator",
+                "php"
+            ],
+            "support": {
+                "docs": "https://hyperf.wiki",
+                "issues": "https://github.com/hyperf/hyperf/issues",
+                "pull-request": "https://github.com/hyperf/hyperf/pulls",
+                "source": "https://github.com/hyperf/hyperf"
+            },
+            "funding": [
+                {
+                    "url": "https://hyperf.wiki/#/zh-cn/donate",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://opencollective.com/hyperf",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-09-25T02:54:12+00:00"
+        },
         {
             "name": "hyperf/pipeline",
             "version": "v3.1.42",