【优化】代码格式

src/main/java/com/corewing/app/config/SaTokenConfig.java

@@ -24,8 +24,8 @@ public class SaTokenConfig implements WebMvcConfigurer {
         registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
                 // 拦截所有路由
                 .addPathPatterns("/**")
-                // 排除登录、注册、发送验证码接口
+                // 排除登录、注册、发送验证码, 忘记密码接口
-                .excludePathPatterns("/user/login", "/user/register", "/user/sendCode")
+                .excludePathPatterns("/user/login", "/user/register", "/user/sendCode", "/user/forgetPassword")
                 // 排除后台管理登录接口
                 .excludePathPatterns("/sys/user/login")
                 // 排除反馈接口（支持匿名提交）

src/main/java/com/corewing/app/dto/api/ForgetPasswordRequest.java

@@ -0,0 +1,19 @@
+package com.corewing.app.dto.api;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ForgetPasswordRequest {
+
+    @NotBlank(message = "手机号或邮箱不能为空")
+    private String account;
+
+    @NotBlank(message = "验证码不能为空")
+    private String verificationCode;
+
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+}

src/main/java/com/corewing/app/dto/api/SendCodeRequest.java

@@ -17,7 +17,7 @@ public class SendCodeRequest {
     private String account;
 
     /**
-     * 验证码类型：register-注册, login-登录, reset-重置密码
+     * 验证码类型：register-注册, login-登录, reset-重置密码, forget-忘记密码
      */
     @NotBlank(message = "验证码类型不能为空")
     private String type;

src/main/java/com/corewing/app/modules/app/AppUserController.java

@@ -2,15 +2,14 @@ package com.corewing.app.modules.app;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.corewing.app.common.Result;
-import com.corewing.app.dto.api.LoginRequest;
+import com.corewing.app.dto.api.*;
-import com.corewing.app.dto.api.RegisterRequest;
+import com.corewing.app.dto.biz.user.ResetPasswordRequest;
-import com.corewing.app.dto.api.SendCodeRequest;
-import com.corewing.app.dto.api.UpdatePasswordRequest;
 import com.corewing.app.entity.User;
 import com.corewing.app.service.UserService;
 import com.corewing.app.service.VerifyCodeService;
 import com.corewing.app.util.I18nUtil;
 import com.corewing.app.util.IpUtil;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -174,4 +173,14 @@ public class AppUserController {
             return Result.error(e.getMessage());
         }
     }
+
+    /**
+     * 忘记密码
+     * @param request
+     * @return
+     */
+    @PutMapping("/forgetPassword")
+    public Result<String> forgetPassword(@RequestBody ForgetPasswordRequest request) {
+        return Result.isBool(userService.forgetPassword(request));
+    }
 }

src/main/java/com/corewing/app/service/UserService.java

@@ -2,12 +2,11 @@ package com.corewing.app.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.corewing.app.dto.biz.user.BizUserIdRequest;
+import com.corewing.app.dto.api.ForgetPasswordRequest;
 import com.corewing.app.dto.biz.user.BizUserStatusRequest;
 import com.corewing.app.dto.biz.user.ResetPasswordRequest;
 import com.corewing.app.entity.User;
 
-import java.util.List;
 
 /**
  * 应用用户 Service 接口
@@ -115,4 +114,11 @@ public interface UserService extends IService<User> {
      * @return
      */
     boolean batchStatus(BizUserStatusRequest bizUserStatusRequest);
+
+    /**
+     * 忘记密码
+     * @param request
+     * @return
+     */
+    boolean forgetPassword(ForgetPasswordRequest request);
 }

src/main/java/com/corewing/app/service/impl/PrivacyPolicyServiceImpl.java

@@ -8,7 +8,6 @@ import com.corewing.app.entity.PrivacyPolicy;
 import com.corewing.app.mapper.PrivacyPolicyMapper;
 import com.corewing.app.service.PrivacyPolicyService;
 import com.corewing.app.util.DateUtils;
-import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 

src/main/java/com/corewing/app/service/impl/UserServiceImpl.java

@@ -3,11 +3,10 @@ package com.corewing.app.service.impl;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.corewing.app.common.page.PageContext;
-import com.corewing.app.dto.biz.user.BizUserIdRequest;
+import com.corewing.app.dto.api.ForgetPasswordRequest;
 import com.corewing.app.dto.biz.user.BizUserStatusRequest;
 import com.corewing.app.dto.biz.user.ResetPasswordRequest;
 import com.corewing.app.entity.User;
@@ -16,14 +15,13 @@ import com.corewing.app.service.UserService;
 import com.corewing.app.service.VerifyCodeService;
 import com.corewing.app.util.I18nUtil;
 import com.corewing.app.util.Ip2RegionUtil;
+import com.corewing.app.util.RedisUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.DigestUtils;
 import org.springframework.util.StringUtils;
 
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 应用用户 Service 实现类
@@ -34,11 +32,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private final VerifyCodeService verifyCodeService;
     private final Ip2RegionUtil ip2RegionUtil;
     private final UserMapper userMapper;
