From d4475d0e8d36a75980899246202ea420c3fad935 Mon Sep 17 00:00:00 2001
From: abbfun <819589789@qq.com>
Date: 星期三, 27 七月 2022 17:05:31 +0800
Subject: [PATCH] 优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出） 无搜索条件时可通过search隐藏搜索按钮，工具条组右侧样式超出5px（相对于底部表格）,其父节点gutter代码生成默认10，此处也默认10，使工具组样式左右一致
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
index 35a425c..061af23 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
@@ -2,6 +2,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -41,9 +42,9 @@
{
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());
}
@@ -100,7 +101,7 @@
*/
public void validateCaptcha(String username, String code, String uuid)
{
- String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+ String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
String captcha = redisCache.getCacheObject(verifyKey);
redisCache.deleteObject(verifyKey);
if (captcha == null)
--
Gitblit v1.9.2