From 0d546e4ba491cbfc77d63b2b30b33b69bd7e46d0 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 30 May 2020 13:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=AE=A1=E7=90=86=E6=94=AF?=
=?UTF-8?q?=E6=8C=81=E7=BC=93=E5=AD=98=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/api/system/config.js | 8 ++
ruoyi-ui/src/views/system/config/index.vue | 22 ++++-
.../com/ruoyi/common/constant/Constants.java | 5 ++
.../controller/SysConfigController.java | 12 +++
.../system/service/ISysConfigService.java | 13 ++-
.../service/impl/SysConfigServiceImpl.java | 87 +++++++++++++++----
6 files changed, 122 insertions(+), 25 deletions(-)
diff --git a/ruoyi-ui/src/api/system/config.js b/ruoyi-ui/src/api/system/config.js
index 124c9812f..2221540e5 100644
--- a/ruoyi-ui/src/api/system/config.js
+++ b/ruoyi-ui/src/api/system/config.js
@@ -51,6 +51,14 @@ export function delConfig(configId) {
})
}
+// 清理参数缓存
+export function clearCache() {
+ return request({
+ url: '/system/config/clearCache',
+ method: 'delete'
+ })
+}
+
// 导出参数
export function exportConfig(query) {
return request({
diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue
index c2a68f903..e32d2ee1e 100644
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@@ -88,6 +88,15 @@
v-hasPermi="['system:config:export']"
>导出</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ icon="el-icon-refresh"
+ size="mini"
+ @click="handleClearCache"
+ v-hasPermi="['system:config:remove']"
+ >清理缓存</el-button>
+ </el-col>
</el-row>
<el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
@@ -165,7 +174,7 @@
</template>
<script>
-import { listConfig, getConfig, delConfig, addConfig, updateConfig, exportConfig } from "@/api/system/config";
+import { listConfig, getConfig, delConfig, addConfig, updateConfig, exportConfig, clearCache } from "@/api/system/config";
export default {
name: "Config",
@@ -340,6 +349,17 @@ export default {
}).then(response => {
this.download(response.msg);
}).catch(function() {});
+ },
+ /** 清理缓存按钮操作 */
+ handleClearCache() {
+ const queryParams = this.queryParams;
+ clearCache().then(response => {
+ if (response.code === 200) {
+ this.msgSuccess("清理成功");
+ } else {
+ this.msgError(response.msg);
+ }
+ });
}
}
};
diff --git a/ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
index 768bc24be..a2a32b43a 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -109,6 +109,11 @@ public class Constants
*/
public static final String JWT_AUTHORITIES = "authorities";
+ /**
+ * 参数管理 cache key
+ */
+ public static final String SYS_CONFIG_KEY = "sys_config:";
+
/**
* 资源映射路径 前缀
*/
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
index 1d59084d7..9a832cb59 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
@@ -118,4 +118,16 @@ public class SysConfigController extends BaseController
{
return toAjax(configService.deleteConfigByIds(configIds));
}
+
+ /**
+ * 清空缓存
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+ @DeleteMapping("/clearCache")
+ public AjaxResult clearCache()
+ {
+ configService.clearCache();
+ return AjaxResult.success();
+ }
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
index 9fa70fcda..4d95ee7e9 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
@@ -50,14 +50,6 @@ public interface ISysConfigService
*/
public int updateConfig(SysConfig config);
- /**
- * 删除参数配置信息
- *
- * @param configId 参数ID
- * @return 结果
- */
- public int deleteConfigById(Long configId);
-
/**
* 批量删除参数信息
*
@@ -66,6 +58,11 @@ public interface ISysConfigService
*/
public int deleteConfigByIds(Long[] configIds);
+ /**
+ * 清空缓存数据
+ */
+ public void clearCache();
+
/**
* 校验参数键名是否唯一
*
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
index fa54a6b3c..e0b008ca8 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
@@ -1,10 +1,15 @@
package com.ruoyi.project.system.service.impl;
+import java.util.Collection;
import java.util.List;
+import javax.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.project.system.domain.SysConfig;
import com.ruoyi.project.system.mapper.SysConfigMapper;
import com.ruoyi.project.system.service.ISysConfigService;
@@ -20,6 +25,22 @@ public class SysConfigServiceImpl implements ISysConfigService
@Autowired
private SysConfigMapper configMapper;
+ @Autowired
+ private RedisCache redisCache;
+
+ /**
+ * 项目启动时，初始化参数到缓存
+ */
+ @PostConstruct
+ public void init()
+ {
+ List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
+ for (SysConfig config : configsList)
+ {
+ redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ }
+ }
+
/**
* 查询参数配置信息
*
@@ -43,10 +64,20 @@ public class SysConfigServiceImpl implements ISysConfigService
@Override
public String selectConfigByKey(String configKey)
{
+ String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
+ if (StringUtils.isNotEmpty(configValue))
+ {
+ return configValue;
+ }
SysConfig config = new SysConfig();
config.setConfigKey(configKey);
SysConfig retConfig = configMapper.selectConfig(config);
- return StringUtils.isNotNull(retConfig) ? retConfig.getConfigValue() : "";
+ if (StringUtils.isNotNull(retConfig))
+ {
+ redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
+ return retConfig.getConfigValue();
+ }
+ return StringUtils.EMPTY;
}
/**
@@ -70,7 +101,12 @@ public class SysConfigServiceImpl implements ISysConfigService
@Override
public int insertConfig(SysConfig config)
{
- return configMapper.insertConfig(config);
+ int row = configMapper.insertConfig(config);
+ if (row > 0)
+ {
+ redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ }
+ return row;
}
/**
@@ -82,19 +118,12 @@ public class SysConfigServiceImpl implements ISysConfigService
@Override
public int updateConfig(SysConfig config)
{
- return configMapper.updateConfig(config);
- }
-
- /**
- * 删除参数配置信息
- *
- * @param configId 参数ID
- * @return 结果
- */
- @Override
- public int deleteConfigById(Long configId)
- {
- return configMapper.deleteConfigById(configId);
+ int row = configMapper.updateConfig(config);
+ if (row > 0)
+ {
+ redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ }
+ return row;
}
/**
@@ -106,7 +135,22 @@ public class SysConfigServiceImpl implements ISysConfigService
@Override
public int deleteConfigByIds(Long[] configIds)
{
- return configMapper.deleteConfigByIds(configIds);
+ int count = configMapper.deleteConfigByIds(configIds);
+ if (count > 0)
+ {
+ Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
+ redisCache.deleteObject(keys);
+ }
+ return count;
+ }
+
+ /**
+ * 清空缓存数据
+ */
+ public void clearCache()
+ {
+ Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
+ redisCache.deleteObject(keys);
}
/**
@@ -126,4 +170,15 @@ public class SysConfigServiceImpl implements ISysConfigService
}
return UserConstants.UNIQUE;
}
+
+ /**
+ * 设置cache key
+ *
+ * @param configKey 参数键
+ * @return 缓存键key
+ */
+ private String getCacheKey(String configKey)
+ {
+ return Constants.SYS_CONFIG_KEY + configKey;
+ }
}