From 10eb81ccd1704adbff01afba845abdd866b3033d Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Mon, 30 Mar 2026 07:48:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A4=E8=AF=81=E5=8F=8A=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将微信小程序认证相关类重命名（WechatMini -> WxMa） - 新增 WxMaAuthenticationToken 和 WxMaAuthenticationProvider - 调整代码生成前端模板样式与导入路径 --- .../security/config/SecurityConfig.java | 10 +++--- ...oken.java => WxMaAuthenticationToken.java} | 10 +++--- ...r.java => WxMaAuthenticationProvider.java} | 8 ++--- .../codegen/frontend/js/index.curd.js.vue.vm | 2 +- .../codegen/frontend/js/index.js.vue.vm | 31 ++++++++--------- .../codegen/frontend/ts/api-types.ts.vm | 2 +- .../templates/codegen/frontend/ts/api.ts.vm | 6 +++- .../codegen/frontend/ts/index.curd.vue.vm | 8 ++--- .../codegen/frontend/ts/index.vue.vm | 33 ++++++++++--------- 9 files changed, 58 insertions(+), 52 deletions(-) rename src/main/java/com/youlai/boot/framework/security/model/{WechatMiniAuthenticationToken.java => WxMaAuthenticationToken.java} (76%) rename src/main/java/com/youlai/boot/framework/security/provider/{WechatMiniAuthenticationProvider.java => WxMaAuthenticationProvider.java} (91%) diff --git a/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java b/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java index 68359818..190175e6 100644 --- a/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java +++ b/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java @@ -9,7 +9,7 @@ import com.youlai.boot.framework.security.filter.TokenAuthenticationFilter; import com.youlai.boot.framework.security.handler.MyAccessDeniedHandler; import com.youlai.boot.framework.security.handler.MyAuthenticationEntryPoint; import com.youlai.boot.framework.security.provider.SmsAuthenticationProvider; -import com.youlai.boot.framework.security.provider.WechatMiniAuthenticationProvider; +import com.youlai.boot.framework.security.provider.WxMaAuthenticationProvider; import com.youlai.boot.framework.security.token.TokenManager; import com.youlai.boot.framework.security.service.SysUserDetailsService; import com.youlai.boot.system.service.ConfigService; @@ -132,11 +132,11 @@ public class SecurityConfig { * 微信小程序认证 Provider */ @Bean - public WechatMiniAuthenticationProvider wechatMiniAuthenticationProvider( + public WxMaAuthenticationProvider wechatMiniAuthenticationProvider( WxMaService wxMaService, SysUserDetailsService sysUserDetailsService ) { - return new WechatMiniAuthenticationProvider(wxMaService, sysUserDetailsService); + return new WxMaAuthenticationProvider(wxMaService, sysUserDetailsService); } /** @@ -146,12 +146,12 @@ public class SecurityConfig { public AuthenticationManager authenticationManager( DaoAuthenticationProvider daoAuthenticationProvider, SmsAuthenticationProvider smsAuthenticationProvider, - WechatMiniAuthenticationProvider wechatMiniAuthenticationProvider + WxMaAuthenticationProvider wxMaAuthenticationProvider ) { return new ProviderManager( daoAuthenticationProvider, smsAuthenticationProvider, - wechatMiniAuthenticationProvider + wxMaAuthenticationProvider ); } diff --git a/src/main/java/com/youlai/boot/framework/security/model/WechatMiniAuthenticationToken.java b/src/main/java/com/youlai/boot/framework/security/model/WxMaAuthenticationToken.java similarity index 76% rename from src/main/java/com/youlai/boot/framework/security/model/WechatMiniAuthenticationToken.java rename to src/main/java/com/youlai/boot/framework/security/model/WxMaAuthenticationToken.java index 9bd78bcd..b07ad3f3 100644 --- a/src/main/java/com/youlai/boot/framework/security/model/WechatMiniAuthenticationToken.java +++ b/src/main/java/com/youlai/boot/framework/security/model/WxMaAuthenticationToken.java @@ -10,7 +10,7 @@ import java.util.Collection; /** * 微信小程序认证 Token */ -public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken { +public class WxMaAuthenticationToken extends AbstractAuthenticationToken { @Serial private static final long serialVersionUID = 622L; @@ -34,7 +34,7 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken { * * @param code 微信小程序code */ - public WechatMiniAuthenticationToken(String code) { + public WxMaAuthenticationToken(String code) { super(AuthorityUtils.NO_AUTHORITIES); this.principal = code; this.credentials = null; @@ -47,7 +47,7 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken { * @param principal 用户详情（SysUserDetails） * @param authorities 授权信息 */ - public WechatMiniAuthenticationToken(Object principal, Collection authorities) { + public WxMaAuthenticationToken(Object principal, Collection authorities) { super(authorities); this.principal = principal; this.credentials = null; @@ -57,8 +57,8 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken { /** * 创建已认证的 Token（静态工厂方法） */ - public static WechatMiniAuthenticationToken authenticated(Object principal, Collection authorities) { - return new WechatMiniAuthenticationToken(principal, authorities); + public static WxMaAuthenticationToken authenticated(Object principal, Collection authorities) { + return new WxMaAuthenticationToken(principal, authorities); } @Override diff --git a/src/main/java/com/youlai/boot/framework/security/provider/WechatMiniAuthenticationProvider.java b/src/main/java/com/youlai/boot/framework/security/provider/WxMaAuthenticationProvider.java similarity index 91% rename from src/main/java/com/youlai/boot/framework/security/provider/WechatMiniAuthenticationProvider.java rename to src/main/java/com/youlai/boot/framework/security/provider/WxMaAuthenticationProvider.java index 8c7dd2c3..d30bfd60 100644 --- a/src/main/java/com/youlai/boot/framework/security/provider/WechatMiniAuthenticationProvider.java +++ b/src/main/java/com/youlai/boot/framework/security/provider/WxMaAuthenticationProvider.java @@ -6,7 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import com.youlai.boot.framework.security.exception.NeedBindMobileException; import com.youlai.boot.framework.security.model.SysUserDetails; import com.youlai.boot.framework.security.model.UserAuthInfo; -import com.youlai.boot.framework.security.model.WechatMiniAuthenticationToken; +import com.youlai.boot.framework.security.model.WxMaAuthenticationToken; import com.youlai.boot.framework.security.service.SysUserDetailsService; import com.youlai.boot.system.model.entity.UserSocial; import lombok.RequiredArgsConstructor; @@ -23,7 +23,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; */ @Slf4j @RequiredArgsConstructor -public class WechatMiniAuthenticationProvider implements AuthenticationProvider { +public class WxMaAuthenticationProvider implements AuthenticationProvider { private final WxMaService wxMaService; private final SysUserDetailsService sysUserDetailsService; @@ -76,7 +76,7 @@ public class WechatMiniAuthenticationProvider implements AuthenticationProvider log.info("微信小程序登录成功：username={}, openid={}", userAuthInfo.getUsername(), openid); - return WechatMiniAuthenticationToken.authenticated(userDetails, userDetails.getAuthorities()); + return WxMaAuthenticationToken.authenticated(userDetails, userDetails.getAuthorities()); } catch (WxErrorException e) { log.error("微信小程序登录失败：调用微信接口异常，code={}", code, e); @@ -86,7 +86,7 @@ public class WechatMiniAuthenticationProvider implements AuthenticationProvider @Override public boolean supports(Class authentication) { - return WechatMiniAuthenticationToken.class.isAssignableFrom(authentication); + return WxMaAuthenticationToken.class.isAssignableFrom(authentication); } } diff --git a/src/main/resources/templates/codegen/frontend/js/index.curd.js.vue.vm b/src/main/resources/templates/codegen/frontend/js/index.curd.js.vue.vm index fe944777..774cfa02 100644 --- a/src/main/resources/templates/codegen/frontend/js/index.curd.js.vue.vm +++ b/src/main/resources/templates/codegen/frontend/js/index.curd.js.vue.vm @@ -1,5 +1,5 @@