From f5c69bae308b0d69a6eee7cb0864fec7285c753c Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期六, 12 二月 2022 11:53:29 +0800
Subject: [PATCH] !425 优化默认值的问题，Model中不建议有默认值的逻辑 Merge pull request !425 from Yancey/default_value_optimization
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
index a1f8b83..583b7a6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@@ -25,7 +25,7 @@
/**
* 鍞竴鏍囪瘑
*/
- private String uuid = "";
+ private String uuid;
public String getUsername()
{
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..c7de444 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
@@ -100,7 +100,7 @@
*/
public void validateCaptcha(String username, String code, String uuid)
{
- String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+ String verifyKey = Constants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
String captcha = redisCache.getCacheObject(verifyKey);
redisCache.deleteObject(verifyKey);
if (captcha == null)
--
Gitblit v1.9.3