refactor: 优化权限初始化

Author: zhou-hao

changes.sh

@@ -7,4 +7,11 @@ while read file; do
     if [ -f "$dir/pom.xml" ]; then echo "$dir"; break; fi
     dir=$(dirname "$dir")
   done
-done | sort -u | tr '\n' ',' | sed 's/,$//'
+done | sort -u | tr '\n' ',' | sed 's/,$//'
+
+# 如果为空，则使用默认值 '.'
+if [ -z "$modules" ]; then
+  echo "."
+else
+  echo "$modules"
+fi

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/define/ResourcesDefinition.java

@@ -9,14 +9,14 @@
 import org.hswebframework.web.authorization.annotation.Logical;
 
 import java.util.*;
-import java.util.function.Function;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 @Getter
 @Setter
 public class ResourcesDefinition {
 
-    private Set<ResourceDefinition> resources = new HashSet<>();
+    private final Set<ResourceDefinition> resources = ConcurrentHashMap.newKeySet();
 
     private Logical logical = Logical.DEFAULT;
 

hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/AopAuthorizingController.java

@@ -17,7 +17,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.core.ReactiveAdapterRegistry;
+import org.springframework.core.Ordered;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,9 +26,6 @@
 
 import java.lang.reflect.Method;
 import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -38,7 +35,7 @@
  */
 @Slf4j
 @SuppressWarnings("all")
-public class AopAuthorizingController extends StaticMethodMatcherPointcutAdvisor implements CommandLineRunner, MethodInterceptor {
+public class AopAuthorizingController extends StaticMethodMatcherPointcutAdvisor implements CommandLineRunner, MethodInterceptor, Ordered {
 
     private static final long serialVersionUID = 1154190623020670672L;
 
@@ -214,5 +211,8 @@ public void run(String... args) throws Exception {
         }
     }
 
-
+    @Override
+    public int getOrder() {
+        return Ordered.HIGHEST_PRECEDENCE;
+    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/PermissionSynchronization.java

@@ -20,6 +20,7 @@
 
 import javax.persistence.Column;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -95,14 +96,14 @@ public void run(String... args) throws Exception {
         permissionRepository
             .createQuery()
             .fetch()
-            .collect(Collectors.toMap(PermissionEntity::getId, Function.identity()))
-            .flatMap(group -> Flux.fromIterable(definition.getResources())
-                                  .map(d -> PermissionSynchronization.convert(group, d, entityFieldsMapping))
-                                  .as(permissionRepository::save))
-            .doOnError(err -> log.warn("sync permission error", err))
-            .subscribe(l -> {
-                log.info("sync permission success:{}", l);
-            });
+            .collectMap(PermissionEntity::getId, Function.identity(), ConcurrentHashMap::new)
+            .flatMap(group -> Flux
+                .fromIterable(definition.getResources())
+                .map(d -> PermissionSynchronization.convert(group, d, entityFieldsMapping))
+                .as(permissionRepository::save))
+            .subscribe(
+                l -> log.info("sync permission success:{}", l),
+                err -> log.warn("sync permission error", err));
 
     }
 }