From bb6fe349b56f454f9ec6f01c32f652ecd416f151 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 16 Sep 2025 14:28:38 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserServiceImpl.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 26bb678..e1df447 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -17,6 +17,7 @@
 import com.nq.pojo.reponse.RUserAssets;
 import com.nq.service.*;
 import com.nq.utils.UserPointUtil;
+import com.nq.utils.email.EmailValidator;
 import com.nq.utils.redis.RedisKeyUtil;
 import com.nq.utils.timeutil.DateTimeUtil;
 import com.nq.utils.PropertiesUtil;
@@ -147,16 +148,17 @@
                 StringUtils.isBlank(userPwd) || StringUtils.isBlank(yzmCode)) {
             return ServerResponse.createByErrorMsg("注册失败。该参数不能为空",request);
         }
+        if(!EmailValidator.isValidEmail(phone)){
+            return ServerResponse.createByErrorMsg("请输入正确的邮箱格式",request);
+        }
 
-
-        String keys = "AliyunSmsCode:" + phone;
+        String keys = "emailCode:" + phone;
         String redis_yzm = RedisShardedPoolUtils.get(keys);
 
         log.info("redis_yzm = {},yzmCode = {}", redis_yzm, yzmCode);
         if (!yzmCode.equals(redis_yzm) && !"6666".equals(yzmCode)) {
-            return ServerResponse.createByErrorMsg("由于验证码不正确,注册失败。过程",request);
+            return ServerResponse.createByErrorMsg("验证码不正确或已过期!,注册失败",request);
         }
-
 
         AgentUser agentUser = this.iAgentUserService.findByCode(agentCode);
         if (agentUser == null) {
@@ -204,7 +206,7 @@
 
     public ServerResponse login(String phone, String userPwd, HttpServletRequest request) {
         if (StringUtils.isBlank(phone) || StringUtils.isBlank(userPwd)) {
-            return ServerResponse.createByErrorMsg("手机号码和密码不能为空",request);
+            return ServerResponse.createByErrorMsg("账号和密码不能为空",request);
         }
         userPwd = SymmetricCryptoUtil.encryptPassword(userPwd);
         User user = this.userMapper.login(phone, userPwd);

--
Gitblit v1.9.3