修复问题

Author: Yurunsoft

src/Listener/RouteInit.php

@@ -12,6 +12,8 @@
 use Imi\Rpc\Route\Annotation\RpcAction;
 use Imi\Rpc\Route\Annotation\Parser\RpcControllerParser;
 use Imi\Rpc\BaseRpcServer;
+use Imi\Event\Event;
+use Imi\Bean\BeanFactory;
 
 /**
  * RPC 服务器路由初始化
@@ -45,6 +47,8 @@ private function parseAnnotations(EventParam $e)
             RequestContext::create();
             RequestContext::set('server', $server);
             $route = $server->getBean('RpcRoute');
+            $serverTypeName = $this->getServerTypeName(BeanFactory::getObjectClass($server));
+            $eventName = 'IMI.ROUTE.INIT.DEFAULT:' . $serverTypeName;
             foreach($controllerParser->getByServer($name) as $className => $classItem)
             {
                 $classAnnotation = $classItem['annotation'];
@@ -53,11 +57,16 @@ private function parseAnnotations(EventParam $e)
                     $routes = AnnotationManager::getMethodAnnotations($className, $methodName, RpcRoute::class);
                     if(!isset($routes[0]))
                     {
-                        $routes = [
-                            new RpcRoute([
-                                'name' => $methodName,
-                            ])
-                        ];
+                        $data = compact('className', 'classAnnotation', 'methodName');
+                        $result = null;
+                        $data['result'] = &$result;
+                        Event::trigger($eventName, $data);
+                        if(null !== $result)
+                        {
+                            $routes = [
+                                $result
+                            ];
+                        }
                     }
 
                     foreach($routes as $routeItem)
@@ -73,4 +82,21 @@ private function parseAnnotations(EventParam $e)
         }
     }
 
+    /**
+     * 获取服务器类型名称
+     *
+     * @param string $className
+     * @return string|boolean
+     */
+    private function getServerTypeName($className)
+    {
+        if(\preg_match('/Imi\\\\Server\\\\([^\\\\]+)\\\\Server/', $className, $matches) > 0)
+        {
+            return $matches[1];
+        }
+        else
+        {
+            return false;
+        }
+    }
 }

src/Route/Annotation/Parser/HproseControllerParser.php renamed to src/Route/Annotation/Parser/RpcControllerParser.php

@@ -27,7 +27,7 @@ class RpcControllerParser extends BaseParser
     public function parse(\Imi\Bean\Annotation\Base $annotation, string $className, string $target, string $targetName)
     {
         $eventName = 'IMI.RPC.ANNOTATION.PARSER:' . get_class($annotation);
-        Event::trigger($eventName, func_get_args(), $this);
+        Event::trigger($eventName, \compact('annotation', 'className', 'target', 'targetName'), $this);
     }
 
 }

src/Route/RpcRoute.php

@@ -1,13 +1,14 @@
 <?php
 namespace Imi\Rpc\Route;
 
+use Imi\Util\Text;
+use Imi\Event\Event;
 use Imi\ServerManage;
 use Imi\Bean\Annotation\Bean;
 use Imi\Util\ObjectArrayHelper;
 use Imi\Server\Route\RouteCallable;
 use Imi\Rpc\Controller\RpcController;
 use Imi\Rpc\Route\Annotation\RpcRoute as RpcRouteAnnotation;
-use Imi\Util\Text;
 
 /**
  * @Bean("RpcRoute")
@@ -33,11 +34,6 @@ public function parse($data)
      */
     public function addRuleAnnotation(RpcRouteAnnotation $annotation, $callable, $options = [])
     {
-        $serverName = $options['serverName'];
-        $controllerAnnotation = $options['controller'];
-        $methodName = $options['methodName'];
-        $rpcServer = ServerManage::getServer($serverName)->getRpcService();
-
         // callable
         $callable = $this->parseCallable($callable);
         $isObject = is_array($callable) && isset($callable[0]) && $callable[0] instanceof RpcController;
@@ -48,7 +44,7 @@ public function addRuleAnnotation(RpcRouteAnnotation $annotation, $callable, $op
         }
 
         $eventName = 'IMI.RPC.ROUTE.ADD_RULE:' . $annotation->rcpType;
-        Event::trigger($eventName, func_get_args(), $this);
+        Event::trigger($eventName, \compact('annotation', 'callable', 'options'), $this);
 
     }