diff --git a/.gitignore b/.gitignore index 4c078d24..924960c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.git /.idea /vendor /config/config.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 76e883b4..4130dd6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ -### [v1.5.0](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.0)(2022-01-13) +### [v1.5.0](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.0)(2022-02-17) - 调整对内部人员通知任务类型的前缀 - 调整微信和短信通知发送判断逻辑 +- 清理后台实用工具的无用文件内容 - 支付后解除秒杀商品锁定 - 加强支付流程数据验证 - 加强退款流程数据验证 diff --git a/app/Http/Admin/Views/util/index_cache.volt b/app/Http/Admin/Views/util/index_cache.volt index 75278348..078e8073 100644 --- a/app/Http/Admin/Views/util/index_cache.volt +++ b/app/Http/Admin/Views/util/index_cache.volt @@ -50,40 +50,4 @@ -{% endblock %} - -{% block inline_js %} - - - {% endblock %} \ No newline at end of file diff --git a/app/Providers/Annotation.php b/app/Providers/Annotation.php index 292416db..f4d4ec68 100644 --- a/app/Providers/Annotation.php +++ b/app/Providers/Annotation.php @@ -33,6 +33,7 @@ class Annotation extends Provider 'host' => $config->path('redis.host'), 'port' => $config->path('redis.port'), 'auth' => $config->path('redis.auth'), + 'index' => $config->path('redis.index') ?: 0, 'lifetime' => $config->path('annotation.lifetime') ?: 30 * 86400, 'prefix' => $statsKey . ':', 'statsKey' => $statsKey, diff --git a/app/Providers/Cache.php b/app/Providers/Cache.php index eb8de514..283dfcd7 100644 --- a/app/Providers/Cache.php +++ b/app/Providers/Cache.php @@ -33,6 +33,7 @@ class Cache extends Provider 'host' => $config->path('redis.host'), 'port' => $config->path('redis.port'), 'auth' => $config->path('redis.auth'), + 'index' => $config->path('redis.index') ?: 0, ]); }); } diff --git a/app/Providers/MetaData.php b/app/Providers/MetaData.php index 6c7a2c9b..7c6b4426 100644 --- a/app/Providers/MetaData.php +++ b/app/Providers/MetaData.php @@ -33,6 +33,7 @@ class MetaData extends Provider 'host' => $config->path('redis.host'), 'port' => $config->path('redis.port'), 'auth' => $config->path('redis.auth'), + 'index' => $config->path('redis.index') ?: 0, 'lifetime' => $config->path('metadata.lifetime') ?: 30 * 86400, 'prefix' => $statsKey . ':', 'statsKey' => $statsKey, diff --git a/app/Providers/Session.php b/app/Providers/Session.php index 7aaf654a..17226821 100644 --- a/app/Providers/Session.php +++ b/app/Providers/Session.php @@ -28,6 +28,7 @@ class Session extends Provider 'host' => $config->path('redis.host'), 'port' => $config->path('redis.port'), 'auth' => $config->path('redis.auth'), + 'index' => $config->path('redis.index') ?: 0, 'lifetime' => $config->path('session.lifetime') ?: 24 * 3600, 'prefix' => '_SESSION_:', ]); diff --git a/config/config.default.php b/config/config.default.php index 2a1e5a53..924f027d 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -82,6 +82,11 @@ $config['redis']['host'] = 'redis'; */ $config['redis']['port'] = 6379; +/** + * redis库编号 + */ +$config['redis']['index'] = 0; + /** * redis密码 */