From 4a246c738a40a2c46c12b413b76a7535e6f3c3d4 Mon Sep 17 00:00:00 2001
From: topnuomi <1130395124@qq.com>
Date: Sat, 13 Jun 2020 20:59:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/config/config.php                  | 12 ++-
 framework/extend/JWT.php                     |  2 +-
 framework/library/Application.php            | 95 +++++++++++++-------
 framework/library/Controller.php             |  4 +-
 framework/library/Database.php               |  2 +-
 framework/library/Router.php                 | 28 ++----
 framework/library/View.php                   |  9 +-
 framework/library/cache/driver/Redis.php     |  2 +-
 framework/library/functions/functions.php    | 11 +--
 framework/library/template/driver/Smarty.php |  7 +-
 framework/library/template/driver/Top.php    |  7 +-
 framework/library/template/driver/Twig.php   |  7 +-
 framework/middleware/View.php                |  3 +-
 13 files changed, 93 insertions(+), 96 deletions(-)

diff --git a/framework/config/config.php b/framework/config/config.php
index e366d01..3dea3fe 100644
--- a/framework/config/config.php
+++ b/framework/config/config.php
@@ -1,15 +1,13 @@
 <?php
 // 默认配置
+
 return [
     'default_controller' => 'Index',
     'default_method' => 'index',
     'compel_route' => false,
     'complete_parameter' => true,
     'error_pages' => [
-        404 => '.' . DS . '404.html',
-    ],
-    'register' => [
-        'Top' => \top\library\template\driver\Top::class,
+        404 => './404.html',
     ],
     'middleware' => [
         \top\middleware\Action::class,
@@ -38,9 +36,9 @@ return [
         'engine' => 'Top',
         'tagLib' => [],
         'ext' => 'html',
-        'dir' => '',
-        'cacheDir' => '',
-        'compileDir' => '',
+        'dir' => APP_PATH . BIND_MODULE . '/view/',
+        'cacheDir' => './runtime/cache/application/' . BIND_MODULE . '/',
+        'compileDir' => './runtime/compile/application/' . BIND_MODULE . '/',
         'left' => '<',
         'right' => '>',
         'cacheTime' => 5
diff --git a/framework/extend/JWT.php b/framework/extend/JWT.php
index 79b6428..1ddbc99 100644
--- a/framework/extend/JWT.php
+++ b/framework/extend/JWT.php
@@ -33,7 +33,7 @@ class JWT
 
     public function __construct()
     {
-        $this->config = Config::instance()->get('jwt');
+        $this->config = \config('jwt');
         if (isset($this->config['key'])) {
             $this->key = $this->config['key'];
         } else {
diff --git a/framework/library/Application.php b/framework/library/Application.php
index 74da3a6..ba54d54 100644
--- a/framework/library/Application.php
+++ b/framework/library/Application.php
@@ -6,6 +6,7 @@ use top\library\error\BaseError;
 use top\library\exception\BaseException;
 use top\library\http\Request;
 use top\library\http\Response;
+use top\library\template\driver\Top;
 
 /**
  * Class Application
@@ -62,22 +63,12 @@ class Application
         (is_file($funcFile)) && require $funcFile;
 
         // session目录
-        $sessionConfig = Config::instance()->get('session');
+        $sessionConfig = config('session');
         if (!empty($sessionConfig) && $sessionConfig['open'] === true) {
             session_save_path(SESSION_PATH);
             session_start();
         }
 
-        // 配置文件中注册的类
-        $initRegister = Config::instance()->get('register');
-        if (!empty($initRegister)) {
-            foreach ($initRegister as $key => $value) {
-                Register::set($key, function () use ($value) {
-                    return $value::instance();
-                });
-            }
-        }
-
         // 初始化路由实例
         $router = Router::instance(Request::instance());
 
@@ -128,47 +119,85 @@ class Application
     /**
      * 获取一个类实例
      * @param $className
+     * @param $parameters
      * @return mixed
      * @throws \ReflectionException
      */
-    public static function getInstance($className)
+    public static function getInstance($className, $parameters = [])
     {
-        $classRef = self::getReflectionClass($className);
-        $isInstantiable = $classRef->isInstantiable();
-        if (!$isInstantiable) { // 不可被实例化
-            if ($classRef->hasMethod('instance')) {
-                $instance = $classRef->getMethod('instance');
+        $reflectionClass = self::getReflectionClass($className);
+        $isInstantiable = $reflectionClass->isInstantiable();
+        // 获取构造方法(__construct或instance)
+        if (!$isInstantiable) {
+            if ($reflectionClass->hasMethod('instance')) {
+                $constructor = $reflectionClass->getMethod('instance');
             } else throw new \Exception('不可实例化的类：' . $className);
         } else {
-            $instance = $classRef->getConstructor();
+            $constructor = $reflectionClass->getConstructor();
         }
-
-        if (!is_null($instance)) {
-            $instanceParams = $instance->getParameters();
-            if (empty($instanceParams)) { // 构造函数没有参数直接返回当前类实例
+         // 没有构造方法或者构造方法没有参数则直接返回实例
+        if (!is_null($constructor)) {
+            $constructorParameters = $constructor->getParameters();
+            if (empty($constructorParameters)) {
                 if (!$isInstantiable) return $className::instance();
                 return new $className;
             }
-        } else { // 没有构造方法直接返回实例
+        } else {
             if (!$isInstantiable) return $className::instance();
             return new $className;
         }
-
-        // 构造函数存在参数则去递归实例化类
-        $actualParams = [];
-        foreach ($instanceParams as $param) {
-            $actualClass = $param->getClass();
-            if (!is_null($actualClass)) { // 参数是一个类
-                $actualParams[$param->name] = self::getInstance($actualClass->name);
+        $actualParameters = [];
+        foreach ($constructorParameters as $constructorParameter) {
+            $actualClass = $constructorParameter->getClass();
+            // 参数是一个类实例则递归获取实例，不是类实例则检查是否有默认值或用户传入参数
+            if (!is_null($actualClass)) {
+                $actualParameters[$constructorParameter->name] = Application::getInstance($actualClass->name);
+            } else {
+                try {
+                    $value = isset($parameters[$constructorParameter->name])
+                    ? $parameters[$constructorParameter->name]
+                    : $constructorParameter->getDefaultValue();
+                } catch (\ReflectionException $exception) {
+                    $value = null;
+                }
+                $actualParameters[$constructorParameter->name] = $value;
             }
         }
 
         if ($isInstantiable) {
-            return $classRef->newInstanceArgs($actualParams);
+            return $reflectionClass->newInstanceArgs($actualParameters);
         } else {
-            $reflectionMethod = new \ReflectionMethod($className, 'instance');
-            return $reflectionMethod->invokeArgs(null, $actualParams);
+            $reflectionMethod = Application::getReflectionMethod($className, 'instance');
+            return $reflectionMethod->invokeArgs(null, $actualParameters);
         }
     }
 
+    /**
+     * 调用一个类方法
+     * @param $className
+     * @param $method
+     * @param array $parameters
+     * @return mixed
+     */
+    public static function callMethod($className, $method, $parameters = [])
+    {
+        $instance = Application::getInstance($className);
+        $reflectionMethod = Application::getReflectionMethod($className, $method);
+        $invokeParams = [];
+        foreach ($reflectionMethod->getParameters() as $parameter) {
+            $className = $parameter->getClass();
+            if (!is_null($className)) {
+                $invokeParams[$parameter->name] = Application::getInstance($className->name);
+            } else {
+                if (isset($parameters[$parameter->name])) {
+                    $invokeParams[$parameter->name] = $parameters[$parameter->name];
+                } else {
+                    $invokeParams[$parameter->name] = null;
+                }
+            }
+        }
+        // 返回执行结果
+        return $reflectionMethod->invokeArgs($instance, $invokeParams);
+    }
+
 }
diff --git a/framework/library/Controller.php b/framework/library/Controller.php
index 813ac19..021c278 100644
--- a/framework/library/Controller.php
+++ b/framework/library/Controller.php
@@ -123,10 +123,10 @@ abstract class Controller
      */
     protected function tips($message, $url = '', $sec = 3)
     {
-        if (request()->isAjax()) {
+        if (request()->is('ajax')) {
             return $this->json($message, '', 'tips', ['url' => $url, 'sec' => $sec]);
         } else {
-            $viewConfig = Config::instance()->get('view');
+            $viewConfig = config('view');
             $tipsTemplate = $viewConfig['dir'] . 'tips.' . $viewConfig['ext'];
             (!file_exists($tipsTemplate)) && file_put_contents($tipsTemplate, '');
             return view('tips', [
diff --git a/framework/library/Database.php b/framework/library/Database.php
index be907f6..1f00107 100644
--- a/framework/library/Database.php
+++ b/framework/library/Database.php
@@ -94,7 +94,7 @@ class Database
     private function __construct($table, $pk, $prefix)
     {
         // 获取配置
-        $this->config = Config::instance()->get('db');
+        $this->config = config('db');
         // 当前操作表名
         $this->table = $this->getTableName($prefix, $table);
         // 当前操作表主键
diff --git a/framework/library/Router.php b/framework/library/Router.php
index b48fd88..6af800f 100644
--- a/framework/library/Router.php
+++ b/framework/library/Router.php
@@ -24,7 +24,7 @@ class Router
 
     /**
      * 请求类
-     * @var null
+     * @var Request
      */
     private $request = null;
 
@@ -248,28 +248,10 @@ class Router
             } else throw $exception;
         }
 
-        // 将执行应用打包为一个$application
-        $application = function () {
-            // 执行控制器方法
-            $object = Application::getInstance($this->controllerFullName);
-            $reflectionMethod = Application::getReflectionMethod($this->controllerFullName, $this->method);
-            $invokeParams = [];
-            foreach ($reflectionMethod->getParameters() as $parameter) {
-                $className = $parameter->getClass();
-                if (!is_null($className)) {
-                    $invokeParams[$parameter->name] = Application::getInstance($className->name);
-                } else {
-                    if (isset($this->params[$parameter->name])) {
-                        $invokeParams[$parameter->name] = $this->params[$parameter->name];
-                    }
-                }
-            }
-
-            return $reflectionMethod->invokeArgs($object, $invokeParams);
-        };
-
-        // 路由中间件处理application
-        return $this->middleware($application);
+        // 路由中间件处理
+        return $this->middleware(function () {
+            return Application::callMethod($this->controllerFullName, $this->method, $this->params);
+        });
     }
 
     /**
diff --git a/framework/library/View.php b/framework/library/View.php
index eedb2db..1c19d8f 100644
--- a/framework/library/View.php
+++ b/framework/library/View.php
@@ -25,9 +25,12 @@ class View
      */
     private function __construct()
     {
-        $this->config = Config::instance()->get('view');
-        $driver = Register::get($this->config['engine']);
-        $this->template = Template::instance($driver);
+        $this->config = config('view');
+        $className = '\\top\\library\\template\\driver\\' . $this->config['engine'];
+        if (!class_exists($className)) {
+            throw new Exception('不存在的模板引擎：' . $className);
+        }
+        $this->template = Template::instance($className::instance());
     }
 
     /**
diff --git a/framework/library/cache/driver/Redis.php b/framework/library/cache/driver/Redis.php
index f3e338b..635d0da 100644
--- a/framework/library/cache/driver/Redis.php
+++ b/framework/library/cache/driver/Redis.php
@@ -34,7 +34,7 @@ class Redis implements CacheIfs
      */
     private function __construct()
     {
-        $config = Config::instance()->get('redis');
+        $config = \config('redis');
         $this->redis = new \Redis();
         try {
             $this->redis->connect($config['host'], $config['port']);
diff --git a/framework/library/functions/functions.php b/framework/library/functions/functions.php
index 0f8fbc7..407d50a 100644
--- a/framework/library/functions/functions.php
+++ b/framework/library/functions/functions.php
@@ -4,12 +4,13 @@
  * 获取/设置配置
  * @param $key
  * @param string $value
- * @return mixed
+ * @return array|bool|mixed
  */
 function config($key, $value = '__NULL__VALUE__')
 {
     if ($value != '__NULL__VALUE__') {
-        return \top\library\Config::instance()->set($key, $value);
+        \top\library\Config::instance()->set($key, $value);
+        return true;
     } else {
         return \top\library\Config::instance()->get($key);
     }
@@ -17,7 +18,7 @@ function config($key, $value = '__NULL__VALUE__')
 
 /**
  * 请求类
- * @return \top\traits\Instance
+ * @return \top\library\http\Request
  */
 function request()
 {
@@ -26,7 +27,7 @@ function request()
 
 /**
  * 响应类
- * @return \top\traits\Instance
+ * @return \top\library\http\Response
  */
 function response()
 {
@@ -168,7 +169,7 @@ function redirect($url)
  */
 function session($name, $value = '')
 {
-    $config = \top\library\Config::instance()->get('session');
+    $config = config('session');
     if (empty($config) || !$config['prefix']) {
         $prefix = request()->module();
     } else {
diff --git a/framework/library/template/driver/Smarty.php b/framework/library/template/driver/Smarty.php
index 7e7fe4f..466e063 100644
--- a/framework/library/template/driver/Smarty.php
+++ b/framework/library/template/driver/Smarty.php
@@ -2,7 +2,6 @@
 
 namespace top\library\template\driver;
 
-use top\library\Config;
 use top\library\template\ifs\TemplateIfs;
 use top\traits\Instance;
 
@@ -17,11 +16,7 @@ class Smarty implements TemplateIfs
 
     public function run()
     {
-        $this->config = Config::instance()->get('view');
-        $module = request()->module();
-        (!$this->config['dir']) && $this->config['dir'] = APP_PATH . 'home/view/';
-        (!$this->config['cacheDir']) && $this->config['cacheDir'] = './runtime/cache/application/' . $module . '/';
-        (!$this->config['compileDir']) && $this->config['compileDir'] = './runtime/compile/application/' . $module . '/';
+        $this->config = \config('view');
         $this->smarty = new \Smarty();
         $this->smarty->setCacheDir($this->config['cacheDir']);
         $this->smarty->setCompileDir($this->config['compileDir']);
diff --git a/framework/library/template/driver/Top.php b/framework/library/template/driver/Top.php
index d477b4c..1287163 100644
--- a/framework/library/template/driver/Top.php
+++ b/framework/library/template/driver/Top.php
@@ -3,7 +3,6 @@
 namespace top\library\template\driver;
 
 use top\library\cache\driver\File;
-use top\library\Config;
 use top\library\template\driver\engine\Engine;
 use top\library\template\ifs\TemplateIfs;
 use top\traits\Instance;
@@ -30,11 +29,7 @@ class Top implements TemplateIfs
 
     public function run()
     {
-        $this->config = Config::instance()->get('view');
-        $module = request()->module();
-        (!$this->config['dir']) && $this->config['dir'] = APP_PATH . $module . '/view/';
-        (!$this->config['cacheDir']) && $this->config['cacheDir'] = './runtime/cache/application/' . $module . '/';
-        (!$this->config['compileDir']) && $this->config['compileDir'] = './runtime/compile/application/' . $module . '/';
+        $this->config = \config('view');
         $this->engine = Engine::instance($this->config);
         return $this;
     }
diff --git a/framework/library/template/driver/Twig.php b/framework/library/template/driver/Twig.php
index 04721a4..eaa4b71 100644
--- a/framework/library/template/driver/Twig.php
+++ b/framework/library/template/driver/Twig.php
@@ -2,7 +2,6 @@
 
 namespace top\library\template\driver;
 
-use top\library\Config;
 use top\library\template\ifs\TemplateIfs;
 use top\traits\Instance;
 use Twig\Environment;
@@ -17,11 +16,7 @@ class Twig implements TemplateIfs
 
     public function run()
     {
-        $this->config = Config::instance()->get('view');
-        $module = request()->module();
-        (!$this->config['dir']) && $this->config['dir'] = APP_PATH . 'home/view/';
-        (!$this->config['cacheDir']) && $this->config['cacheDir'] = './runtime/cache/application/' . $module . '/';
-        (!$this->config['compileDir']) && $this->config['compileDir'] = './runtime/compile/application/' . $module . '/';
+        $this->config = \config('view');
         return $this;
     }
 
diff --git a/framework/middleware/View.php b/framework/middleware/View.php
index e71af45..f47f0f8 100644
--- a/framework/middleware/View.php
+++ b/framework/middleware/View.php
@@ -3,7 +3,6 @@
 namespace top\middleware;
 
 use top\library\cache\driver\File;
-use top\library\Config;
 use top\library\http\Request;
 use top\library\http\Response;
 use top\middleware\ifs\MiddlewareIfs;
@@ -21,7 +20,7 @@ class View implements MiddlewareIfs
         // 非调试模式则直接返回静态缓存
         if (!DEBUG) {
             $ident = view_cache_ident();
-            $config = Config::instance()->get('view');
+            $config = \config('view');
             (!$config['cacheDir']) && $config['cacheDir'] = './runtime/cache/application/' . request()->module() . '/';
             $cache = File::instance($config['cacheDir']);
             if ($cache->exists($ident)) return Response::instance()->send($cache->get($ident));