publish 2.0.0.rc36

perf：登录的时候清除授权信息，相当于刷新一下权限
publish 2.0.0.rc35
2024-08-22 17:09:14 +08:00 · 2024-08-22 09:46:04 +08:00 · 2024-08-19 19:15:56 +08:00 · 2024-08-16 11:50:48 +08:00 · 2024-08-16 11:46:30 +08:00 · 2024-08-15 15:00:26 +08:00
17 changed files with 42 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.0.rc32</version>
+    <version>2.0.0.rc36</version>
    <packaging>pom</packaging>
    <name>springboot-parent</name>
    <description>杭州铁晟科技有限公司基础依赖</description>
@@ -58,61 +58,61 @@
            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-database</artifactId>
-                <version>2.0.0.rc32</version>
+                <version>2.0.0.rc36</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-login</artifactId>
-                <version>2.0.0.rc32</version>
+                <version>2.0.0.rc36</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-web</artifactId>
-                <version>2.0.0.rc32</version>
+                <version>2.0.0.rc36</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-util</artifactId>
-                <version>2.0.0.rc32</version>
+                <version>2.0.0.rc36</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-platform</artifactId>
-                <version>2.0.0.rc32</version>
+                <version>2.0.0.rc36</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-message</artifactId>
-                <version>2.0.0.rc32</version>
+                <version>2.0.0.rc36</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-encrypt</artifactId>
-                <version>2.0.0.rc32</version>
+                <version>2.0.0.rc36</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-role</artifactId>
-                <version>2.0.0.rc32</version>
+                <version>2.0.0.rc36</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-annotation</artifactId>
-                <version>2.0.0.rc32</version>
+                <version>2.0.0.rc36</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-poi</artifactId>
-                <version>2.0.0.rc32</version>
+                <version>2.0.0.rc36</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.0.rc32</version>
+        <version>2.0.0.rc36</version>
    </parent>

    <artifactId>springboot-ademo</artifactId>
-    <version>2.0.0.rc32</version>
+    <version>2.0.0.rc36</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.0.rc32</version>
+        <version>2.0.0.rc36</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.0.rc32</version>
+        <version>2.0.0.rc36</version>
    </parent>

    <artifactId>springboot-database</artifactId>
--- a/springboot-encrypt/pom.xml
+++ b/springboot-encrypt/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc32</version>
+        <version>2.0.0.rc36</version>
    </parent>

    <artifactId>springboot-encrypt</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.0.rc32</version>
+        <version>2.0.0.rc36</version>
    </parent>

    <artifactId>springboot-login</artifactId>
--- a/springboot-login/src/main/java/com/tiesheng/login/config/TokenWebMvcConfigurer.java
+++ b/springboot-login/src/main/java/com/tiesheng/login/config/TokenWebMvcConfigurer.java
@@ -105,7 +105,7 @@ public class TokenWebMvcConfigurer implements WebMvcConfigurer {
                TokenBean tokenBean = tsTokenConfig.validToken(request, true);

                // 验证用户是否存在
-                RequestUserInfo cachedUserInfo = tsLoginConfigurer.getCachedUserInfo(tokenBean);
+                RequestUserInfo cachedUserInfo = tsLoginConfigurer.getCachedUserInfo(tokenBean, false);
                if (cachedUserInfo == null) {
                    throw new ApiException("非法TOKEN，请重新登录");
                }
--- a/springboot-login/src/main/java/com/tiesheng/login/service/CorePlatformUniqueService.java
+++ b/springboot-login/src/main/java/com/tiesheng/login/service/CorePlatformUniqueService.java
@@ -11,7 +11,9 @@ import com.tiesheng.login.pojos.dao.CorePlatformUnique;
 import com.tiesheng.util.ServletKit;
 import com.tiesheng.util.config.Ip2regionConfig;
 import com.tiesheng.util.pojos.TokenBean;
+import com.tiesheng.util.service.TsCacheService;
 import com.tiesheng.util.service.TsServiceBase;
+import com.tiesheng.util.service.role.TsAuthorityHandler;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

@@ -51,6 +53,10 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
        TokenBean tokenBean = tsLoginConfigurer.login(platformUnique);
        if (tokenBean != null) {

+            // 清除授权信息
+            TsCacheService.of().remove(StrUtil.format(TsAuthorityHandler.CACHE_HAS_AUTHORITY,
+                    tokenBean.getRoleId(), tokenBean.getId()));
+
            // 添加登录日志
            addLoginLog(platformUnique, tokenBean);

@@ -60,6 +66,7 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
                platformUnique.setUserId(tokenBean.getId());
                saveOrUpdate(platformUnique);
            }
+
        }

        return tokenBean;
@@ -102,7 +109,7 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
        login.setUserId(tokenBean.getId());
        login.setPlatform(platformUnique.getPlatform());

