请求controller方法获取调整

top-think · Oct 25, 2024 · 5fa4125 · 5fa4125
1 parent d99d243
commit 5fa4125
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/think/Request.php b/src/think/Request.php
@@ -884,7 +884,7 @@ public function param($name = '', $default = null, string | array | null $filter
             };
 
             // 当前请求参数和URL地址中的参数合并
-            $this->param = array_merge($this->param, $this->get(false), $vars, $this->route(false));
+            $this->param = array_merge($this->param, $this->route(false), $this->get(false), $vars);
 
             $this->mergeParam = true;
         }

diff --git a/src/think/route/dispatch/Controller.php b/src/think/route/dispatch/Controller.php
@@ -26,6 +26,12 @@
  */
 class Controller extends Dispatch
 {
+    /**
+     * 控制器分级
+     * @var string
+     */
+    protected $layer;
+
     /**
      * 控制器名
      * @var string
@@ -71,11 +77,12 @@ public function init(App $app)
         }
 
         $this->actionName = strip_tags($action);
-        $this->controller = strip_tags(($layer ? $layer . '.' : '') . $controller);
+        $this->controller = strip_tags($controller);
+        $this->layer      = strip_tags($layer);
 
         // 设置当前请求的控制器、操作
         $this->request
-            ->setLayer(strip_tags($layer))
+            ->setLayer($this->layer)
             ->setController($this->controller)
             ->setAction($this->actionName);
     }
@@ -84,7 +91,8 @@ public function exec()
     {
         try {
             // 实例化控制器
-            $instance = $this->controller($this->controller);
+            $controller = ($this->layer ? $this->layer . '.' : '') . $this->controller;
+            $instance = $this->controller($controller);
         } catch (ClassNotFoundException $e) {
             throw new HttpException(404, 'controller not exists:' . $e->getClass());
         }