From 2eedf6f62bfad1027864554f06bc4f5104ebaaba Mon Sep 17 00:00:00 2001 From: wangxiangshun Date: Sat, 8 Nov 2025 15:10:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vetti-admin/target/classes/application.yml | 2 +- .../common/core/domain/entity/SysUser.java | 16 ++-- .../web/service/SysRegisterService.java | 80 +++++++++---------- 3 files changed, 47 insertions(+), 51 deletions(-) diff --git a/vetti-admin/target/classes/application.yml b/vetti-admin/target/classes/application.yml index 971effa..2eb1d0e 100644 --- a/vetti-admin/target/classes/application.yml +++ b/vetti-admin/target/classes/application.yml @@ -44,7 +44,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期（默认30分钟） - expireTime: 30 + expireTime: 2400 # MyBatis配置 mybatis: diff --git a/vetti-common/src/main/java/com/vetti/common/core/domain/entity/SysUser.java b/vetti-common/src/main/java/com/vetti/common/core/domain/entity/SysUser.java index 581db5a..d999abb 100644 --- a/vetti-common/src/main/java/com/vetti/common/core/domain/entity/SysUser.java +++ b/vetti-common/src/main/java/com/vetti/common/core/domain/entity/SysUser.java @@ -189,8 +189,8 @@ public class SysUser extends BaseEntity this.deptId = deptId; } - @Xss(message = "用户昵称不能包含脚本字符") - @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") +// @Xss(message = "用户昵称不能包含脚本字符") +// @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") public String getNickName() { return nickName; @@ -201,9 +201,9 @@ public class SysUser extends BaseEntity this.nickName = nickName; } - @Xss(message = "用户账号不能包含脚本字符") - @NotBlank(message = "用户账号不能为空") - @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") +// @Xss(message = "用户账号不能包含脚本字符") +// @NotBlank(message = "用户账号不能为空") +// @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") public String getUserName() { return userName; @@ -214,8 +214,8 @@ public class SysUser extends BaseEntity this.userName = userName; } - @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") +// @Email(message = "邮箱格式不正确") +// @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") public String getEmail() { return email; @@ -226,7 +226,7 @@ public class SysUser extends BaseEntity this.email = email; } - @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") +// @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") public String getPhonenumber() { return phonenumber; diff --git a/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java b/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java index 03a99fa..4482dff 100644 --- a/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java +++ b/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java @@ -3,6 +3,7 @@ package com.vetti.framework.web.service; import com.google.common.collect.Sets; import com.vetti.common.enums.UserFlagEnum; import com.vetti.common.exception.ServiceException; +import com.vetti.common.utils.email.EmailUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.vetti.common.constant.CacheConstants; @@ -26,12 +27,11 @@ import java.util.Set; /** * 注册校验方法 - * + * * @author ruoyi */ @Component -public class SysRegisterService -{ +public class SysRegisterService { @Autowired private ISysUserService userService; @@ -39,14 +39,15 @@ public class SysRegisterService private RedisCache redisCache; //邮箱白名单 - private Set loginWhitelist = Sets.newHashSet("w_wangxiangshun@163.com","qiufenglengwu@163.com"); + private Set loginWhitelist = Sets.newHashSet("w_wangxiangshun@163.com", "qiufenglengwu@163.com"); + @Autowired + private EmailUtil emailUtil; /** * 注册 */ - public String register(RegisterBody registerBody) - { + public String register(RegisterBody registerBody) { String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword(); SysUser sysUser = new SysUser(); sysUser.setUserName(username); @@ -66,48 +67,35 @@ public class SysRegisterService } } } - if (StringUtils.isEmpty(username)) - { + if (StringUtils.isEmpty(username)) { // msg = "用户名不能为空"; throw new ServiceException(MessageUtils.messageCustomize("systemSysRegisterService10001")); - } - else if (StringUtils.isEmpty(password)) - { + } else if (StringUtils.isEmpty(password)) { // msg = "用户密码不能为空"; throw new ServiceException(MessageUtils.messageCustomize("systemSysRegisterService10002")); - } -// else if (username.length() < UserConstants.USERNAME_MIN_LENGTH -// || username.length() > UserConstants.USERNAME_MAX_LENGTH) -// { -//// msg = "账户长度必须在2到20个字符之间"; -// throw new ServiceException(MessageUtils.messageCustomize("systemSysRegisterService10003")); -// } - else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH - || password.length() > UserConstants.PASSWORD_MAX_LENGTH) - { + } else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) { // msg = "密码长度必须在5到20个字符之间"; throw new ServiceException(MessageUtils.messageCustomize("systemSysRegisterService10004")); - } - else if (!userService.checkUserNameUnique(sysUser)) - { + } else if (!userService.checkUserNameUnique(sysUser)) { // msg = "保存用户'" + username + "'失败，注册账号已存在"; throw new ServiceException(MessageUtils.messageCustomize("systemSysRegisterService10005")); - } - else - { + } else { sysUser.setUserFlag(UserFlagEnum.FLAG_1.getCode()); sysUser.setSysUserType(registerBody.getSysUserType()); - sysUser.setNickName(username); +// sysUser.setNickName(username); sysUser.setPwdUpdateDate(DateUtils.getNowDate()); sysUser.setPassword(SecurityUtils.encryptPassword(password)); + if (isValidEmail(sysUser.getUserName())) { + sysUser.setEmail(sysUser.getUserName()); + }else{ + sysUser.setPhonenumber(sysUser.getUserName()); + } boolean regFlag = userService.registerUser(sysUser); - if (!regFlag) - { + if (!regFlag) { // msg = "注册失败,请联系系统管理人员"; throw new ServiceException(MessageUtils.messageCustomize("systemSysRegisterService10007")); - } - else - { + } else { AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success"))); } } @@ -116,24 +104,32 @@ public class SysRegisterService /** * 校验验证码 - * + * * @param username 用户名 - * @param code 验证码 - * @param uuid 唯一标识 + * @param code 验证码 + * @param uuid 唯一标识 * @return 结果 */ - public void validateCaptcha(String username, String code, String uuid) - { + public void validateCaptcha(String username, String code, String uuid) { String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); String captcha = redisCache.getCacheObject(verifyKey); redisCache.deleteObject(verifyKey); - if (captcha == null) - { + if (captcha == null) { throw new CaptchaExpireException(); } - if (!code.equalsIgnoreCase(captcha)) - { + if (!code.equalsIgnoreCase(captcha)) { throw new CaptchaException(); } } + + + /** + * 邮箱格式验证 + * @param email + * @return + */ + private boolean isValidEmail(String email) { + String emailRegex = "^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$"; + return email.matches(emailRegex); + } }