feat: 重构项目结构并新增微信小程序认证模块

src/main/java/com/youlai/boot/auth/controller/AuthController.java

@@ -1,12 +1,13 @@
 package com.youlai.boot.auth.controller;
 
-import com.youlai.boot.auth.model.vo.CaptchaVO;
-import com.youlai.boot.auth.model.dto.LoginRequest;
+import com.youlai.boot.auth.model.LoginReq;
+import com.youlai.boot.common.enums.ActionTypeEnum;
 import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.core.web.Result;
+import com.youlai.boot.common.result.Result;
 import com.youlai.boot.auth.service.AuthService;
 import com.youlai.boot.common.annotation.Log;
-import com.youlai.boot.security.model.AuthenticationToken;
+import com.youlai.boot.framework.integration.captcha.model.CaptchaInfo;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -32,24 +33,24 @@ public class AuthController {
 
     @Operation(summary = "获取验证码")
     @GetMapping("/captcha")
-    public Result<CaptchaVO> getCaptcha() {
-        CaptchaVO captcha = authService.getCaptcha();
+    public Result<CaptchaInfo> getCaptcha() {
+        CaptchaInfo captcha = authService.getCaptcha();
         return Result.success(captcha);
     }
 
     @Operation(summary = "账号密码登录")
     @PostMapping("/login")
-    @Log(value = "登录", module = LogModuleEnum.LOGIN)
-    public Result<AuthenticationToken> login(@RequestBody @Valid LoginRequest request) {
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGIN)
+    public Result<AuthenticationToken> login(@RequestBody @Valid LoginReq request) {
         AuthenticationToken authenticationToken = authService.login(request.getUsername(), request.getPassword());
         return Result.success(authenticationToken);
     }
 
     @Operation(summary = "短信验证码登录")
     @PostMapping("/login/sms")
-    @Log(value = "短信验证码登录", module = LogModuleEnum.LOGIN)
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGIN)
     public Result<AuthenticationToken> loginBySms(
-            @Parameter(description = "手机号", example = "18812345678") @RequestParam String mobile,
+            @Parameter(description = "手机号", example = "18888888888") @RequestParam String mobile,
             @Parameter(description = "验证码", example = "123456") @RequestParam String code
     ) {
         AuthenticationToken loginResult = authService.loginBySms(mobile, code);
@@ -59,7 +60,7 @@ public class AuthController {
     @Operation(summary = "发送登录短信验证码")
     @PostMapping("/sms/code")
     public Result<Void> sendSmsCode(
-            @Parameter(description = "手机号", example = "18812345678") @RequestParam String mobile
+            @Parameter(description = "手机号", example = "18888888888") @RequestParam String mobile
     ) {
         authService.sendSmsCode(mobile);
         return Result.success();
@@ -67,7 +68,7 @@ public class AuthController {
 
     @Operation(summary = "退出登录")
     @DeleteMapping("/logout")
-    @Log(value = "退出登录", module = LogModuleEnum.LOGIN)
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGOUT)
     public Result<Void> logout() {
         authService.logout();
         return Result.success();

src/main/java/com/youlai/boot/auth/controller/WxMaAuthController.java

@@ -1,21 +1,27 @@
 package com.youlai.boot.auth.controller;
 
-import com.youlai.boot.auth.model.vo.WechatMiniappLoginResult;
-import com.youlai.boot.auth.service.WechatMiniappAuthService;
+import com.youlai.boot.auth.model.WxMaBindMobileReq;
+import com.youlai.boot.auth.model.WxMaPhoneLoginReq;
+import com.youlai.boot.auth.model.WxMaLoginResp;
+import com.youlai.boot.auth.service.WxMaAuthService;
 import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.common.enums.ActionTypeEnum;
 import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.core.web.Result;
-import com.youlai.boot.security.model.AuthenticationToken;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import jakarta.validation.Valid;
+
 /**
  * 微信小程序认证控制层
  *
@@ -24,12 +30,12 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Tag(name = "13.微信小程序认证")
 @RestController
-@RequestMapping("/api/v1/wechat/miniapp/auth")
+@RequestMapping("/api/v1/wxma/auth")
 @RequiredArgsConstructor
 @Slf4j
-public class WechatMiniappAuthController {
+public class WxMaAuthController {
 
-    private final WechatMiniappAuthService wechatMiniappAuthService;
+    private final WxMaAuthService wxMaAuthService;
 
     /**
      * 静默登录
@@ -42,12 +48,12 @@ public class WechatMiniappAuthController {
      */
     @Operation(summary = "静默登录", description = "通过微信 code 登录，已绑定用户直接返回 token，未绑定用户返回 openid 需绑定手机号")
     @PostMapping("/silent-login")
-    @Log(value = "微信小程序静默登录", module = LogModuleEnum.LOGIN)
-    public Result<WechatMiniappLoginResult> silentLogin(
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGIN)
+    public Result<WxMaLoginResp> silentLogin(
             @Parameter(description = "微信登录凭证（wx.login 获取）", required = true, example = "0xxx")
             @RequestParam String code
     ) {
-        WechatMiniappLoginResult result = wechatMiniappAuthService.silentLogin(code);
+        WxMaLoginResp result = wxMaAuthService.silentLogin(code);
         return Result.success(result);
     }
 
@@ -60,14 +66,9 @@ public class WechatMiniappAuthController {
      */
     @Operation(summary = "手机号快捷登录", description = "同时使用微信 code 和手机号授权 code 登录，适用于企业认证小程序")
     @PostMapping("/phone-login")
-    @Log(value = "微信小程序手机号快捷登录", module = LogModuleEnum.LOGIN)
-    public Result<AuthenticationToken> phoneLogin(
-            @Parameter(description = "微信登录凭证（wx.login 获取）", required = true, example = "0xxx")
-            @RequestParam String loginCode,
-            @Parameter(description = "手机号授权凭证（getPhoneNumber 事件获取）", required = true, example = "0xxx")
-            @RequestParam String phoneCode
-    ) {
-        AuthenticationToken result = wechatMiniappAuthService.phoneLogin(loginCode, phoneCode);
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGIN)
+    public Result<AuthenticationToken> phoneLogin(@Valid @RequestBody WxMaPhoneLoginReq req) {
+        AuthenticationToken result = wxMaAuthService.phoneLogin(req.getLoginCode(), req.getPhoneCode());
         return Result.success(result);
     }
 
@@ -80,16 +81,9 @@ public class WechatMiniappAuthController {
      */
     @Operation(summary = "绑定手机号", description = "为静默登录用户绑定手机号，绑定成功后自动登录")
     @PostMapping("/bind-mobile")
-    @Log(value = "微信小程序绑定手机号", module = LogModuleEnum.LOGIN)
-    public Result<AuthenticationToken> bindMobile(
-            @Parameter(description = "微信用户唯一标识（静默登录返回）", required = true)
-            @RequestParam String openid,
-            @Parameter(description = "手机号码", required = true, example = "18812345678")
-            @RequestParam String mobile,
-            @Parameter(description = "短信验证码", required = true, example = "123456")
-            @RequestParam String smsCode
-    ) {
-        AuthenticationToken result = wechatMiniappAuthService.bindMobile(openid, mobile, smsCode);
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGIN)
+    public Result<AuthenticationToken> bindMobile(@Valid @RequestBody WxMaBindMobileReq req) {
+        AuthenticationToken result = wxMaAuthService.bindMobile(req.getOpenid(), req.getMobile(), req.getSmsCode());
         return Result.success(result);
     }
 }

src/main/java/com/youlai/boot/auth/model/LoginReq.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.auth.model.dto;
+package com.youlai.boot.auth.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -13,7 +13,7 @@ import jakarta.validation.constraints.NotBlank;
  */
 @Schema(description = "登录请求参数")
 @Data
-public class LoginRequest {
+public class LoginReq {
 
     @Schema(description = "用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "admin")
     @NotBlank(message = "用户名不能为空")
@@ -28,5 +28,4 @@ public class LoginRequest {
 
     @Schema(description = "验证码", example = "123456")
     private String captchaCode;
-}
-
+}

src/main/java/com/youlai/boot/auth/model/WxMaBindMobileReq.java

@@ -0,0 +1,28 @@
+package com.youlai.boot.auth.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * 微信小程序绑定手机号请求
+ *
+ * @author Ray.Hao
+ * @since 3.0.0
+ */
+@Schema(description = "微信小程序绑定手机号请求")
+@Data
+public class WxMaBindMobileReq {
+
+    @NotBlank(message = "openid 不能为空")
+    @Schema(description = "微信用户唯一标识（静默登录返回）", example = "oVBkZ0aYgDMDIywRdgPW8-joxXc4")
+    private String openid;
+
+    @NotBlank(message = "手机号不能为空")
+    @Schema(description = "手机号码", example = "18888888888")
+    private String mobile;
+
+    @NotBlank(message = "短信验证码不能为空")
+    @Schema(description = "短信验证码", example = "123456")
+    private String smsCode;
+}

src/main/java/com/youlai/boot/auth/model/WxMaLoginResp.java

@@ -0,0 +1,42 @@
+package com.youlai.boot.auth.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 微信小程序登录响应
+ *
+ * @author Ray.Hao
+ * @since 2.4.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "微信小程序登录响应")
+public class WxMaLoginResp {
+
+    @Schema(description = "是否新用户")
+    private Boolean isNewUser;
+
+    @Schema(description = "是否需要绑定手机号")
+    private Boolean needBindMobile;
+
+    @Schema(description = "微信openid（绑定手机号时需要）")
+    private String openid;
+
+    @Schema(description = "访问令牌")
+    private String accessToken;
+
+    @Schema(description = "刷新令牌")
+    private String refreshToken;
+
+    @Schema(description = "令牌类型")
+    private String tokenType;
+
+    @Schema(description = "过期时间（秒）")
+    private Integer expiresIn;
+}

src/main/java/com/youlai/boot/auth/model/WxMaPhoneLoginReq.java

@@ -0,0 +1,24 @@
+package com.youlai.boot.auth.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * 微信小程序手机号快捷登录请求
+ *
+ * @author Ray.Hao
+ * @since 3.0.0
+ */
+@Schema(description = "微信小程序手机号快捷登录请求")
+@Data
+public class WxMaPhoneLoginReq {
+
+    @NotBlank(message = "微信登录凭证不能为空")
+    @Schema(description = "微信登录凭证（wx.login 获取）", example = "0xxx")
+    private String loginCode;
+
+    @NotBlank(message = "手机号授权凭证不能为空")
+    @Schema(description = "手机号授权凭证（getPhoneNumber 事件获取）", example = "0xxx")
+    private String phoneCode;
+}

src/main/java/com/youlai/boot/auth/model/vo/CaptchaVO.java

@@ -1,24 +0,0 @@
-package com.youlai.boot.auth.model.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Builder;
-import lombok.Data;
-
-/**
- * 验证码信息
- *
- * @author Ray。Hao
- * @since 2023/03/24
- */
-@Schema(description = "验证码信息")
-@Data
-@Builder
-public class CaptchaVO {
-
-    @Schema(description = "验证码缓存 ID")
-    private String captchaId;
-
-    @Schema(description = "验证码图片Base64字符串")
-    private String captchaBase64;
-
-}

src/main/java/com/youlai/boot/auth/model/vo/WechatMiniappLoginResult.java

@@ -1,63 +0,0 @@
-package com.youlai.boot.auth.model.vo;
-
-import com.youlai.boot.security.model.AuthenticationToken;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * 微信小程序登录结果
- *
- * @author Ray.Hao
- * @since 2.4.0
- */
-@Data
-@Schema(description = "微信小程序登录结果")
-public class WechatMiniappLoginResult {
-
-    @Schema(description = "是否新用户")
-    private Boolean isNewUser;
-
-    @Schema(description = "是否需要绑定手机号")
-    private Boolean needBindMobile;
-
-    @Schema(description = "微信openid（绑定手机号时需要）")
-    private String openid;
-
-    @Schema(description = "访问令牌")
-    private String accessToken;
-
-    @Schema(description = "刷新令牌")
-    private String refreshToken;
-
-    @Schema(description = "令牌类型")
-    private String tokenType;
-
-    @Schema(description = "过期时间（秒）")
-    private Integer expiresIn;
-
-    /**
-     * 创建需要绑定手机号的结果
-     */
-    public static WechatMiniappLoginResult needBindMobile(String openid) {
-        WechatMiniappLoginResult result = new WechatMiniappLoginResult();
-        result.setIsNewUser(true);
-        result.setNeedBindMobile(true);
-        result.setOpenid(openid);
-        return result;
-    }
-
-    /**
-     * 创建登录成功的结果
-     */
-    public static WechatMiniappLoginResult success(AuthenticationToken token) {
-        WechatMiniappLoginResult result = new WechatMiniappLoginResult();
-        result.setIsNewUser(false);
-        result.setNeedBindMobile(false);
-        result.setAccessToken(token.getAccessToken());
-        result.setRefreshToken(token.getRefreshToken());
-        result.setTokenType(token.getTokenType());
-        result.setExpiresIn(token.getExpiresIn());
-        return result;
-    }
-
-}

src/main/java/com/youlai/boot/auth/service/AuthService.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.auth.service;
 
-import com.youlai.boot.auth.model.vo.CaptchaVO;
-import com.youlai.boot.security.model.AuthenticationToken;
+import com.youlai.boot.framework.integration.captcha.model.CaptchaInfo;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
 
 /**
  * 认证服务接口
@@ -43,10 +43,8 @@ public interface AuthService {
 
     /**
      * 获取验证码
-     *
-     * @return 验证码
      */
-    CaptchaVO getCaptcha();
+    CaptchaInfo getCaptcha();
 
     /**
      * 刷新令牌

src/main/java/com/youlai/boot/auth/service/WxMaAuthService.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.auth.service;
 
-import com.youlai.boot.auth.model.vo.WechatMiniappLoginResult;
-import com.youlai.boot.security.model.AuthenticationToken;
+import com.youlai.boot.auth.model.WxMaLoginResp;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
 
 /**
  * 微信小程序认证服务接口
@@ -9,7 +9,7 @@ import com.youlai.boot.security.model.AuthenticationToken;
  * @author Ray.Hao
  * @since 2.4.0
  */
-public interface WechatMiniappAuthService {
+public interface WxMaAuthService {
 
     /**
      * 静默登录
@@ -21,7 +21,7 @@ public interface WechatMiniappAuthService {
      * @param code 微信登录凭证（wx.login 获取）
      * @return 登录结果（成功返回 token，需绑定返回 openid）
      */
-    WechatMiniappLoginResult silentLogin(String code);
+    WxMaLoginResp silentLogin(String code);
 
     /**
      * 手机号快捷登录

src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java

@@ -1,24 +1,21 @@
 package com.youlai.boot.auth.service.impl;
 
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.hutool.captcha.AbstractCaptcha;
-import cn.hutool.captcha.CaptchaUtil;
-import cn.hutool.captcha.generator.CodeGenerator;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.youlai.boot.auth.model.vo.CaptchaVO;
 import com.youlai.boot.auth.service.AuthService;
 import com.youlai.boot.common.constant.RedisConstants;
-import com.youlai.boot.common.enums.CaptchaTypeEnum;
-import com.youlai.boot.config.property.CaptchaProperties;
-import com.youlai.boot.security.model.AuthenticationToken;
-import com.youlai.boot.security.model.SmsAuthenticationToken;
-import com.youlai.boot.security.token.TokenManager;
-import com.youlai.boot.security.util.SecurityUtils;
-import com.youlai.boot.support.sms.enums.SmsTypeEnum;
-import com.youlai.boot.support.sms.service.SmsService;
-import com.youlai.boot.system.service.UserSocialService;
-import com.youlai.boot.system.service.UserService;
+import com.youlai.boot.common.enums.ActionTypeEnum;
+import com.youlai.boot.common.util.IPUtils;
+import com.youlai.boot.framework.integration.captcha.model.CaptchaInfo;
+import com.youlai.boot.framework.integration.captcha.service.CaptchaService;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
+import com.youlai.boot.framework.security.model.SmsAuthenticationToken;
+import com.youlai.boot.framework.security.token.TokenManager;
+import com.youlai.boot.framework.security.util.SecurityUtils;
+import com.youlai.boot.framework.integration.sms.enums.SmsTypeEnum;
+import com.youlai.boot.framework.integration.sms.service.SmsService;
+import com.youlai.boot.system.model.entity.SysLog;
+import com.youlai.boot.system.service.LogService;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -27,8 +24,10 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
-import java.awt.*;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -47,12 +46,10 @@ public class AuthServiceImpl implements AuthService {
     private final AuthenticationManager authenticationManager;
     private final TokenManager tokenManager;
 
-    private final Font captchaFont;
-    private final CaptchaProperties captchaProperties;
-    private final CodeGenerator codeGenerator;
-
     private final SmsService smsService;
     private final RedisTemplate<String, Object> redisTemplate;
+    private final CaptchaService captchaService;
+    private final LogService logService;
     /**
      * 用户名密码登录
      *
@@ -124,7 +121,6 @@ public class AuthServiceImpl implements AuthService {
         // 3. 认证成功后生成 JWT 令牌，并存入 Security 上下文，供登录日志 AOP 使用（已认证）
         AuthenticationToken authenticationToken = tokenManager.generateToken(authentication);
         SecurityContextHolder.getContext().setAuthentication(authentication);
-
         return authenticationToken;
     }
 
@@ -143,50 +139,10 @@ public class AuthServiceImpl implements AuthService {
 
     /**
      * 获取验证码
-     *
-     * @return 验证码
      */
     @Override
-    public CaptchaVO getCaptcha() {
-
-        String captchaType = captchaProperties.getType();
-        int width = captchaProperties.getWidth();
-        int height = captchaProperties.getHeight();
-        int interfereCount = captchaProperties.getInterfereCount();
-        int codeLength = captchaProperties.getCode().getLength();
-
-        AbstractCaptcha captcha;
-        if (CaptchaTypeEnum.CIRCLE.name().equalsIgnoreCase(captchaType)) {
-            captcha = CaptchaUtil.createCircleCaptcha(width, height, codeLength, interfereCount);
-        } else if (CaptchaTypeEnum.GIF.name().equalsIgnoreCase(captchaType)) {
-            captcha = CaptchaUtil.createGifCaptcha(width, height, codeLength);
-        } else if (CaptchaTypeEnum.LINE.name().equalsIgnoreCase(captchaType)) {
-            captcha = CaptchaUtil.createLineCaptcha(width, height, codeLength, interfereCount);
-        } else if (CaptchaTypeEnum.SHEAR.name().equalsIgnoreCase(captchaType)) {
-            captcha = CaptchaUtil.createShearCaptcha(width, height, codeLength, interfereCount);
-        } else {
-            throw new IllegalArgumentException("Invalid captcha type: " + captchaType);
-        }
-        captcha.setGenerator(codeGenerator);
-        captcha.setTextAlpha(captchaProperties.getTextAlpha());
-        captcha.setFont(captchaFont);
-
-        String captchaCode = captcha.getCode();
-        String imageBase64Data = captcha.getImageBase64Data();
-
-        // 验证码文本缓存至Redis，用于登录校验
-        String captchaId = IdUtil.fastSimpleUUID();
-        redisTemplate.opsForValue().set(
-                StrUtil.format(RedisConstants.Captcha.IMAGE_CODE, captchaId),
-                captchaCode,
-                captchaProperties.getExpireSeconds(),
-                TimeUnit.SECONDS
-        );
-
-        return CaptchaVO.builder()
-                .captchaId(captchaId)
-                .captchaBase64(imageBase64Data)
-                .build();
+    public CaptchaInfo getCaptcha() {
+        return captchaService.generate();
     }
 
     /**

src/main/java/com/youlai/boot/auth/service/impl/WxMaAuthServiceImpl.java

@@ -5,16 +5,16 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.youlai.boot.auth.model.vo.WechatMiniappLoginResult;
-import com.youlai.boot.auth.service.WechatMiniappAuthService;
+import com.youlai.boot.auth.model.WxMaLoginResp;
+import com.youlai.boot.auth.service.WxMaAuthService;
 import com.youlai.boot.common.constant.RedisConstants;
-import com.youlai.boot.security.exception.NeedBindMobileException;
-import com.youlai.boot.security.model.AuthenticationToken;
-import com.youlai.boot.security.model.SysUserDetails;
-import com.youlai.boot.security.model.WechatMiniAuthenticationToken;
-import com.youlai.boot.security.token.TokenManager;
+import com.youlai.boot.framework.security.exception.NeedBindMobileException;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
+import com.youlai.boot.framework.security.model.SysUserDetails;
+import com.youlai.boot.framework.security.model.WechatMiniAuthenticationToken;
+import com.youlai.boot.framework.security.token.TokenManager;
 import com.youlai.boot.system.enums.SocialPlatformEnum;
-import com.youlai.boot.system.model.entity.User;
+import com.youlai.boot.system.model.entity.SysUser;
 import com.youlai.boot.system.service.UserSocialService;
 import com.youlai.boot.system.service.UserService;
 import com.youlai.boot.system.service.UserRoleService;
@@ -35,12 +35,12 @@ import java.util.Collections;
  * 微信小程序认证服务实现
  *
  * @author Ray.Hao
- * @since 2.4.0
+ * @since 4.0.0
  */
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class WechatMiniappAuthServiceImpl implements WechatMiniappAuthService {
+public class WxMaAuthServiceImpl implements WxMaAuthService {
 
     private final WxMaService wxMaService;
     private final AuthenticationManager authenticationManager;
@@ -54,16 +54,27 @@ public class WechatMiniappAuthServiceImpl implements WechatMiniappAuthService {
      * 静默登录
      */
     @Override
-    public WechatMiniappLoginResult silentLogin(String code) {
+    public WxMaLoginResp silentLogin(String code) {
         WechatMiniAuthenticationToken token = new WechatMiniAuthenticationToken(code);
 
         try {
             Authentication authentication = authenticationManager.authenticate(token);
             AuthenticationToken authToken = tokenManager.generateToken(authentication);
             SecurityContextHolder.getContext().setAuthentication(authentication);
-            return WechatMiniappLoginResult.success(authToken);
+            return WxMaLoginResp.builder()
+                    .isNewUser(false)
+                    .needBindMobile(false)
+                    .accessToken(authToken.getAccessToken())
+                    .refreshToken(authToken.getRefreshToken())
+                    .tokenType(authToken.getTokenType())
+                    .expiresIn(authToken.getExpiresIn())
+                    .build();
         } catch (NeedBindMobileException e) {
-            return WechatMiniappLoginResult.needBindMobile(e.getOpenid());
+            return WxMaLoginResp.builder()
+                    .isNewUser(true)
+                    .needBindMobile(true)
+                    .openid(e.getOpenid())
+                    .build();
         }
     }
 
@@ -83,7 +94,7 @@ public class WechatMiniappAuthServiceImpl implements WechatMiniappAuthService {
         log.info("微信小程序手机号快捷登录：openid={}, mobile={}", openid, mobile);
 
         // 3. 查询或创建用户
-        User user = findOrCreateUser(mobile);
+        SysUser user = findOrCreateUser(mobile);
 
         // 4. 绑定微信 openid
         bindWechatOpenid(user, session);
@@ -102,7 +113,7 @@ public class WechatMiniappAuthServiceImpl implements WechatMiniappAuthService {
         validateSmsCode(mobile, smsCode);
 
         // 2. 查询或创建用户
-        User user = findOrCreateUser(mobile);
+        SysUser user = findOrCreateUser(mobile);
 
         // 3. 绑定微信 openid
         userSocialService.bindOrUpdate(
@@ -148,9 +159,9 @@ public class WechatMiniappAuthServiceImpl implements WechatMiniappAuthService {
     /**
      * 查询或创建用户
      */
-    private User findOrCreateUser(String mobile) {
-        User user = userService.lambdaQuery()
-                .eq(User::getMobile, mobile)
+    private SysUser findOrCreateUser(String mobile) {
+        SysUser user = userService.lambdaQuery()
+                .eq(SysUser::getMobile, mobile)
                 .one();
 
         if (user == null) {
@@ -167,8 +178,8 @@ public class WechatMiniappAuthServiceImpl implements WechatMiniappAuthService {
      * 新用户默认分配 GUEST（访问游客）角色
      * </p>
      */
-    private User createNewUser(String mobile) {
-        User user = new User();
+    private SysUser createNewUser(String mobile) {
+        SysUser user = new SysUser();
         user.setMobile(mobile);
         user.setUsername("wx_" + IdUtil.fastSimpleUUID().substring(0, 8));
         user.setNickname("微信用户");
@@ -187,7 +198,7 @@ public class WechatMiniappAuthServiceImpl implements WechatMiniappAuthService {
     /**
      * 绑定微信 openid
      */
-    private void bindWechatOpenid(User user, WxMaJscode2SessionResult session) {
+    private void bindWechatOpenid(SysUser user, WxMaJscode2SessionResult session) {
         try {
             userSocialService.bindOrUpdate(
                     user.getId(),