jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 同步 ruoyi

Browse Source
This commit is contained in:
疯狂的狮子li
2022-07-27 18:34:45 +08:00
parent 1c935819db aff54ab5fe
commit 26b0dc336a
24 changed files with 318 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
View File

@ -37,7 +37,7 @@ public interface ISysConfigService {
*
* @return true开启，false关闭
*/
boolean selectCaptchaOnOff();
boolean selectCaptchaEnabled();
/**
* 查询参数配置列表

4
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
View File

@ -59,9 +59,9 @@ public class SysLoginService {
*/
public String login(String username, String password, String code, String uuid) {
HttpServletRequest request = ServletUtils.getRequest();
boolean captchaOnOff = configService.selectCaptchaOnOff();
boolean captchaEnabled = configService.selectCaptchaEnabled();
// 验证码开关
if (captchaOnOff) {
if (captchaEnabled) {
validateCaptcha(username, code, uuid, request);
}
SysUser user = loadUserByUsername(username);

4
ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java
View File

@ -43,9 +43,9 @@ public class SysRegisterService {
// 校验用户类型是否存在
String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
boolean captchaOnOff = configService.selectCaptchaOnOff();
boolean captchaEnabled = configService.selectCaptchaEnabled();
// 验证码开关
if (captchaOnOff) {
if (captchaEnabled) {
validateCaptcha(username, registerBody.getCode(), registerBody.getUuid(), request);
}

8
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
View File

@ -87,12 +87,12 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
* @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);
}
/**