From 2a8a4ff337e8c8240ab100225a320c85ab844895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com> Date: Mon, 22 Sep 2025 15:15:38 +0800 Subject: [PATCH] publish 2.0.31 --- pom.xml | 18 +++++++++--------- springboot-ademo/pom.xml | 4 ++-- springboot-annotation/pom.xml | 2 +- springboot-chart/pom.xml | 2 +- springboot-database/pom.xml | 2 +- springboot-login/pom.xml | 2 +- .../login/controller/LoginController.java | 2 +- springboot-message/pom.xml | 2 +- springboot-platform/pom.xml | 2 +- .../config/wxmp/PlatformWxmpConfig.java | 4 ++-- .../config/wxmp/bean/WxConfigBean.java | 12 +++++++++++- springboot-role/pom.xml | 2 +- springboot-util/pom.xml | 2 +- springboot-web/pom.xml | 2 +- 14 files changed, 34 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index a40fae0..9b35be0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.30 + 2.0.31 pom springboot-parent 杭州铁晟科技有限公司基础依赖 @@ -59,49 +59,49 @@ com.tiesheng.springboot-parent springboot-database - 2.0.30 + 2.0.31 com.tiesheng.springboot-parent springboot-login - 2.0.30 + 2.0.31 com.tiesheng.springboot-parent springboot-web - 2.0.30 + 2.0.31 com.tiesheng.springboot-parent springboot-util - 2.0.30 + 2.0.31 com.tiesheng.springboot-parent springboot-platform - 2.0.30 + 2.0.31 com.tiesheng.springboot-parent springboot-message - 2.0.30 + 2.0.31 com.tiesheng.springboot-parent springboot-role - 2.0.30 + 2.0.31 com.tiesheng.springboot-parent springboot-annotation - 2.0.30 + 2.0.31 diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml index 45cf84e..75e9085 100644 --- a/springboot-ademo/pom.xml +++ b/springboot-ademo/pom.xml @@ -6,11 +6,11 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.30 + 2.0.31 springboot-ademo - 2.0.30 + 2.0.31 8 diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml index 656109b..5b5fa2b 100644 --- a/springboot-annotation/pom.xml +++ b/springboot-annotation/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.30 + 2.0.31 springboot-annotation diff --git a/springboot-chart/pom.xml b/springboot-chart/pom.xml index d08bb16..f14b61f 100644 --- a/springboot-chart/pom.xml +++ b/springboot-chart/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.30 + 2.0.31 springboot-chart diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml index b84bc47..4b45e19 100644 --- a/springboot-database/pom.xml +++ b/springboot-database/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.30 + 2.0.31 springboot-database diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml index ffd99f7..d17ad12 100644 --- a/springboot-login/pom.xml +++ b/springboot-login/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.30 + 2.0.31 springboot-login diff --git a/springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java b/springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java index b019355..2aa60a6 100644 --- a/springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java +++ b/springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java @@ -170,7 +170,7 @@ public class LoginController { extra = ""; } String configUrl = globalConfig.buildPath("/login/wxmp/oauth2/" + service + "?extra=" + extra); - String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_userinfo"); + String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl); response.sendRedirect(authorizationUrl); } diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml index 627555c..8bfa59e 100644 --- a/springboot-message/pom.xml +++ b/springboot-message/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.30 + 2.0.31 springboot-message diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml index 4652c2d..5fb63be 100644 --- a/springboot-platform/pom.xml +++ b/springboot-platform/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.30 + 2.0.31 springboot-platform diff --git a/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/PlatformWxmpConfig.java b/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/PlatformWxmpConfig.java index 2cba4ef..3141a43 100644 --- a/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/PlatformWxmpConfig.java +++ b/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/PlatformWxmpConfig.java @@ -122,12 +122,12 @@ public class PlatformWxmpConfig { * * @return */ - public String buildAuthorizationUrl(String service, String redirectUrl, String scope) { + public String buildAuthorizationUrl(String service, String redirectUrl) { WxConfigBean configBean = getConfigBean(service); return "https://open.weixin.qq.com/connect/oauth2/authorize" + "?appid=" + configBean.getAppId() + "&redirect_uri=" + URLUtil.encodeAll(redirectUrl) - + "&response_type=code&scope=" + scope + + "&response_type=code&scope=" + configBean.getScope() + "&state=STATE#wechat_redirect"; } diff --git a/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxConfigBean.java b/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxConfigBean.java index 5a24275..fe740f8 100644 --- a/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxConfigBean.java +++ b/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxConfigBean.java @@ -7,10 +7,12 @@ public class WxConfigBean { private String appId; private String appSecret; + private String scope = "snsapi_base"; /////////////////////////////////////////////////////////////////////////// // setter\getter - /////////////////////////////////////////////////////////////////////////// + + /// //////////////////////////////////////////////////////////////////////// public String getAppId() { return appId; @@ -27,4 +29,12 @@ public class WxConfigBean { public void setAppSecret(String appSecret) { this.appSecret = appSecret; } + + public String getScope() { + return scope; + } + + public void setScope(String scope) { + this.scope = scope; + } } diff --git a/springboot-role/pom.xml b/springboot-role/pom.xml index 67176d2..838285f 100644 --- a/springboot-role/pom.xml +++ b/springboot-role/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.30 + 2.0.31 springboot-role diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml index 89e904c..f10b815 100644 --- a/springboot-util/pom.xml +++ b/springboot-util/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.30 + 2.0.31 springboot-util diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml index 86f981d..97c1364 100644 --- a/springboot-web/pom.xml +++ b/springboot-web/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 2.0.30 + 2.0.31 springboot-web