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
12 changed files with 39 additions and 35 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

    <groupId>com.tiesheng.springboot-parent</groupId>
    <artifactId>springboot-parent</artifactId>
-    <version>2.0.18</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.18</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.18</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.18</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.18</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.18</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.18</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.18</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.18</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.18</version>
+        <version>2.0.17-scope-0.2-test</version>
    </parent>

    <artifactId>springboot-ademo</artifactId>
-    <version>2.0.18</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.18</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.18</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.18</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_userinfo");
-        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.18</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.18</version>
+        <version>2.0.17-scope-0.2-test</version>
    </parent>

    <artifactId>springboot-platform</artifactId>
--- 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.18</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.18</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.18</version>
+        <version>2.0.17-scope-0.2-test</version>
    </parent>

    <artifactId>springboot-web</artifactId>
--- a/springboot-web/src/main/java/com/tiesheng/web/service/CoreConfigService.java
+++ b/springboot-web/src/main/java/com/tiesheng/web/service/CoreConfigService.java
@@ -68,20 +68,19 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
     * @param dto
     */
    public void updateConfigSystem(ConfigSystemDTO dto) {
-        CoreConfigSystem coreConfigSystem = getOneByColumn("config_key", dto.getConfigKey());
-        if (coreConfigSystem == null) {
+        CoreConfigSystem configKey = getOneByColumn("config_key", dto.getConfigKey());
+        if (configKey == null) {
            throw new ApiException("该配置不存在，请检查");
        }
-        if (coreConfigSystem.getReadOnly() == 1) {
+        if (configKey.getReadOnly() == 1) {
            throw new ApiException("该配置只读，不可修改");
        }
-        coreConfigSystem.setConfigVal(dto.getConfigVal());
-        coreConfigSystem.setRemark(dto.getRemark());
-        coreConfigSystem.setExtra(dto.getExtra());
-        updateById(coreConfigSystem);
+        configKey.setConfigVal(dto.getConfigVal());
+        configKey.setRemark(dto.getRemark());
+        configKey.setExtra(dto.getExtra());
+        updateById(configKey);

-        tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + coreConfigSystem.getConfigKey(),
-                coreConfigSystem, 10 * 60);
+        tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + configKey, configKey, 10 * 60);
    }
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