+    private final RedisUtil redisUtil;
 
-    public UserServiceImpl(VerifyCodeService verifyCodeService, Ip2RegionUtil ip2RegionUtil, UserMapper userMapper) {
+    public UserServiceImpl(VerifyCodeService verifyCodeService, Ip2RegionUtil ip2RegionUtil, UserMapper userMapper, RedisUtil redisUtil) {
         this.verifyCodeService = verifyCodeService;
         this.ip2RegionUtil = ip2RegionUtil;
         this.userMapper = userMapper;
+        this.redisUtil = redisUtil;
     }
 
     @Override
@@ -255,4 +255,22 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         });
         return true;
     }
+
+    @Override
+    public boolean forgetPassword(ForgetPasswordRequest request) {
+        User user = getByAccount(request.getAccount());
+        if(user == null) {
+            throw new RuntimeException(I18nUtil.getMessage("error.user.not.found"));
+        }
+
+        String codeKey = String.format("verify_code:%s:%s", "forget", request.getAccount());
+        String checkCode = redisUtil.get(codeKey).toString();
+        if(!checkCode.equalsIgnoreCase(request.getVerificationCode())) {
+            throw new RuntimeException(I18nUtil.getMessage("error.verify.code.invalid"));
+        }
+
+        String encryptPassword = DigestUtils.md5DigestAsHex(request.getPassword().getBytes(StandardCharsets.UTF_8));
+        user.setPassword(encryptPassword);
+        return updateById(user);
+    }
 }

src/main/java/com/corewing/app/service/impl/VerifyCodeServiceImpl.java

@@ -1,16 +1,12 @@
 package com.corewing.app.service.impl;
 
 import com.corewing.app.service.VerifyCodeService;
-import com.corewing.app.util.EmailUtil;
+import com.corewing.app.util.*;
-import com.corewing.app.util.I18nUtil;
-import com.corewing.app.util.RedisUtil;
-import com.corewing.app.util.SmsBaoUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.util.Random;
-import java.util.regex.Pattern;
 
 /**
  * 验证码服务实现类
@@ -33,16 +29,6 @@ public class VerifyCodeServiceImpl implements VerifyCodeService {
      */
     private static final int CODE_LENGTH = 6;
 
-    /**
-     * 手机号正则
-     */
-    private static final Pattern PHONE_PATTERN = Pattern.compile("^1[3-9]\\d{9}$");
-
-    /**
-     * 邮箱正则
-     */
-    private static final Pattern EMAIL_PATTERN = Pattern.compile("^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$");
-
     public VerifyCodeServiceImpl(RedisUtil redisUtil, SmsBaoUtil smsBaoUtil, EmailUtil emailUtil) {
         this.redisUtil = redisUtil;
         this.smsBaoUtil = smsBaoUtil;
@@ -59,11 +45,7 @@ public class VerifyCodeServiceImpl implements VerifyCodeService {
             throw new RuntimeException(I18nUtil.getMessage("error.verify.type.empty"));
         }
 
-        // 判断是手机号还是邮箱
+        if (!AccountUtil.isPhone(account) && !AccountUtil.isEmail(account)) {
-        boolean isPhone = PHONE_PATTERN.matcher(account).matches();
-        boolean isEmail = EMAIL_PATTERN.matcher(account).matches();
-
-        if (!isPhone && !isEmail) {
             throw new RuntimeException(I18nUtil.getMessage("error.account.format.invalid"));
         }
 
@@ -77,7 +59,7 @@ public class VerifyCodeServiceImpl implements VerifyCodeService {
         log.info("验证码已生成: account={}, type={}, code={}", account, type, code);
 
         // 发送验证码
-        if (isPhone) {
+        if (AccountUtil.isPhone(account)) {
             // 发送短信验证码
             boolean success = smsBaoUtil.sendVerifyCode(account, code);
             if (!success) {

src/main/java/com/corewing/app/util/AccountUtil.java

@@ -0,0 +1,35 @@
+package com.corewing.app.util;
+
+import java.util.regex.Pattern;
+
+public class AccountUtil {
+
+    /**
+     * 手机号正则
+     */
+    private static final Pattern PHONE_PATTERN = Pattern.compile("^1[3-9]\\d{9}$");
+
+    /**
+     * 邮箱正则
+     */
+    private static final Pattern EMAIL_PATTERN = Pattern.compile("^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$");
+
+    /**
+     * 校验是否是手机号
+     * @param email
+     * @return
+     */
+    public static boolean isEmail(String email) {
+        return EMAIL_PATTERN.matcher(email).matches();
+    }
+
+    /**
+     * 校验是否是手机
+     * @param phoneNumber
+     * @return
+     */
+    public static boolean isPhone(String phoneNumber) {
+        return PHONE_PATTERN.matcher(phoneNumber).matches();
+    }
+
+}