publish 2.0.27-scope-0.2-test

refactor(login): 调整微信公众号 OAuth2 登录流程- 注释掉原有的授权 URL生成和重定向逻辑
- 添加新的重定向 URL，包含额外参数和固定 code - 修改 wxmpOauth2 方法，使用测试数据进行登录
2025-06-10 09:43:01 +08:00 · 2025-06-10 09:41:57 +08:00 · 2025-06-09 18:32:26 +08:00 · 2025-06-09 18:32:06 +08:00 · 2025-04-24 11:39:20 +08:00 · 2025-04-24 11:38:56 +08:00
13 changed files with 69 additions and 29 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

    <groupId>com.tiesheng.springboot-parent</groupId>
    <artifactId>springboot-parent</artifactId>
-    <version>2.0.26</version>
+    <version>2.0.27-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.26</version>
+                <version>2.0.27-scope-0.2-test</version>
            </dependency>

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

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

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

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

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

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

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-annotation</artifactId>
-                <version>2.0.26</version>
+                <version>2.0.27-scope-0.2-test</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.26</version>
+        <version>2.0.27-scope-0.2-test</version>
    </parent>

    <artifactId>springboot-ademo</artifactId>
-    <version>2.0.26</version>
+    <version>2.0.27-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.26</version>
+        <version>2.0.27-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.26</version>
+        <version>2.0.27-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.26</version>
+        <version>2.0.27-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.26</version>
+        <version>2.0.27-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.26</version>
+        <version>2.0.27-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.26</version>
+        <version>2.0.27-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.26</version>
+        <version>2.0.27-scope-0.2-test</version>
    </parent>

    <artifactId>springboot-util</artifactId>
@@ -82,7 +82,7 @@
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.30</version>
+            <version>8.0.33</version>
        </dependency>

        <dependency>
@@ -107,7 +107,7 @@
        <dependency>
            <groupId>org.bouncycastle</groupId>
            <artifactId>bcprov-jdk15to18</artifactId>
-            <version>1.68</version>
+            <version>1.80</version>
        </dependency>

        <dependency>
--- 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.26</version>
+        <version>2.0.27-scope-0.2-test</version>
    </parent>

    <artifactId>springboot-web</artifactId>
@@ -30,9 +30,39 @@
                    <artifactId>spring-boot-starter-json</artifactId>
                    <groupId>org.springframework.boot</groupId>
                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                    <artifactId>tomcat-embed-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                    <artifactId>tomcat-embed-el</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                    <artifactId>tomcat-embed-websocket</artifactId>
+                </exclusion>
            </exclusions>
        </dependency>

+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <version>9.0.104</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-el</artifactId>
+            <version>9.0.104</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-websocket</artifactId>
+            <version>9.0.104</version>
+        </dependency>
+
        <!--    aspect    -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
--- a/springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java
+++ b/springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java
@@ -1,6 +1,8 @@
 package com.tiesheng.web.config.operation;

 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
@@ -56,6 +58,8 @@ public class OperationAspect {
    @Around("methodArgs()")
    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {

+        DateTime crateTime = DateUtil.date();
+
        HttpServletRequest request = ServletKit.getRequest();
        if (request == null) {
            return joinPoint.proceed();
@@ -115,7 +119,7 @@ public class OperationAspect {
            }
        }

-        coreLogService.addOperationLog(
+        coreLogService.addOperationLog(crateTime,
                tsTokenConfig.validToken(request, false), title, subject, reqMaps);

        return response;
--- a/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java
+++ b/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java
@@ -23,6 +23,7 @@ import com.tiesheng.web.util.ProcessSyncConsumer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+import java.util.Date;
 import java.util.List;

 /**
@@ -154,7 +155,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
    /**
     * 添加操作日志
     */
-    public void addOperationLog(TokenBean tokenBean, String title, String subject, Object params) {
+    public void addOperationLog(Date createTime, TokenBean tokenBean, String title, String subject, Object params) {

        if (tokenBean == null || StrUtil.isEmpty(tokenBean.getId())) {
            return;
@@ -165,7 +166,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
        }

        CoreLogOperation operation = new CoreLogOperation();
-        operation.setCreateTime(DateUtil.date());
+        operation.setCreateTime(createTime);
        operation.setUpdateTime(DateUtil.date());
        operation.setUserId(requestUserInfo.getId());
        operation.setUserName(requestUserInfo.getName());
Author	SHA1	Message	Date
丁磊	adbc4cacbb	publish 2.0.27-scope-0.2-test All checks were successful / local-deploy (push) Successful in 21s Details	2025-06-10 09:43:01 +08:00
丁磊	011f6c58ac	refactor(login): 调整微信公众号 OAuth2 登录流程- 注释掉原有的授权 URL生成和重定向逻辑 - 添加新的重定向 URL，包含额外参数和固定 code - 修改 wxmpOauth2 方法，使用测试数据进行登录	2025-06-10 09:41:57 +08:00
丁磊	bd70fdc498	publish 2.0.27-scope-0.1 All checks were successful / local-deploy (push) Successful in 19s Details	2025-06-09 18:32:26 +08:00
丁磊	ceef7180f7	fix(login): 修改微信公众号登录授权级别 - 将 snsapi_userinfo 修改为 snsapi_base，以解决普通网页授权问题	2025-06-09 18:32:06 +08:00
曾文豪	2d8208e4dc	publish 2.0.27 All checks were successful / local-deploy (push) Successful in 8m4s Details	2025-04-24 11:39:20 +08:00
曾文豪	c4ba637de7	build(springboot-util & springboot-web): 升级依赖版本	2025-04-24 11:38:56 +08:00
曾文豪	7b0b9e0925	feat(core-log): 添加操作日志时指定创建时间	2025-04-24 10:14:29 +08:00