1

app/JsonRpc/CollectorService.php

@@ -17,7 +17,7 @@ use Hyperf\RpcServer\Annotation\RpcService;
 use App\Tools\Result;
 use QL\QueryList;
 use Swoole\Coroutine;
-// use App\Service\GatherQueueService;
+//use App\Service\GatherQueueService;
 use App\Amqp\Producer\ImportProducer;
 
 
@@ -26,8 +26,8 @@ use function Hyperf\Support\retry;
 #[RpcService(name: "CollectorService", protocol: "jsonrpc-http", server: "jsonrpc-http")]
 class CollectorService implements CollectorServiceInterface
 {
-    // #[Inject]
-    // protected GatherQueueService $Gservice;
+//    #[Inject]
+//    protected GatherQueueService $Gservice;
     /**
      * 添加网站
      * @param array $data

composer.json

@@ -34,7 +34,7 @@
         "hyperf/nacos": "^3.1",
         "hyperf/process": "~3.1.0",
         "hyperf/redis": "~3.1.0",
-        "hyperf/rpc-server": "*",
+        "hyperf/rpc-server": "^3.1",
         "hyperf/service-governance": "^3.1",
         "hyperf/service-governance-consul": "^3.1",
         "hyperf/service-governance-nacos": "^3.1",

composer.lock

@@ -4,7 +4,11 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
+<<<<<<< HEAD
     "content-hash": "239ee8acadf3c91412a44beeca7f9a96",
+=======
+    "content-hash": "18f0eba83d85f976fd255237eb85f674",
+>>>>>>> 32a7466ce932df46b3fc3cf9b1ac8f32b18dfed2
     "packages": [
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -4369,6 +4373,7 @@
             "time": "2024-09-25T02:54:12+00:00"
         },
         {
+<<<<<<< HEAD
             "name": "jaeger/g-http",
             "version": "V2.0.1",
             "source": {
@@ -4533,6 +4538,17 @@
             },
             "dist": {
                 "type": "zip",
+=======
+            "name": "jetbrains/phpstorm-attributes",
+            "version": "1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/JetBrains/phpstorm-attributes.git",
+                "reference": "64de815a4509c29e00d5e3474087fd24c171afc2"
+            },
+            "dist": {
+                "type": "zip",
+>>>>>>> 32a7466ce932df46b3fc3cf9b1ac8f32b18dfed2
                 "url": "https://api.github.com/repos/JetBrains/phpstorm-attributes/zipball/64de815a4509c29e00d5e3474087fd24c171afc2",
                 "reference": "64de815a4509c29e00d5e3474087fd24c171afc2",
                 "shasum": ""
@@ -6171,6 +6187,7 @@
             "time": "2023-06-15T09:18:11+00:00"
         },
         {
+<<<<<<< HEAD
             "name": "symfony/cache",
             "version": "v6.4.16",
             "source": {
@@ -6352,6 +6369,17 @@
             },
             "dist": {
                 "type": "zip",
+=======
+            "name": "symfony/console",
+            "version": "v6.4.15",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd"
+            },
+            "dist": {
+                "type": "zip",
+>>>>>>> 32a7466ce932df46b3fc3cf9b1ac8f32b18dfed2
                 "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd",
                 "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd",
                 "shasum": ""
@@ -7306,6 +7334,7 @@
                 }
             ],
             "time": "2024-09-25T14:20:29+00:00"
+<<<<<<< HEAD
         },
         {
             "name": "symfony/var-dumper",
@@ -7468,6 +7497,8 @@
                 }
             ],
             "time": "2024-09-25T14:18:03+00:00"
+=======
+>>>>>>> 32a7466ce932df46b3fc3cf9b1ac8f32b18dfed2
         },
         {
             "name": "vlucas/phpdotenv",

config/autoload/amqp.php

@@ -1,6 +1,6 @@
 <?php
-
 declare(strict_types=1);
+
 use function Hyperf\Support\env;
 return [
     'enable' => true,
@@ -31,7 +31,4 @@ return [
             'close_on_destruct' => false,
         ],
     ],
-    'pool2' => [
-
-    ]
 ];