更新登录BUG

LiangZhiYUMao/pages/matchmaker-workbench/index.vue

@@ -21,7 +21,7 @@
 				<view class="welcome-text">
 					<text class="welcome-title">欢迎回来</text>
 					<text class="heart-icon">❤️</text>
-					<text class="matchmaker-name">高红娘</text>
+					<text class="matchmaker-name">{{}}</text>
 				</view>
 				<view class="avatar"></view>
 			</view>
@@ -143,7 +143,8 @@ export default {
 			return {
 				bestMatchmakers: [],
 				announcements: [],
-				currentAnnouncementIndex: 0
+				currentAnnouncementIndex: 0,
+				makerName: uni.getStorageSync("userInfo").nickname
 			}
 		},
 		computed: {

service/login/src/main/java/com/zhentao/controller/AuthCodeController.java

@@ -28,103 +28,103 @@ import java.util.Map;
 @ConditionalOnProperty(prefix = "redis", name = "enabled", havingValue = "true", matchIfMissing = true)
 public class AuthCodeController {
 
-//    @Autowired
-//    private SmsService smsService;
+    @Autowired
+    private SmsService smsService;
 
     @Autowired
     private JwtUtil jwtUtil;
 
     @Autowired
     private WeChatService weChatService;
-    
+
     @Autowired
     private UsersService usersService;
-    
+
     @Autowired
     private AvatarUploadUtil avatarUploadUtil;
-    
+
     private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
 
-//    /**
-//     * 发送登录验证码（不依赖数据库）
-//     */
-//    @PostMapping("/send-code")
-//    public Result<Void> sendCode(@RequestBody SmsSendRequest req) {
-//        if (req == null || req.getPhone() == null || req.getPhone().trim().isEmpty()) {
-//            return Result.error(400, "手机号不能为空");
-//        }
-//        boolean ok = smsService.sendLoginCode(req.getPhone().trim());
-//        if (!ok) {
-//            return Result.error(500, "验证码发送失败");
-//        }
-//        return Result.success();
-//    }
-//
-//    /**
-//     * 验证码登录：校验通过后查询或创建用户，签发JWT
-//     */
-//    @PostMapping("/sms-login")
-//    public Result<LoginResponse> smsLogin(@RequestBody SmsLoginRequest req) {
-//        System.out.println("=== 验证码登录请求 ===");
-//        if (req == null || req.getPhone() == null || req.getCode() == null) {
-//            return Result.error(400, "手机号或验证码不能为空");
-//        }
-//
-//        System.out.println("手机号: " + req.getPhone());
-//        boolean passed = smsService.verifyLoginCode(req.getPhone().trim(), req.getCode().trim());
-//        if (!passed) {
-//            System.out.println("❌ 验证码验证失败");
-//            return Result.error(401, "验证码错误或已过期");
-//        }
-//
-//        System.out.println("✅ 验证码验证成功");
-//
-//        // 查询数据库中的用户
-//        Users user = usersService.getOne(new LambdaQueryWrapper<Users>()
-//                .eq(Users::getPhone, req.getPhone().trim())
-//                .eq(Users::getStatus, 1), false);
-//
-//        // 如果用户不存在，创建新用户
-//        if (user == null) {
-//            System.out.println("⚠️ 用户不存在，创建新用户");
-//            user = new Users();
-//            user.setPhone(req.getPhone().trim());
-//            user.setNickname("用户" + req.getPhone().substring(Math.max(0, req.getPhone().length() - 4)));
-//            user.setStatus(1);
-//            user.setPassword(null);
-//            user.setCreatedAt(new Date());
-//            user.setUpdatedAt(new Date());
-//            user.setSourceChannel("sms");
-//
-//            // 保存到数据库，自动生成userId
-//            usersService.save(user);
-//            System.out.println("✅ 创建新用户成功，ID: " + user.getUserId());
-//        } else {
-//            System.out.println("✅ 找到现有用户，ID: " + user.getUserId());
-//            // 更新最后登录时间
-//            user.setLastLoginAt(new Date());
-//            usersService.updateById(user);
-//        }
-//
-//        // 生成JWT令牌
-//        Map<String, Object> claims = new HashMap<>();
-//        claims.put("userId", user.getUserId());
-//        claims.put("nickname", user.getNickname());
-//        claims.put("phone", user.getPhone());
-//        String token = jwtUtil.generateToken(claims);
-//
-//        System.out.println("✅ JWT token生成成功");
-//
-//        // 构造响应，避免泄露密码
-//        user.setPassword(null);
-//        LoginResponse resp = new LoginResponse();
-//        resp.setToken(token);
-//        resp.setUser(user);
-//
-//        System.out.println("✅ 验证码登录成功，返回用户信息");
-//        System.out.println("返回的用户ID: " + user.getUserId() + " (类型: " + user.getUserId().getClass().getSimpleName() + ")");
-//        return Result.success(resp);
-//    }
+    /**
+     * 发送登录验证码（不依赖数据库）
+     */
+    @PostMapping("/send-code")
+    public Result<Void> sendCode(@RequestBody SmsSendRequest req) {
+        if (req == null || req.getPhone() == null || req.getPhone().trim().isEmpty()) {
+            return Result.error(400, "手机号不能为空");
+        }
+        boolean ok = smsService.sendLoginCode(req.getPhone().trim());
+        if (!ok) {
+            return Result.error(500, "验证码发送失败");
+        }
+        return Result.success();
+    }
+
+    /**
+     * 验证码登录：校验通过后查询或创建用户，签发JWT
+     */
+    @PostMapping("/sms-login")
+    public Result<LoginResponse> smsLogin(@RequestBody SmsLoginRequest req) {
+        System.out.println("=== 验证码登录请求 ===");
+        if (req == null || req.getPhone() == null || req.getCode() == null) {
+            return Result.error(400, "手机号或验证码不能为空");
+        }
+
+        System.out.println("手机号: " + req.getPhone());
+        boolean passed = smsService.verifyLoginCode(req.getPhone().trim(), req.getCode().trim());
+        if (!passed) {
+            System.out.println("❌ 验证码验证失败");
+            return Result.error(401, "验证码错误或已过期");
+        }
+
+        System.out.println("✅ 验证码验证成功");
+
+        // 查询数据库中的用户
+        Users user = usersService.getOne(new LambdaQueryWrapper<Users>()
+                .eq(Users::getPhone, req.getPhone().trim())
+                .eq(Users::getStatus, 1), false);
+
+        // 如果用户不存在，创建新用户
+        if (user == null) {
+            System.out.println("⚠️ 用户不存在，创建新用户");
+            user = new Users();
+            user.setPhone(req.getPhone().trim());
+            user.setNickname("用户" + req.getPhone().substring(Math.max(0, req.getPhone().length() - 4)));
+            user.setStatus(1);
+            user.setPassword(null);
+            user.setCreatedAt(new Date());
+            user.setUpdatedAt(new Date());
+            user.setSourceChannel("sms");
+
+            // 保存到数据库，自动生成userId
+            usersService.save(user);
+            System.out.println("✅ 创建新用户成功，ID: " + user.getUserId());
+        } else {
+            System.out.println("✅ 找到现有用户，ID: " + user.getUserId());
+            // 更新最后登录时间
+            user.setLastLoginAt(new Date());
+            usersService.updateById(user);
+        }
+
+        // 生成JWT令牌
+        Map<String, Object> claims = new HashMap<>();
+        claims.put("userId", user.getUserId());
+        claims.put("nickname", user.getNickname());
+        claims.put("phone", user.getPhone());
+        String token = jwtUtil.generateToken(claims);
+
+        System.out.println("✅ JWT token生成成功");
+
+        // 构造响应，避免泄露密码
+        user.setPassword(null);
+        LoginResponse resp = new LoginResponse();
+        resp.setToken(token);
+        resp.setUser(user);
+
+        System.out.println("✅ 验证码登录成功，返回用户信息");
+        System.out.println("返回的用户ID: " + user.getUserId() + " (类型: " + user.getUserId().getClass().getSimpleName() + ")");
+        return Result.success(resp);
+    }
 
     /**
      * 微信授权登录：传入 wx.login 的临时 code，后端调用 jscode2session，查询或创建用户并返回 JWT
@@ -142,39 +142,28 @@ public class AuthCodeController {
             System.out.println("❌ 微信接口调用失败: " + msg);
             return Result.error(502, msg);
         }
-        
+
         String openid = String.valueOf(wx.get("openid"));
         String unionid = wx.get("unionid") != null ? String.valueOf(wx.get("unionid")) : null;
         System.out.println("✅ 获取到微信openid: " + openid);
-        
+
         // 根据openid查询用户
         Users user = usersService.getOne(new LambdaQueryWrapper<Users>()
                 .eq(Users::getWechatOpenid, openid)
                 .eq(Users::getStatus, 1), false);
-        
+
         // 如果用户不存在，创建新用户
         if (user == null) {
             System.out.println("⚠️ 微信用户不存在，创建新用户");
             user = new Users();
-            
-            // ✅ 生成默认昵称
-            String defaultNickname = "微信用户";
-            if (req.getNickname() != null && !req.getNickname().trim().isEmpty()) {
-                user.setNickname(req.getNickname().trim());
-            } else if (user.getPhone() != null && !user.getPhone().trim().isEmpty()) {
-                // 如果有手机号，使用"用户+手机号后四位"
-                String phone = user.getPhone().trim();
-                defaultNickname = "用户" + phone.substring(Math.max(0, phone.length() - 4));
-                user.setNickname(defaultNickname);
-            } else {
-                // 随机生成4位数字作为后缀
-                int randomNum = (int) (Math.random() * 9000) + 1000;
-                defaultNickname = "微信用户" + randomNum;
-                user.setNickname(defaultNickname);
-            }
-            
+
+            // ✅ 使用前端传来的昵称
+            user.setNickname(req.getNickname() != null && !req.getNickname().trim().isEmpty()
+                    ? req.getNickname().trim()
+                    : "微信用户");
+
             System.out.println("设置用户昵称: " + user.getNickname());
-            
+
             // ✅ 上传头像到MinIO
             if (req.getAvatarUrl() != null && !req.getAvatarUrl().trim().isEmpty()) {
                 try {
@@ -185,20 +174,17 @@ public class AuthCodeController {
                         System.out.println("✅ 头像上传成功: " + avatarUrl);
                     } else {
                         System.out.println("⚠️ 头像上传失败，使用默认头像");
-                        // 这里可以设置一个默认头像URL
-                        user.setAvatarUrl("https://via.placeholder.com/150");
+                        user.setAvatarUrl(null);
                     }
                 } catch (Exception e) {
                     System.err.println("⚠️ 头像上传异常: " + e.getMessage());
-                    // 这里可以设置一个默认头像URL
-                    user.setAvatarUrl("https://via.placeholder.com/150");
+                    user.setAvatarUrl(null);
                 }
             } else {
-                System.out.println("⚠️ 未提供头像，使用默认头像");
-                // 这里可以设置一个默认头像URL
-                user.setAvatarUrl("https://via.placeholder.com/150");
+                System.out.println("⚠️ 未提供头像");
+                user.setAvatarUrl(null);
             }
-            
+
             user.setStatus(1);
             // ✅ 设置加密后的默认密码
             user.setPassword(passwordEncoder.encode("123456"));
@@ -210,8 +196,8 @@ public class AuthCodeController {
             }
             user.setCreatedAt(new Date());
             user.setUpdatedAt(new Date());
-            
-            // ✅ 如果提供了手机号code，尝试获取手机号（先获取手机号，以便生成昵称）
+
+            // ✅ 如果提供了手机号code，尝试获取手机号
             if (req.getPhoneCode() != null && !req.getPhoneCode().trim().isEmpty()) {
                 try {
                     System.out.println("尝试获取手机号，code: " + req.getPhoneCode());
@@ -228,29 +214,17 @@ public class AuthCodeController {
             } else {
                 System.out.println("⚠️ 未提供手机号code");
             }
-            
-            // ✅ 重新生成昵称（确保使用最新的手机号信息）
-            if (req.getNickname() == null || req.getNickname().trim().isEmpty()) {
-//                String defaultNickname = "微信用户";
-                if (user.getPhone() != null && !user.getPhone().trim().isEmpty()) {
-                    // 如果有手机号，使用"用户+手机号后四位"
-                    String phone = user.getPhone().trim();
-                    defaultNickname = "用户" + phone.substring(Math.max(0, phone.length() - 4));
-                    user.setNickname(defaultNickname);
-                    System.out.println("更新昵称使用手机号后四位: " + defaultNickname);
-                }
-            }
-            
+
             // 保存到数据库，自动生成userId
             usersService.save(user);
             System.out.println("✅ 创建微信新用户成功，ID: " + user.getUserId() + ", 昵称: " + user.getNickname());
         } else {
             System.out.println("✅ 找到微信用户，ID: " + user.getUserId());
-            
+
             // ✅ 如果是已存在用户，也更新昵称和头像（如果前端提供了新值）
             boolean needUpdate = false;
             if (req.getNickname() != null && !req.getNickname().trim().isEmpty()
-                && !req.getNickname().equals(user.getNickname())) {
+                    && !req.getNickname().equals(user.getNickname())) {
                 System.out.println("更新昵称: " + user.getNickname() + " -> " + req.getNickname());
                 user.setNickname(req.getNickname().trim());
                 needUpdate = true;
@@ -269,10 +243,10 @@ public class AuthCodeController {
                     System.err.println("⚠️ 更新头像失败: " + e.getMessage());
                 }
             }
-            
+
             // ✅ 如果提供了手机号code且当前用户没有手机号，尝试获取
             if ((user.getPhone() == null || user.getPhone().isEmpty())
-                && req.getPhoneCode() != null && !req.getPhoneCode().trim().isEmpty()) {
+                    && req.getPhoneCode() != null && !req.getPhoneCode().trim().isEmpty()) {
                 try {
                     System.out.println("用户无手机号，尝试获取，code: " + req.getPhoneCode());
                     String phone = weChatService.getUserPhoneByCode(req.getPhoneCode().trim());
@@ -285,11 +259,11 @@ public class AuthCodeController {
                     System.err.println("⚠️ 获取手机号失败: " + e.getMessage());
                 }
             }
-            
+
             // 更新最后登录时间
             user.setLastLoginAt(new Date());
             needUpdate = true;
-            
+
             if (needUpdate) {
                 user.setUpdatedAt(new Date());
                 usersService.updateById(user);
@@ -304,7 +278,7 @@ public class AuthCodeController {
         claims.put("openid", openid);
         if (unionid != null) claims.put("unionid", unionid);
         String token = jwtUtil.generateToken(claims);
-        
+
         System.out.println("✅ JWT token生成成功");
 
         // 构造响应，避免泄露密码
@@ -312,7 +286,7 @@ public class AuthCodeController {
         LoginResponse resp = new LoginResponse();
         resp.setToken(token);
         resp.setUser(user);
-        
+
         System.out.println("✅ 微信登录成功，返回用户信息");
         System.out.println("返回的用户ID: " + user.getUserId() + " (类型: " + user.getUserId().getClass().getSimpleName() + ")");
         return Result.success(resp);