publish 2.0.0.rc37

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.0.rc26</version>
+    <version>2.0.0.rc37</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.rc26</version>
+                <version>2.0.0.rc37</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.0.rc26</version>
+                <version>2.0.0.rc37</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.0.rc26</version>
+                <version>2.0.0.rc37</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.0.rc26</version>
+                <version>2.0.0.rc37</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.0.rc26</version>
+                <version>2.0.0.rc37</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.0.rc26</version>
+                <version>2.0.0.rc37</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>2.0.0.rc26</version>
+                <version>2.0.0.rc37</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.0.rc26</version>
+                <version>2.0.0.rc37</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.0.rc26</version>
+                <version>2.0.0.rc37</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>2.0.0.rc26</version>
+                <version>2.0.0.rc37</version>
             </dependency>
 
             <dependency>

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc26</version>
+        <version>2.0.0.rc37</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.0.rc26</version>
+    <version>2.0.0.rc37</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc26</version>
+        <version>2.0.0.rc37</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc26</version>
+        <version>2.0.0.rc37</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

springboot-encrypt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc26</version>
+        <version>2.0.0.rc37</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc26</version>
+        <version>2.0.0.rc37</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

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，请重新登录");
                 }

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);

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) {

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc26</version>
+        <version>2.0.0.rc37</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>

springboot-platform/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc26</version>
+        <version>2.0.0.rc37</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc26</version>
+        <version>2.0.0.rc37</version>
     </parent>
 
     <artifactId>springboot-poi</artifactId>

springboot-role/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc26</version>
+        <version>2.0.0.rc37</version>
     </parent>
 
     <artifactId>springboot-role</artifactId>

springboot-role/src/main/java/com/tiesheng/role/mapper/CoreRoleUserMapper.java

@@ -29,7 +29,7 @@ public interface CoreRoleUserMapper extends BaseMapper<CoreRoleUser> {
      * @param userId
      * @return
      */
-    List<CoreRoleAuthority> getOwnerAuthorityLeafList(@Param("userId") String userId,
-                                                      @Param("roleId") String roleId);
+    List<CoreRoleAuthority> getOwnerAuthorityLeafList(@Param("userId") String userId, @Param("roleId") String roleId,
+                                                      @Param("type") String type);
 
 }

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;
@@ -200,7 +204,7 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
      * @return
      */
     public List<CoreRoleAuthority> getOwnerAuthorityLeafList(String userId, String roleId) {
-        return coreRoleUserMapper.getOwnerAuthorityLeafList(userId, roleId);
+        return coreRoleUserMapper.getOwnerAuthorityLeafList(userId, roleId, "bind");
     }
 
 
@@ -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)
@@ -274,7 +279,8 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
 
         coreRoleAuthorityMapper.delete(new QueryWrapper<CoreRoleAuthority>()
                 .ne("version", version)
-                .ne("source", "auto")
+                .eq("service", globalConfig.getService())
+                .eq("source", "auto")
         );
 
     }

springboot-role/src/main/java/com/tiesheng/role/service/RoleAuthorityHandler.java

@@ -103,7 +103,7 @@ public class RoleAuthorityHandler implements TsAuthorityHandler {
     @Override
     public List<String> getAuthorities(TokenBean tokenBean) {
         List<CoreRoleAuthority> list = coreRoleUserMapper.getOwnerAuthorityLeafList(tokenBean.getId(),
-                tokenBean.getRoleId());
+                tokenBean.getRoleId(), "");
         return list.stream().map(CoreRoleAuthority::getNo).distinct().collect(Collectors.toList());
     }
 

springboot-role/src/main/resources/mapper/CoreRoleGroupRxMapper.xml

@@ -18,12 +18,12 @@
   </sql>
 
   <insert id="batchInsert">
-      insert into core_role_group_rx(id, create_time, update_time, is_deleted, group_id, menu_id)
+      insert into core_role_group_rx(id, create_time, update_time, is_deleted, group_id, menu_id,type)
       values
       <foreach collection="list" item="item" separator=",">
       (uuid(), now(), now(), 0,
        #{item.groupId},
-       #{item.menuId})
+       #{item.menuId}, #{item.type})
   </foreach>
   </insert>
-</mapper>
+</mapper>

springboot-role/src/main/resources/mapper/CoreRoleUserMapper.xml

@@ -50,10 +50,13 @@
              select crgr.menu_id
              from core_role_user cru
                       left join core_role_group_rx crgr on crgr.group_id = cru.type_id
-             where type = 'job'
-               and user_id = #{userId}
+             where cru.type = 'job'
+               and cru.user_id = #{userId}
                and cru.is_deleted = 0
                and (cru.expire_time is null or cru.expire_time > now())
+                <if test="type != null and type != ''">
+                    and crgr.type=#{type}
+                </if>
 
       <if test="roleId != null and roleId != ''">
           union
@@ -61,6 +64,9 @@
           select menu_id
           from core_role_group_rx
           where group_id = #{roleId}
+          <if test="type != null and type != ''">
+              and type=#{type}
+          </if>
       </if>
       )
       order by sort

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc26</version>
+        <version>2.0.0.rc37</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc26</version>
+        <version>2.0.0.rc37</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

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;
         }