From 07f3517b6f178efea6150429a3867468b718e3c4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 08 八月 2022 18:20:29 +0800
Subject: [PATCH] fix 修复 用户登录与短信登录 国际化格式不一致
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 3170700..010c3be 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
@@ -5,7 +5,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -87,12 +87,12 @@
* @return true寮�鍚紝false鍏抽棴
*/
@Override
- public boolean selectCaptchaOnOff() {
- String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff");
- if (StringUtils.isEmpty(captchaOnOff)) {
+ public boolean selectCaptchaEnabled() {
+ String captchaEnabled = selectConfigByKey("sys.account.captchaEnabled");
+ if (StringUtils.isEmpty(captchaEnabled)) {
return true;
}
- return Convert.toBool(captchaOnOff);
+ return Convert.toBool(captchaEnabled);
}
/**
@@ -136,7 +136,13 @@
*/
@Override
public int updateConfig(SysConfig config) {
- int row = baseMapper.updateById(config);
+ int row = 0;
+ if (config.getConfigId() != null) {
+ row = baseMapper.updateById(config);
+ } else {
+ row = baseMapper.update(config, new LambdaQueryWrapper<SysConfig>()
+ .eq(SysConfig::getConfigKey, config.getConfigKey()));
+ }
if (row > 0) {
RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
}
@@ -147,7 +153,6 @@
* 鎵归噺鍒犻櫎鍙傛暟淇℃伅
*
* @param configIds 闇�瑕佸垹闄ょ殑鍙傛暟ID
- * @return 缁撴灉
*/
@Override
public void deleteConfigByIds(Long[] configIds) {
@@ -177,7 +182,7 @@
*/
@Override
public void clearConfigCache() {
- Collection<String> keys = RedisUtils.keys(Constants.SYS_CONFIG_KEY + "*");
+ Collection<String> keys = RedisUtils.keys(CacheConstants.SYS_CONFIG_KEY + "*");
RedisUtils.deleteObject(keys);
}
@@ -229,6 +234,6 @@
* @return 缂撳瓨閿甼ey
*/
private String getCacheKey(String configKey) {
- return Constants.SYS_CONFIG_KEY + configKey;
+ return CacheConstants.SYS_CONFIG_KEY + configKey;
}
}
--
Gitblit v1.9.3