From 3edad9512be3d2e73cf978235285450439966dd7 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 12 Jul 2022 18:13:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E5=8F=98=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/{ry_20220625.sql => ry_20220712.sql} | 2 +- .../ruoyi/framework/security/service/SysLoginService.java | 4 ++-- .../framework/security/service/SysRegisterService.java | 4 ++-- .../java/com/ruoyi/project/common/CaptchaController.java | 6 +++--- .../ruoyi/project/system/service/ISysConfigService.java | 2 +- .../project/system/service/impl/SysConfigServiceImpl.java | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) rename sql/{ry_20220625.sql => ry_20220712.sql} (99%) diff --git a/sql/ry_20220625.sql b/sql/ry_20220712.sql similarity index 99% rename from sql/ry_20220625.sql rename to sql/ry_20220712.sql index a23d4af..bb5f29c 100644 --- a/sql/ry_20220625.sql +++ b/sql/ry_20220712.sql @@ -759,7 +759,7 @@ comment on column sys_config.remark is '备注'; insert into sys_config values(1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', sysdate, '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow'); insert into sys_config values(2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', sysdate, '', null, '初始化密码 123456'); insert into sys_config values(3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', sysdate, '', null, '深黑主题theme-dark，浅色主题theme-light，深蓝主题theme-blue'); -insert into sys_config values(4, '账号自助-验证码开关', 'sys.account.captchaOnOff', 'true', 'Y', 'admin', sysdate, '', null, '是否开启登录验证码功能（true开启，false关闭）'); +insert into sys_config values(4, '账号自助-验证码开关', 'sys.account.captchaEnabled', 'true', 'Y', 'admin', sysdate, '', null, '是否开启登录验证码功能（true开启，false关闭）'); -- ---------------------------- diff --git a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java b/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java index 8f8766c..f7c195c 100644 --- a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java +++ b/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java @@ -60,9 +60,9 @@ public class SysLoginService */ public String login(String username, String password, String code, String uuid) { - boolean captchaOnOff = configService.selectCaptchaOnOff(); + boolean captchaEnabled = configService.selectCaptchaEnabled(); // 验证码开关 - if (captchaOnOff) + if (captchaEnabled) { validateCaptcha(username, code, uuid); } diff --git a/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java b/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java index a2fea6a..7c02bf1 100644 --- a/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java +++ b/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java @@ -42,9 +42,9 @@ public class SysRegisterService { String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword(); - boolean captchaOnOff = configService.selectCaptchaOnOff(); + boolean captchaEnabled = configService.selectCaptchaEnabled(); // 验证码开关 - if (captchaOnOff) + if (captchaEnabled) { validateCaptcha(username, registerBody.getCode(), registerBody.getUuid()); } diff --git a/src/main/java/com/ruoyi/project/common/CaptchaController.java b/src/main/java/com/ruoyi/project/common/CaptchaController.java index b24d873..13dd70f 100644 --- a/src/main/java/com/ruoyi/project/common/CaptchaController.java +++ b/src/main/java/com/ruoyi/project/common/CaptchaController.java @@ -51,9 +51,9 @@ public class CaptchaController public AjaxResult getCode(HttpServletResponse response) throws IOException { AjaxResult ajax = AjaxResult.success(); - boolean captchaOnOff = configService.selectCaptchaOnOff(); - ajax.put("captchaOnOff", captchaOnOff); - if (!captchaOnOff) + boolean captchaEnabled = configService.selectCaptchaEnabled(); + ajax.put("captchaEnabled", captchaEnabled); + if (!captchaEnabled) { return ajax; } diff --git a/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java b/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java index ff102ce..1b38c42 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java +++ b/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java @@ -31,7 +31,7 @@ public interface ISysConfigService * * @return true开启，false关闭 */ - public boolean selectCaptchaOnOff(); + public boolean selectCaptchaEnabled(); /** * 查询参数配置列表 diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java index 827e75a..2c217d2 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java @@ -83,14 +83,14 @@ public class SysConfigServiceImpl implements ISysConfigService * @return true开启，false关闭 */ @Override - public boolean selectCaptchaOnOff() + 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); } /**