From 2de5cc52d13b116074bd22db67c029a433239233 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 30 Jul 2021 11:28:04 +0800
Subject: [PATCH] 启用父部门状态排除顶级节点
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 15 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index f1e2f29..39bf67e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -37,11 +37,7 @@
@PostConstruct
public void init()
{
- List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
- for (SysConfig config : configsList)
- {
- redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
- }
+ loadingConfigCache();
}
/**
@@ -82,6 +78,21 @@
return retConfig.getConfigValue();
}
return StringUtils.EMPTY;
+ }
+
+ /**
+ * 获取验证码开关
+ *
+ * @return true开启，false关闭
+ */
+ public boolean selectCaptchaOnOff()
+ {
+ String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff");
+ if (StringUtils.isEmpty(captchaOnOff))
+ {
+ return true;
+ }
+ return Convert.toBool(captchaOnOff);
}
/**
@@ -137,7 +148,7 @@
* @return 结果
*/
@Override
- public int deleteConfigByIds(Long[] configIds)
+ public void deleteConfigByIds(Long[] configIds)
{
for (Long configId : configIds)
{
@@ -146,27 +157,45 @@
{
throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
}
+ configMapper.deleteConfigById(configId);
+ redisCache.deleteObject(getCacheKey(config.getConfigKey()));
}
- int count = configMapper.deleteConfigByIds(configIds);
- if (count > 0)
- {
- Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
- redisCache.deleteObject(keys);
- }
- return count;
}
/**
- * 清空缓存数据
+ * 加载参数缓存数据
*/
@Override
- public void clearCache()
+ public void loadingConfigCache()
+ {
+ List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
+ for (SysConfig config : configsList)
+ {
+ redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ }
+ }
+
+ /**
+ * 清空参数缓存数据
+ */
+ @Override
+ public void clearConfigCache()
{
Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
redisCache.deleteObject(keys);
}
/**
+ * 重置参数缓存数据
+ */
+ @Override
+ public void resetConfigCache()
+ {
+ clearConfigCache();
+ loadingConfigCache();
+ }
+
+ /**
* 校验参数键名是否唯一
*
* @param config 参数配置信息
--
Gitblit v1.9.2