Merge pull request #37 from teamones-open/dev_weijer

fixed: Module用完redis实列就销毁

Author: weijer

src/think/RedisHandler.php

@@ -196,21 +196,27 @@ class RedisHandler
     /**
      * @return RedisManager
      */
-    public static function instance()
+    public static function instance($config)
     {
         if (empty(static::$_manager)) {
-
             if (class_exists('\support\bootstrap\Redis') && isset(\support\bootstrap\Redis::$_manager)) {
                 // 外面配置了redis 句柄直接获取
                 static::$_manager = \support\bootstrap\Redis::$_manager;
             } else {
-                $config = config('redis');
                 static::$_manager = new RedisManager(null, 'phpredis', $config);
             }
         }
         return static::$_manager;
     }
 
+    /**
+     * 销毁实列
+     */
+    public static function  destroy()
+    {
+        static::$_manager = null;
+    }
+
     /**
      * @param $name
      * @param $arguments

src/think/cache/driver/Redis.php

@@ -37,7 +37,7 @@ public function __construct($options = [])
         ];
 
         // 初始化对象
-        RedisHandler::instance();
+        RedisHandler::instance($config);
     }
 
     /**

src/think/module/Module.php

@@ -13,6 +13,7 @@
 
 use think\Db;
 use think\exception\ErrorCode;
+use think\RedisHandler;
 
 class Module
 {
@@ -172,9 +173,11 @@ public static function checkSchema()
             unset($tempDb);
 
             // 清除数据表字段缓存
+            RedisHandler::instance(config('redis'));
             foreach ($tables as $tableName){
                 S('fields_' . strtolower($tableName), null);
             }
+            RedisHandler::destroy();
         } else {
             throw new \RuntimeException('Data structure error. Need module ' . join(',', self::$requireModules), ErrorCode::DATA_STRUCTURE_NEED_MODULE);
         }