publish 2.0.17-scope-0.2-test

refactor(login): 调整微信公众号 OAuth2 登录流程- 注释掉原有的授权 URL生成和重定向逻辑
- 新增测试用 TokenBean 对象，用于模拟登录成功后的处理 - 修改重定向 URL，增加测试参数
2025-06-10 10:09:18 +08:00 · 2025-06-10 10:08:44 +08:00 · 2025-06-09 18:11:51 +08:00 · 2025-06-09 18:11:21 +08:00 · 2025-06-09 18:10:52 +08:00
15 changed files with 52 additions and 62 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,17 @@
+stages:
+  - deploy
+
+deploy-jar:
+  stage: deploy
+  tags:
+    - zengos
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - mvn clean deploy -Dmaven.test.skip -DaltDeploymentRepository=master::default::file:$TAG_REPO_FOLDER
+    - cd $TAG_REPO_FOLDER
+    - git checkout master
+    - git pull
+    - git add .
+    - git commit -m "deploy $CI_PROJECT_NAME $CI_COMMIT_TAG"
+    - git push origin master
--- 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-scope-0.2-test</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-scope-0.2-test</version>
            </dependency>

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

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

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

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

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

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

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

            <dependency>
@@ -120,8 +120,8 @@

    <pluginRepositories>
        <pluginRepository>
-            <id>kepai-repo-plugin</id>
-            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
+            <id>tiesheng-repo-plugin</id>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
        </pluginRepository>
    </pluginRepositories>

--- 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-scope-0.2-test</version>
    </parent>

    <artifactId>springboot-ademo</artifactId>
-    <version>2.0.17-test</version>
+    <version>2.0.17-scope-0.2-test</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-scope-0.2-test</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-scope-0.2-test</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-scope-0.2-test</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,8 +170,9 @@ public class LoginController {
            extra = "";
        }
        String configUrl = globalConfig.buildPath("/login/wxmp/oauth2/" + service + "?extra=" + extra);
-        String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_base");
-        response.sendRedirect(authorizationUrl);
+//        String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_base");
+//        response.sendRedirect(authorizationUrl);
+        response.sendRedirect(configUrl+"&to=mobile&code=200");
    }