-        RequestUserInfo requestUserInfo = tsLoginConfigurer.getCachedUserInfo(tokenBean);
+        RequestUserInfo requestUserInfo = tsLoginConfigurer.getCachedUserInfo(tokenBean, true);
        login.setUserName(requestUserInfo.getName());

        login.setIp(ip);
--- a/springboot-login/src/main/java/com/tiesheng/login/service/TsLoginConfigurer.java
+++ b/springboot-login/src/main/java/com/tiesheng/login/service/TsLoginConfigurer.java
@@ -47,10 +47,10 @@ public interface TsLoginConfigurer {
     * @param tokenBean
     * @return
     */
-    default RequestUserInfo getCachedUserInfo(TokenBean tokenBean) {
+    default RequestUserInfo getCachedUserInfo(TokenBean tokenBean, boolean force) {
        String key = StrUtil.format(TsTokenConfig.CACHE_REQUEST_LOGIN_KEY, tokenBean.getId());
        RequestUserInfo obj = TsCacheService.of().getObj(key, RequestUserInfo.class, -1);
-        if (obj == null) {
+        if (obj == null || force) {
            obj = getCurrentUserName(tokenBean);
        }
        if (obj != null) {
--- 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.0.rc32</version>
+        <version>2.0.0.rc36</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.0.rc32</version>
+        <version>2.0.0.rc36</version>
    </parent>

    <artifactId>springboot-platform</artifactId>
--- a/springboot-poi/pom.xml
+++ b/springboot-poi/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc32</version>
+        <version>2.0.0.rc36</version>
    </parent>

    <artifactId>springboot-poi</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.0.rc32</version>
+        <version>2.0.0.rc36</version>
    </parent>

    <artifactId>springboot-role</artifactId>
--- a/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
+++ b/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
@@ -18,11 +18,13 @@ import com.tiesheng.role.pojos.dao.CoreRoleUser;
 import com.tiesheng.role.pojos.dto.GroupRxUpdateDTO;
 import com.tiesheng.role.pojos.dto.OwnerMenuDTO;
 import com.tiesheng.role.pojos.vo.ServiceMenuVO;
+import com.tiesheng.util.config.GlobalConfig;
 import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.service.TsCacheService;
 import com.tiesheng.util.service.TsServiceBase;
 import com.tiesheng.util.service.role.TsAuthorityHandler;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -48,6 +50,8 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
    CoreRoleServerMapper coreRoleServerMapper;
    @Resource
    TsAuthorityHandler tsAuthorityHandler;
+    @Autowired
+    private GlobalConfig globalConfig;

    public CoreRoleServerMapper getServerMapper() {
        return coreRoleServerMapper;
@@ -241,6 +245,7 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole

        return menuChildrenWrap(ownerAuthorityList.stream()
                .filter(it -> Objects.equals(it.getType(), "group") || Objects.equals(it.getType(), "menu"))
+                .filter(it -> Objects.equals(it.getService(), dto.getService()) && Objects.equals(it.getPlatform(), dto.getPlatform()))
                .collect(Collectors.toList()), null)
                .stream().sorted(Comparator.comparingInt(ServiceMenuVO::getSort))
                .map(ServiceMenuVO::sortChildren)
@@ -273,8 +278,9 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
        }

        coreRoleAuthorityMapper.delete(new QueryWrapper<CoreRoleAuthority>()
+                .ne("service", globalConfig.getService())
                .ne("version", version)
-                .ne("source", "auto")
+                .eq("source", "auto")
        );

    }
--- 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.0.rc32</version>
+        <version>2.0.0.rc36</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.0.rc32</version>
+        <version>2.0.0.rc36</version>
    </parent>

    <artifactId>springboot-web</artifactId>
--- a/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java
+++ b/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java
@@ -179,7 +179,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
        if (tokenBean == null || StrUtil.isEmpty(tokenBean.getId())) {
            return;
        }
-        RequestUserInfo requestUserInfo = tieshengWebConfigurer.configureLogin().getCachedUserInfo(tokenBean);
+        RequestUserInfo requestUserInfo = tieshengWebConfigurer.configureLogin().getCachedUserInfo(tokenBean, false);
        if (requestUserInfo == null) {
            return;
        }
Author	SHA1	Message	Date
曾文豪	7b43ae3ce1	publish 2.0.0.rc36	2024-08-22 17:09:14 +08:00
曾文豪	8ca283ca85	perf：登录的时候清除授权信息，相当于刷新一下权限	2024-08-22 09:46:04 +08:00
曾文豪	3728291e73	publish 2.0.0.rc35	2024-08-19 19:15:56 +08:00
曾文豪	6997dea968	publish 2.0.0.rc34	2024-08-16 11:50:48 +08:00
曾文豪	7f601c8e60	publish 2.0.0.rc33	2024-08-16 11:46:30 +08:00
曾文豪	7adc2a7c4b	fix：修复无法删除权限的bug	2024-08-15 15:00:26 +08:00