From a6f72f9ce2eff95ea85a1fb6da400d608d3e8a0e Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 22 Oct 2016 15:02:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BApp=E7=B1=BB=E7=9A=84?=
 =?UTF-8?q?=E5=8F=8D=E5=B0=84=E5=BC=82=E5=B8=B8=E6=97=A0=E6=B3=95=E6=8D=95?=
 =?UTF-8?q?=E8=8E=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/App.php | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/library/think/App.php b/library/think/App.php
index 98a58d71..ce7fd37a 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -369,33 +369,28 @@ class App
         // 监听module_init
         Hook::listen('module_init', $request);
 
-        try {
-            $instance = Loader::controller($controller, $config['url_controller_layer'], $config['controller_suffix'], $config['empty_controller']);
-            if (is_null($instance)) {
-                throw new HttpException(404, 'controller not exists:' . Loader::parseName($controller, 1));
-            }
-            // 获取当前操作名
-            $action = $actionName . $config['action_suffix'];
-            if (!preg_match('/^[A-Za-z](\w)*$/', $action)) {
-                // 非法操作
-                throw new \ReflectionException('illegal action name:' . $actionName);
-            }
+        $instance = Loader::controller($controller, $config['url_controller_layer'], $config['controller_suffix'], $config['empty_controller']);
+        if (is_null($instance)) {
+            throw new HttpException(404, 'controller not exists:' . Loader::parseName($controller, 1));
+        }
+        // 获取当前操作名
+        $action = $actionName . $config['action_suffix'];
 
+        if (is_callable([$instance, $action])) {
             // 执行操作方法
             $call = [$instance, $action];
-            Hook::listen('action_begin', $call);
-
-            $data = self::invokeMethod($call);
-        } catch (\ReflectionException $e) {
+        } elseif (is_callable([$instance, '_empty'])) {
+            // 空操作
+            $call = [$instance, '_empty'];
+        } else {
             // 操作不存在
-            if (method_exists($instance, '_empty')) {
-                $reflect = new \ReflectionMethod($instance, '_empty');
-                $data    = $reflect->invokeArgs($instance, [$action]);
-                self::$debug && Log::record('[ RUN ] ' . $reflect->__toString(), 'info');
-            } else {
-                throw new HttpException(404, 'method not exists:' . (new \ReflectionClass($instance))->getName() . '->' . $action);
-            }
+            throw new HttpException(404, 'method not exists:' . get_class($instance) . '->' . $action . '()');
         }
+
+        Hook::listen('action_begin', $call);
+
+        $data = self::invokeMethod($call);
+
         return $data;
     }