publish 2.0.17-test2

2025-08-20 16:01:01 +08:00
parent 411969192f
commit ffc7220944
13 changed files with 43 additions and 24 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

    <groupId>com.tiesheng.springboot-parent</groupId>
    <artifactId>springboot-parent</artifactId>
-    <version>2.0.17-test</version>
+    <version>2.0.17-test2</version>
    <packaging>pom</packaging>
    <name>springboot-parent</name>
    <description>杭州铁晟科技有限公司基础依赖</description>
@@ -58,49 +58,49 @@
            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-database</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.17-test2</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-login</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.17-test2</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-web</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.17-test2</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-util</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.17-test2</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-platform</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.17-test2</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-message</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.17-test2</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-role</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.17-test2</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-annotation</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.17-test2</version>
            </dependency>

            <dependency>
--- a/springboot-ademo/pom.xml
+++ b/springboot-ademo/pom.xml
@@ -6,11 +6,11 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.17-test2</version>
    </parent>

    <artifactId>springboot-ademo</artifactId>
-    <version>2.0.17-test</version>
+    <version>2.0.17-test2</version>

    <properties>
        <maven.compiler.source>8</maven.compiler.source>
--- a/springboot-annotation/pom.xml
+++ b/springboot-annotation/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.17-test2</version>
    </parent>

    <artifactId>springboot-annotation</artifactId>
--- a/springboot-database/pom.xml
+++ b/springboot-database/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.17-test2</version>
    </parent>

    <artifactId>springboot-database</artifactId>
--- a/springboot-login/pom.xml
+++ b/springboot-login/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.17-test2</version>
    </parent>

    <artifactId>springboot-login</artifactId>
--- 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_base");
+        String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl);
        response.sendRedirect(authorizationUrl);
    }

--- a/springboot-message/pom.xml
+++ b/springboot-message/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.17-test2</version>
    </parent>

    <artifactId>springboot-message</artifactId>
--- a/springboot-platform/pom.xml
+++ b/springboot-platform/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.17-test2</version>
    </parent>

    <artifactId>springboot-platform</artifactId>
--- 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
@@ -19,6 +19,7 @@ import org.springframework.context.annotation.Configuration;

 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;

 /**
 * @author hao
@@ -122,12 +123,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";
    }

@@ -141,7 +142,15 @@ public class PlatformWxmpConfig {
    public WxUserInfo getOAuth2AccessToken(String service, String code) {
        WxConfigBean configBean = getConfigBean(service);
        WxOAuth2AccessToken wxOAuth2AccessToken = WxOAuth2AccessToken.create(configBean.getAppId(), configBean.getAppSecret(), code);
-        WxUserInfo wxUserInfo = WxUserInfo.create(wxOAuth2AccessToken);
+
+        WxUserInfo wxUserInfo = null;
+        if (Objects.equals(configBean.getScope(), "snsapi_userinfo")) {
+            wxUserInfo = WxUserInfo.create(wxOAuth2AccessToken);
+        } else {
+            wxUserInfo = new WxUserInfo();
+            wxUserInfo.setOpenid(wxOAuth2AccessToken.getOpenid());
+            wxUserInfo.setRealUser(wxOAuth2AccessToken.isRealUser());
+        }
        wxUserInfo.setAppId(configBean.getAppId());
        return wxUserInfo;
    }
--- 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_userinfo";

    ///////////////////////////////////////////////////////////////////////////
    // 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;
+    }
 }
--- a/springboot-role/pom.xml
+++ b/springboot-role/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.17-test2</version>
    </parent>

    <artifactId>springboot-role</artifactId>
--- a/springboot-util/pom.xml
+++ b/springboot-util/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.17-test2</version>
    </parent>

    <artifactId>springboot-util</artifactId>
--- a/springboot-web/pom.xml
+++ b/springboot-web/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.17-test2</version>
    </parent>

    <artifactId>springboot-web</artifactId>