From 5a634a4ecd9a34525c4673d74cf01c4e13d60a52 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 10 Apr 2023 18:03:34 +0800
Subject: [PATCH] 修复导入用户时无法更新存在用户数据的问题
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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 39bf67e..3615b88 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
@@ -6,12 +6,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
@@ -85,14 +85,15 @@
*
* @return true开启，false关闭
*/
- public boolean selectCaptchaOnOff()
+ @Override
+ public boolean selectCaptchaEnabled()
{
- String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff");
- if (StringUtils.isEmpty(captchaOnOff))
+ String captchaEnabled = selectConfigByKey("sys.account.captchaEnabled");
+ if (StringUtils.isEmpty(captchaEnabled))
{
return true;
}
- return Convert.toBool(captchaOnOff);
+ return Convert.toBool(captchaEnabled);
}
/**
@@ -133,6 +134,12 @@
@Override
public int updateConfig(SysConfig config)
{
+ SysConfig temp = configMapper.selectConfigById(config.getConfigId());
+ if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey()))
+ {
+ redisCache.deleteObject(getCacheKey(temp.getConfigKey()));
+ }
+
int row = configMapper.updateConfig(config);
if (row > 0)
{
@@ -145,7 +152,6 @@
* 批量删除参数信息
*
* @param configIds 需要删除的参数ID
- * @return 结果
*/
@Override
public void deleteConfigByIds(Long[] configIds)
@@ -155,7 +161,7 @@
SysConfig config = selectConfigById(configId);
if (StringUtils.equals(UserConstants.YES, config.getConfigType()))
{
- throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
+ throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
}
configMapper.deleteConfigById(configId);
redisCache.deleteObject(getCacheKey(config.getConfigKey()));
@@ -181,7 +187,7 @@
@Override
public void clearConfigCache()
{
- Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
+ Collection<String> keys = redisCache.keys(CacheConstants.SYS_CONFIG_KEY + "*");
redisCache.deleteObject(keys);
}
@@ -202,7 +208,7 @@
* @return 结果
*/
@Override
- public String checkConfigKeyUnique(SysConfig config)
+ public boolean checkConfigKeyUnique(SysConfig config)
{
Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
@@ -221,6 +227,6 @@
*/
private String getCacheKey(String configKey)
{
- return Constants.SYS_CONFIG_KEY + configKey;
+ return CacheConstants.SYS_CONFIG_KEY + configKey;
}
}
--
Gitblit v1.9.2