@@ -181,9 +182,13 @@ public class LoginController {
    @RequestMapping("/wxmp/oauth2/{service}")
    @OperationIgnore
    public void wxmpOauth2(@PathVariable String service, CodeExtraDTO dto, HttpServletResponse response) {
-        WxUserInfo wxUserInfo = platformWxmpConfig.getOAuth2AccessToken(service, dto.getCode());
-        TokenBean tokenBean = corePlatformUniqueService.login(new DoLoginInfo(wxUserInfo.getAppId(),
-                wxUserInfo.getOpenid(), "wxmp", JSON.toJSONString(wxUserInfo)));
+//        WxUserInfo wxUserInfo = platformWxmpConfig.getOAuth2AccessToken(service, dto.getCode());
+//        TokenBean tokenBean = corePlatformUniqueService.login(new DoLoginInfo(wxUserInfo.getAppId(),
+//                wxUserInfo.getOpenid(), "wxmp", JSON.toJSONString(wxUserInfo)));
+        TokenBean tokenBean = new TokenBean();
+        tokenBean.setId("testid");
+        tokenBean.setRoleId("testroleid");
+        tokenBean.setExtra("testextra");
        corePlatformUniqueService.redirect(tokenBean, dto.getTo(), dto.getExtra(), response);
    }

--- 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-scope-0.2-test</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-scope-0.2-test</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
@@ -162,8 +162,7 @@ public class PlatformWxmpConfig {

    ///////////////////////////////////////////////////////////////////////////
    // setter\getter
-
-    /// ////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////

    public Map<String, WxConfigBean> getConfigs() {
        return configs;
--- a/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxOAuth2AccessToken.java
+++ b/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxOAuth2AccessToken.java
@@ -11,7 +11,6 @@ public class WxOAuth2AccessToken {

    private String accessToken;
    private String openid;
-    private String isSnapshotuser;

    public static WxOAuth2AccessToken create(String appId, String secret, String code) {
        String response = OkHttpUtil.get("https://api.weixin.qq.com/sns/oauth2/access_token" +
@@ -24,20 +23,10 @@ public class WxOAuth2AccessToken {
        return oAuth2AccessToken;
    }

-    /**
-     * 是否是真实用户
-     *
-     * @return
-     */
-    public boolean isRealUser() {
-        return !"1".equals(isSnapshotuser);
-    }
-

    ///////////////////////////////////////////////////////////////////////////
    // setter\getter
-
-    /// ////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////

    public String getAccessToken() {
        return accessToken;
@@ -54,12 +43,4 @@ public class WxOAuth2AccessToken {
    public void setOpenid(String openid) {
        this.openid = openid;
    }
-
-    public String getIsSnapshotuser() {
-        return isSnapshotuser;
-    }
-
-    public void setIsSnapshotuser(String isSnapshotuser) {
-        this.isSnapshotuser = isSnapshotuser;
-    }
 }
--- a/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxUserInfo.java
+++ b/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxUserInfo.java
@@ -17,7 +17,6 @@ public class WxUserInfo {
    private String headimgurl;
    private String openid;
    private String appId;
-    private boolean isRealUser;

    ///////////////////////////////////////////////////////////////////////////
    // 逻辑方法
@@ -34,16 +33,13 @@ public class WxUserInfo {
        String s = OkHttpUtil.get("https://api.weixin.qq.com/sns/userinfo"
                + "?access_token=" + oAuth2AccessToken.getAccessToken()
                + "&openid=" + oAuth2AccessToken.getOpenid() + "&lang=zh_CN");
-        WxUserInfo wxUserInfo = JSON.parseObject(s, WxUserInfo.class);
-        wxUserInfo.setRealUser(oAuth2AccessToken.isRealUser());
-        return wxUserInfo;
+        return JSON.parseObject(s, WxUserInfo.class);
    }


    ///////////////////////////////////////////////////////////////////////////
    // setter\getter
-
-    /// ////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////

    public String getAccessToken() {
        return accessToken;
@@ -116,12 +112,4 @@ public class WxUserInfo {
    public void setAppId(String appId) {
        this.appId = appId;
    }
-
-    public boolean isRealUser() {
-        return isRealUser;
-    }
-
-    public void setRealUser(boolean realUser) {
-        isRealUser = realUser;
-    }
 }
--- 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-scope-0.2-test</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-scope-0.2-test</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-scope-0.2-test</version>
    </parent>

    <artifactId>springboot-web</artifactId>
Author	SHA1	Message	Date
丁磊	0f524274c3	publish 2.0.17-scope-0.2-test All checks were successful / local-deploy (push) Successful in 19s Details	2025-06-10 10:09:18 +08:00
丁磊	7b7aee2495	refactor(login): 调整微信公众号 OAuth2 登录流程- 注释掉原有的授权 URL生成和重定向逻辑 - 新增测试用 TokenBean 对象，用于模拟登录成功后的处理 - 修改重定向 URL，增加测试参数	2025-06-10 10:08:44 +08:00
丁磊	82c8076724	publish 2.0.17-scope-0.1 All checks were successful / local-deploy (push) Successful in 20s Details	2025-06-09 18:11:51 +08:00
丁磊	7fe1b1d79b	fix(login): 修改微信公众号授权类型 - 将 snsapi_userinfo 修改为 snsapi_base -优化了微信公众号登录的授权流程	2025-06-09 18:11:21 +08:00
丁磊	64127f3802	build: 更新 plugin repository -将 kepai-repo-plugin 修改为 tiesheng-repo-plugin - 更新 URL 为 https://git.tieshengkeji.com/api/packages/tieshengkeji/maven	2025-06-09 18:10:52 +08:00