publish 2.0.0.rc23

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.0.rc21</version>
+    <version>2.0.0.rc23</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.rc21</version>
+                <version>2.0.0.rc23</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.0.rc21</version>
+                <version>2.0.0.rc23</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.0.rc21</version>
+                <version>2.0.0.rc23</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.0.rc21</version>
+                <version>2.0.0.rc23</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.0.rc21</version>
+                <version>2.0.0.rc23</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.0.rc21</version>
+                <version>2.0.0.rc23</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>2.0.0.rc21</version>
+                <version>2.0.0.rc23</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.0.rc21</version>
+                <version>2.0.0.rc23</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.0.rc21</version>
+                <version>2.0.0.rc23</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>2.0.0.rc21</version>
+                <version>2.0.0.rc23</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.rc21</version>
+        <version>2.0.0.rc23</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.0.rc21</version>
+    <version>2.0.0.rc23</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

springboot-ademo/src/main/resources/application-test.yml

@@ -27,11 +27,11 @@ tiesheng:
     test-map:
       "1111":
         id: "1"
-        role-id: "super"
+        role-id: "1822829641023524865"
   global:
     version: 2
     host: http://localhost:8100
-    service: demo
+    service: yrx
   aliyun:
     access-key-id: LTAI5tJtbgBCnTY5eS4SmrTf
     access-key-secret: JIHqpRUFffCHhXaJEVvWN31WcexWqG

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc21</version>
+        <version>2.0.0.rc23</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.rc21</version>
+        <version>2.0.0.rc23</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.rc21</version>
+        <version>2.0.0.rc23</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.rc21</version>
+        <version>2.0.0.rc23</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc21</version>
+        <version>2.0.0.rc23</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.rc21</version>
+        <version>2.0.0.rc23</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.rc21</version>
+        <version>2.0.0.rc23</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.rc21</version>
+        <version>2.0.0.rc23</version>
     </parent>
 
     <artifactId>springboot-role</artifactId>

springboot-role/src/main/java/com/tiesheng/role/pojos/vo/ServiceMenuVO.java

@@ -2,12 +2,23 @@ package com.tiesheng.role.pojos.vo;
 
 import com.tiesheng.role.pojos.dao.CoreRoleAuthority;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class ServiceMenuVO extends CoreRoleAuthority {
 
     private List<ServiceMenuVO> children;
 
+    /**
+     * 排序
+     */
+    public ServiceMenuVO sortChildren() {
+        children = children.stream().sorted(Comparator.comparingInt(ServiceMenuVO::getSort))
+                .collect(Collectors.toList());
+        return this;
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
     ///////////////////////////////////////////////////////////////////////////

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

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.tiesheng.annotation.role.RoleAuthority;
@@ -72,7 +73,18 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
      * @return
      */
     public List<ServiceMenuVO> menuChildrenWrap(List<CoreRoleAuthority> coreServiceMenuList, String parent) {
-        List<CoreRoleAuthority> distinctList = coreServiceMenuList.stream().distinct().collect(Collectors.toList());
+
+        HashMap<String, String> keyMaps = MapUtil.newHashMap();
+
+        List<CoreRoleAuthority> distinctList = coreServiceMenuList.stream()
+                .filter(it -> {
+                    if (keyMaps.containsKey(it.getId())) {
+                        return true;
+                    }
+                    keyMaps.put(it.getId(), it.getId());
+                    return false;
+                })
+                .collect(Collectors.toList());
 
         List<ServiceMenuVO> list = new ArrayList<>();
 
@@ -101,6 +113,10 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
                 .eq("group_id", dto.getId())
         );
 
+        if (CollUtil.isEmpty(dto.getMenuIds())) {
+            return;
+        }
+
         CoreRoleGroup roleGroup = getById(dto.getId());
         Validator.validateNotEmpty(roleGroup, "角色不存在");
 
@@ -214,7 +230,10 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
 
         return menuChildrenWrap(ownerAuthorityList.stream()
                 .filter(it -> Objects.equals(it.getType(), "group") || Objects.equals(it.getType(), "menu"))
-                .collect(Collectors.toList()), null);
+                .collect(Collectors.toList()), null)
+                .stream().sorted(Comparator.comparingInt(ServiceMenuVO::getSort))
+                .map(ServiceMenuVO::sortChildren)
+                .collect(Collectors.toList());
     }
 
 

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.0.rc21</version>
+        <version>2.0.0.rc23</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.rc21</version>
+        <version>2.0.0.rc23</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>