From 8253a0ce52432aef2b6ad6e64473144b8df2ffde Mon Sep 17 00:00:00 2001 From: devil Date: Sun, 15 Nov 2020 20:34:18 +0800 Subject: [PATCH] =?UTF-8?q?redis=E7=BC=93=E5=AD=98=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Site.php | 10 - application/install/controller/Index.php | 8 - .../service/BaseConfigHandleService.php | 204 ------------------ config/.gitignore | 4 +- config/cache.php | 45 ++++ config/session.php | 49 +++++ 6 files changed, 95 insertions(+), 225 deletions(-) delete mode 100644 application/service/BaseConfigHandleService.php create mode 100755 config/cache.php create mode 100755 config/session.php diff --git a/application/admin/controller/Site.php b/application/admin/controller/Site.php index 06776edbf..f7081a3c9 100755 --- a/application/admin/controller/Site.php +++ b/application/admin/controller/Site.php @@ -12,7 +12,6 @@ namespace app\admin\controller; use app\service\ConfigService; use app\service\GoodsService; -use app\service\BaseConfigHandleService; /** * 站点设置 @@ -257,15 +256,6 @@ class Site extends Common case 'forgetpwd' : cache(config('shopxo.cache_user_forgetpwd_left_key'), null); break; - - // 缓存 - case 'cache' : - $res = BaseConfigHandleService::Run(); - if($res['code'] != 0) - { - return $res; - } - break; } } diff --git a/application/install/controller/Index.php b/application/install/controller/Index.php index 865c23d6b..472eef183 100755 --- a/application/install/controller/Index.php +++ b/application/install/controller/Index.php @@ -11,7 +11,6 @@ namespace app\install\controller; use think\Db; -use app\service\BaseConfigHandleService; /** * 安装程序 @@ -161,13 +160,6 @@ class Index extends Common die('非法访问'); } - // 校验cache和session配置生成 - $ret = BaseConfigHandleService::Run(); - if($ret['code'] != 0) - { - return $ret; - } - // 参数 $params = input('post.'); $ret = $this->ParamsCheck($params); diff --git a/application/service/BaseConfigHandleService.php b/application/service/BaseConfigHandleService.php deleted file mode 100644 index 9a2dd6efb..000000000 --- a/application/service/BaseConfigHandleService.php +++ /dev/null @@ -1,204 +0,0 @@ - 'redis', - // 连接地址 - 'host' => MyC('common_cache_session_redis_host', '127.0.0.1', true), - // 端口号 - 'port' => MyC('common_cache_session_redis_port', 6379, true), - // 密码 - 'password' => MyC('common_cache_session_redis_password', '', true), - // 全局缓存有效期、默认3600秒 - 'expire' => MyC('common_cache_session_redis_expire', 3600, true), - // 缓存前缀 - 'prefix' => MyC('common_cache_session_redis_prefix', 'shopxo', true), - ]; - } else { - $config = [ - // session_id - 'id' => '', - // SESSION_ID的提交变量,解决flash上传跨域 - 'var_session_id' => '', - // SESSION 前缀 - 'prefix' => 'shopxo', - // 驱动方式 支持redis memcache memcached - 'type' => '', - // 过期时间(默认3600秒) - 'expire' => 3600, - // 是否自动开启 SESSION - 'auto_start' => true, - ]; - } - - // 配置文件 - $file_dir = ROOT.'config'.DS; - $file_name = 'session.php'; - - // 保存文件 - return self::ConfigFileSave($file_dir, $file_name, $config, 'Session配置'); - } - - /** - * cache配置处理 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2020-09-25 - * @desc description - * @param [array] $params [输入参数] - */ - public static function CacheHandle($params = []) - { - // 是否使用缓存 - if(MyC('common_data_is_use_cache') == 1) - { - $config = [ - // 使用redis - 'type' => 'redis', - // 连接地址 - 'host' => MyC('common_cache_data_redis_host', '127.0.0.1', true), - // 端口号 - 'port' => MyC('common_cache_data_redis_port', 6379, true), - // 密码 - 'password' => MyC('common_cache_data_redis_password', '', true), - // 全局缓存有效期（0为永久有效） - 'expire' => MyC('common_cache_data_redis_expire', 0, true), - // 缓存前缀 - 'prefix' => MyC('common_cache_data_redis_prefix', 'shopxo', true), - ]; - - } else { - $config = [ - // 驱动方式 - 'type' => 'File', - // 缓存保存目录 - 'path' => '', - // 缓存前缀 - 'prefix' => 'shopxo', - // 缓存有效期 0表示永久缓存 - 'expire' => 0, - ]; - } - - // 配置文件 - $file_dir = ROOT.'config'.DS; - $file_name = 'cache.php'; - - // 保存文件 - return self::ConfigFileSave($file_dir, $file_name, $config, '缓存配置'); - } - - /** - * 配置文件保存 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2020-09-25 - * @desc description - * @param [string] $file_dir [文件路径] - * @param [string] $file_name [文件名称] - * @param [array] $config [配置信息] - * @param [string] $name [描述名称] - */ - private static function ConfigFileSave($file_dir, $file_name, $config, $name) - { - // 是否有写权限 - $config_file = $file_dir.$file_name; - if(file_exists($config_file)) - { - if(!is_writable($config_file)) - { - return DataReturn($name.'文件没有操作权限'.'['.$config_file.']', -10); - } - } else { - if(!is_dir($file_dir)) - { - return DataReturn($name.'路径不存在'.'['.$file_dir.']', -11); - } - if(!is_writable($file_dir)) - { - return DataReturn($name.'路径没有操作权限'.'['.$file_dir.']', -12); - } - } - - // 生成配置文件 - $ret = @file_put_contents($config_file, ""); - if($ret === false) - { - return DataReturn($name.'处理失败['.$config_file.']', -100); - } - return DataReturn('处理成功', 0); - } -} -?> \ No newline at end of file diff --git a/config/.gitignore b/config/.gitignore index 5051b7f2e..6b502227c 100755 --- a/config/.gitignore +++ b/config/.gitignore @@ -1,3 +1 @@ -database.php -cache.php -session.php \ No newline at end of file +database.php \ No newline at end of file diff --git a/config/cache.php b/config/cache.php new file mode 100755 index 000000000..eed6c57ff --- /dev/null +++ b/config/cache.php @@ -0,0 +1,45 @@ + 'redis', + // 连接地址 + 'host' => MyFileConfig('common_cache_data_redis_host', '', '127.0.0.1', true), + // 端口号 + 'port' => MyFileConfig('common_cache_data_redis_port', '', 6379, true), + // 密码 + 'password' => MyFileConfig('common_cache_data_redis_password', '', '', true), + // 全局缓存有效期（0为永久有效） + 'expire' => MyFileConfig('common_cache_data_redis_expire', '', 0, true), + // 缓存前缀 + 'prefix' => MyFileConfig('common_cache_data_redis_prefix', '', 'shopxo', true), + ]; +} else { + // 默认配置 + $config = [ + // 驱动方式 + 'type' => 'File', + // 缓存保存目录 + 'path' => '', + // 缓存前缀 + 'prefix' => 'shopxo', + // 缓存有效期 0表示永久缓存 + 'expire' => 0, + ]; +} +return $config; +?> \ No newline at end of file diff --git a/config/session.php b/config/session.php new file mode 100755 index 000000000..02ecf2635 --- /dev/null +++ b/config/session.php @@ -0,0 +1,49 @@ + 'redis', + // 连接地址 + 'host' => MyFileConfig('common_cache_session_redis_host', '', '127.0.0.1', true), + // 端口号 + 'port' => MyFileConfig('common_cache_session_redis_port', '', 6379, true), + // 密码 + 'password' => MyFileConfig('common_cache_session_redis_password', '', '', true), + // 全局缓存有效期、默认3600秒 + 'expire' => MyFileConfig('common_cache_session_redis_expire', '', 3600, true), + // 缓存前缀 + 'prefix' => MyFileConfig('common_cache_session_redis_prefix', '', 'shopxo', true), + ]; +} else { + // 默认配置 + $config = [ + // session_id + 'id' => '', + // SESSION_ID的提交变量,解决flash上传跨域 + 'var_session_id' => '', + // SESSION 前缀 + 'prefix' => 'shopxo', + // 驱动方式 支持redis memcache memcached + 'type' => '', + // 过期时间(默认3600秒) + 'expire' => 3600, + // 是否自动开启 SESSION + 'auto_start' => true, + ]; +} +return $config; +?> \ No newline at end of file -- GitLab