fix: swoft-cloud/swoft/issues/1373 rpc class error on use multi pool

swoft-cloud · May 6, 2021 · d1c090b · d1c090b
1 parent faf1594
commit d1c090b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/rpc-client/src/Annotation/Parser/ReferenceParser.php b/src/rpc-client/src/Annotation/Parser/ReferenceParser.php
@@ -56,14 +56,13 @@ public function parse(int $type, $refObject): array
             ));
         }
 
+        $poolName   = $refObject->getPool();
         $refVersion = $refObject->getVersion();
-        $className  = Proxy::newClassName($propClassType, $refVersion);
+        $className  = Proxy::newClassName($propClassType, $poolName . '_' . $refVersion);
 
-        $this->definitions[$className] = [
-            'class' => $className,
-        ];
+        $this->definitions[$className] = ['class' => $className];
 
-        ReferenceRegister::register($className, $refObject->getPool(), $refVersion);
+        ReferenceRegister::register($className, $poolName, $refVersion);
         return [$className, true];
     }
 }
diff --git a/src/rpc-client/src/Proxy.php b/src/rpc-client/src/Proxy.php
@@ -28,7 +28,9 @@ class Proxy
     /**
      * @param string $className
      * @param string $suffix Rpc version+pool name.
-     *                       For resolve https://github.com/swoft-cloud/swoft/issues/1297
+     *                       For resolve
+     *                       - https://github.com/swoft-cloud/swoft/issues/1297
+     *                       - https://github.com/swoft-cloud/swoft/issues/1373
      *
      * @return string
      * @throws ProxyException