From 75471e8fa626a1496b1b59718efa1f0eecb004ed Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 21 Jul 2025 16:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=99=BB=E5=BD=95=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=AD=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AppletApiLoginController.java       | 20 --------
 .../applet/service/impl/AppletApiLoginService.java | 53 +++-------------------
 2 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiLoginController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiLoginController.java
index 491d792..3b0183c 100644
--- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiLoginController.java
+++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiLoginController.java
@@ -91,26 +91,6 @@ public class AppletApiLoginController {
 
 
 
-    /**
-     * 退出登录
-     *
-     * @param token 用户token
-     * @return 退出结果
-     */
-//    @PostMapping("/logout")
-//    @Operation(summary = "退出登录", description = "用户退出登录")
-//    public Result<String> logout(
-//            @Parameter(description = "用户token", required = true)
-//            @RequestParam String token) {
-//
-//        if (StringUtils.isBlank(token)) {
-//            return Result.error("token不能为空");
-//        }
-//
-//        log.info("收到退出登录请求");
-//        return appletApiLoginService.logout(token);
-//    }
-
 
     /**
      * 获取用户信息
diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiLoginService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiLoginService.java
index 076d26e..305b2a3 100644
--- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiLoginService.java
+++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiLoginService.java
@@ -149,34 +149,18 @@ public class AppletApiLoginService {
             if (currentUser == null) {
                 return Result.error("用户未登录");
             }
-            
-            // 从Redis获取手机号
-//            String phoneCodeKey = PHONE_CODE_PREFIX + phoneCode;
-//            String phoneNumber = (String) redisTemplate.opsForValue().get(phoneCodeKey);
-//            if (phoneNumber == null) {
-//                return Result.error("手机号code已过期或无效");
-//            }
-            
+
+            String phoneNumber = getPhoneNumber(phoneCode).getResult();
+
             // 查找用户
             AppletUser user = appletUserService.getByOpenid(currentUser.getOpenid());
             if (user == null) {
                 return Result.error("用户不存在");
             }
-            
-            // 检查手机号是否已被其他用户绑定
-//            AppletUser existingUser = appletUserService.getByPhone(phoneNumber);
-//            if (existingUser != null && !existingUser.getId().equals(user.getId())) {
-//                return Result.error("该手机号已被其他用户绑定");
-//            }
-//
-//            // 更新用户手机号
-//            user.setPhone(phoneNumber);
-//            appletUserService.updateById(user);
-//
-//            // 删除Redis中的临时数据
-//            redisTemplate.delete(phoneCodeKey);
-//
-//            log.info("绑定手机号成功，用户: {}, 手机号: {}", user.getName(), phoneNumber);
+
+            user.setPhone(phoneNumber);
+            appletUserService.updateById(user);
+
             return Result.OK("绑定成功");
             
         } catch (Exception e) {
@@ -223,29 +207,6 @@ public class AppletApiLoginService {
     }
 
 
-    /**
-     * 退出登录
-     * 
-     * @param token 用户token
-     * @return 退出结果
-     */
-    public Result<String> logout(String token) {
-        try {
-            String openid = JwtUtil.getUsername(token);
-            if (openid != null) {
-                redisUtil.del(CommonConstant.PREFIX_USER_TOKEN + token);
-                
-                log.info("用户退出登录: {}", openid);
-            }
-            
-            return Result.OK("退出成功");
-            
-        } catch (Exception e) {
-            log.error("退出登录异常", e);
-            return Result.error("退出失败: " + e.getMessage());
-        }
-    }
-
     /**
      * 更新用户信息
      *