From 281b04554e88035c968d85b9896d5b349cc94efe Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Tue, 3 Jun 2025 20:37:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E7=9A=84=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E7=8E=B0token=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/userInfo/UserInfoController.java      |  4 ++--
 .../promotion/service/userInfo/UserInfoService.java  |  2 +-
 .../service/userInfo/impl/UserInfoServiceImpl.java   | 12 +++++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java
index 0b84d88..572d6d5 100644
--- a/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java
+++ b/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java
@@ -163,7 +163,7 @@ public class UserInfoController {
     @Operation(summary = "小程序用户重置密码（外部）", description = "参数：小程序用户密码重置请求体，权限：管理员（boss, admin)，方法名：userInfoMiniOuterResetPwd")
 //    @SysLog(title = "用户管理", content = "小程序用户重置密码（外部）")
     public BaseResponse<Boolean> userInfoMiniOuterResetPwd(@Valid @RequestBody UserInfoResetRequest userInfoResetRequest) {
-        userInfoService.userInfoMiniResetPwd(userInfoResetRequest);
+        userInfoService.userInfoMiniResetPwd(userInfoResetRequest, false);
         return ResultUtils.success(true);
     }
 
@@ -178,7 +178,7 @@ public class UserInfoController {
     @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
 //    @SysLog(title = "用户管理", content = "小程序用户重置密码（内部）")
     public BaseResponse<Boolean> userInfoMiniInnerResetPwd(@Valid @RequestBody UserInfoResetRequest userInfoResetRequest) {
-        userInfoService.userInfoMiniResetPwd(userInfoResetRequest);
+        userInfoService.userInfoMiniResetPwd(userInfoResetRequest, true);
         return ResultUtils.success(true);
     }
 
diff --git a/src/main/java/com/greenorange/promotion/service/userInfo/UserInfoService.java b/src/main/java/com/greenorange/promotion/service/userInfo/UserInfoService.java
index 287ce44..1029f46 100644
--- a/src/main/java/com/greenorange/promotion/service/userInfo/UserInfoService.java
+++ b/src/main/java/com/greenorange/promotion/service/userInfo/UserInfoService.java
@@ -48,7 +48,7 @@ public interface UserInfoService extends IService<UserInfo> {
     /**
      * 小程序用户重置密码
      */
-    void userInfoMiniResetPwd(UserInfoResetRequest userInfoResetRequest);
+    String userInfoMiniResetPwd(UserInfoResetRequest userInfoResetRequest, boolean isInner);
 
 
     /**
diff --git a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java
index 6ccca62..0bcc15b 100644
--- a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java
+++ b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java
@@ -251,7 +251,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
      * 小程序用户重置密码
      */
     @Override
-    public void userInfoMiniResetPwd(UserInfoResetRequest userInfoResetRequest) {
+    public String userInfoMiniResetPwd(UserInfoResetRequest userInfoResetRequest, boolean isInner) {
         String phoneNumber = userInfoResetRequest.getPhoneNumber();
         ThrowUtils.throwIf(RegexUtils.isPhoneInvalid(phoneNumber), ErrorCode.PARAMS_ERROR, "手机号格式无效");
 
@@ -270,6 +270,16 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
         LambdaUpdateWrapper<UserInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         lambdaUpdateWrapper.eq(UserInfo::getPhoneNumber, phoneNumber).set(UserInfo::getUserPassword, userPassword);
         this.update(lambdaUpdateWrapper);
+
+        String token = "密码重置成功";
+        if (isInner) {
+            Map<String, String> payload = new HashMap<>();
+            payload.put("userAccount", phoneNumber);
+            payload.put("userPassword", userPassword);
+            token = jwtUtils.generateToken(payload);
+        }
+        // 更新token
+        return token;
     }