From a46c4bf04e3c52ab16f5ed960105088f515c3917 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 08 六月 2022 21:53:08 +0800
Subject: [PATCH] update 优化新增用户与角色信息、用户与岗位信息逻辑
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 41ef261..c258a48 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
@@ -1,21 +1,21 @@
package com.ruoyi.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.annotation.DataSource;
import com.ruoyi.common.constant.Constants;
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;
import com.ruoyi.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
+import java.util.Collection;
+import java.util.List;
/**
* 参数配置 服务层实现
@@ -81,6 +81,22 @@
}
/**
+ * 获取验证码开关
+ *
+ * @return true开启，false关闭
+ */
+ @Override
+ public boolean selectCaptchaOnOff()
+ {
+ String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff");
+ if (StringUtils.isEmpty(captchaOnOff))
+ {
+ return true;
+ }
+ return Convert.toBool(captchaOnOff);
+ }
+
+ /**
* 查询参数配置列表
*
* @param config 参数配置信息
@@ -130,7 +146,6 @@
* 批量删除参数信息
*
* @param configIds 需要删除的参数ID
- * @return 结果
*/
@Override
public void deleteConfigByIds(Long[] configIds)
@@ -140,7 +155,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()));
--
Gitblit v1.9.2