采集修改

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;
 
@@ -573,8 +573,9 @@ class CollectorController extends AbstractController
         }
 //        $b  = $this->Iservice->push($data,1);
         $data['id'] = $requireData['id'];
-        $result = $this->Gservice->push($data,3);
-        return Result::success($result);
+        var_dump("发送数据：",$data);
+        $result =  $this->collectorServiceClient->sendCrawler($data);
+        return $result['code']==200?Result::success($result['data']):Result::error('采集失败');
 
     }
 
@@ -583,6 +584,7 @@ class CollectorController extends AbstractController
      * @param $data
      * @return array
      */
+
     public function goSendCrawler($data=[])
     {
         var_dump("我要开始采集了！！！");
@@ -643,6 +645,7 @@ class CollectorController extends AbstractController
                 return Result::error($errorMessage);
             }
 
+
         }
         if(isset($requireData['state'])){
             $validator = $this->validationFactory->make(

app/Job/GatherExampleJob.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Job;
-
-use Hyperf\AsyncQueue\Job;
-use App\Controller\CollectorController;
-/**
- * @Job(name="import")
- */
-class GatherExampleJob extends Job
-{
-    public $params;
-
-    /**
-     * 任务执行失败后的重试次数，即最大执行次数为 $maxAttempts+1 次
-     */
-    protected int $maxAttempts = 10;
-
-    public function __construct($params)
-    {
-        // 这里最好是普通数据，不要使用携带 IO 的对象，比如 PDO 对象
-        $this->params = $params;
-    }
-
-    public function handle()
-    {
-        try {
-            var_dump("消费者");
-            $collector = new CollectorController();
-            $result = $collector->goSendCrawler($this->params);
-            var_dump("消费消息队列：",$this->params,$result);
-        }catch (\Exception $e){
-            var_dump($e->getMessage());
-        }
-    }
-}