修正路由别名的参数获取

Author: liu21st

library/think/route/Domain.php

@@ -161,6 +161,7 @@ protected function bindToClass($request, $url, $class)
     {
         $array  = explode('|', $url, 2);
         $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
+        $param  = [];
 
         if (!empty($array[1])) {
             $this->parseUrlParams($request, $array[1], $param);
@@ -182,6 +183,7 @@ protected function bindToNamespace($request, $url, $namespace)
         $array  = explode('|', $url, 3);
         $class  = !empty($array[0]) ? $array[0] : $this->router->config('default_controller');
         $method = !empty($array[1]) ? $array[1] : $this->router->config('default_action');
+        $param  = [];
 
         if (!empty($array[2])) {
             $this->parseUrlParams($request, $array[2], $param);
@@ -202,6 +204,7 @@ protected function bindToController($request, $url, $controller)
     {
         $array  = explode('|', $url, 2);
         $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
+        $param  = [];
 
         if (!empty($array[1])) {
             $this->parseUrlParams($request, $array[1], $param);
@@ -222,6 +225,7 @@ protected function bindToModule($request, $url, $controller)
     {
         $array  = explode('|', $url, 2);
         $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
+        $param  = [];
 
         if (!empty($array[1])) {
             $this->parseUrlParams($request, $array[1], $param);

library/think/route/dispatch/Module.php

@@ -114,6 +114,7 @@ public function exec()
                 $vars = $this->rule->getConfig('url_param_type')
                 ? $this->request->route()
                 : $this->request->param();
+                $vars = array_merge($vars, $this->param);
             } elseif (is_callable([$instance, '_empty'])) {
                 // 空操作
                 $call    = [$instance, '_empty'];