refactor: 优化用户权限初始化逻辑

Author: zhou-hao

jetlinks-components/rule-engine-component/pom.xml

@@ -65,12 +65,14 @@
             <artifactId>relation-component</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.jetlinks.community</groupId>
             <artifactId>configure-component</artifactId>
-            <version>2.10.0-SNAPSHOT</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+
         <dependency>
             <groupId>org.jetlinks.community</groupId>
             <artifactId>things-component</artifactId>

jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/UserAuthenticationEventPublisher.java

@@ -81,16 +81,12 @@ private Mono<Void> publish0(Collection<String> userIdList) {
         return Flux
             .fromIterable(userIdList)
             .flatMapDelayError(
-                userId -> ReactiveAuthenticationHolder
-                    .get(userId)
-                    .flatMap(auth -> eventBus
-                        .publish(Topics
-                                     .Authentications
-                                     .userAuthenticationChanged(auth.getUser().getId()),
-                                 FastSerializableAuthentication.of(auth, true)
-                        ))
-                    .as(MonoTracer.create("/user/" + userId + "/authentication/changed")),
-                4, 4)
+                userId -> eventBus
+                    .publish(Topics.Authentications.userAuthenticationChanged(userId),
+                             ReactiveAuthenticationHolder
+                                 .get(userId)
+                                 .map(auth -> FastSerializableAuthentication.of(auth, true)))
+                    .as(MonoTracer.create("/user/" + userId + "/authentication/changed")), 4, 4)
             .then();
     }
 

jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/service/NotifySubscriberService.java

@@ -359,15 +359,15 @@ public Mono<Void> doSubscribe(NotifySubscriberEntity entity) {
 
     }
 
-    //用户权限变更时重新订阅
-    @Subscribe(value = Topics.Authentications.allUserAuthenticationChanged, features = Subscription.Feature.local)
-    public void handleAuthenticationChanged(Authentication auth) {
-
-        SubTable table = subscribers.get(auth.getUser().getId());
-        if (table != null) {
-            table.resubscribe(auth);
-        }
-    }
+//    //用户权限变更时重新订阅
+//    @Subscribe(value = Topics.Authentications.allUserAuthenticationChanged, features = Subscription.Feature.local)
+//    public void handleAuthenticationChanged(Authentication auth) {
+//
+//        SubTable table = subscribers.get(auth.getUser().getId());
+//        if (table != null) {
+//            table.resubscribe(auth);
+//        }
+//    }
 
     //用户订阅表
     private class SubTable implements Disposable {
@@ -380,6 +380,20 @@ private class SubTable implements Disposable {
 
         public SubTable(String subscriber) {
             this.subscriber = subscriber;
+            disposable.add(
+                eventBus.subscribe(
+                    Subscription
+                        .builder()
+                        .features(Subscription.Feature.local)
+                        .topics(Topics.Authentications.userAuthenticationChanged(subscriber))
+                        .subscriberId("notify_subscriber")
+                        .build(),
+                    p -> {
+                        resubscribe(p.decode(Authentication.class));
+                        return Mono.empty();
+                    }
+                )
+            );
         }
 
         void resubscribe(Authentication authentication) {
@@ -629,7 +643,7 @@ class NotifySubscriberProviderCache implements Disposable {
 
         private final Map<String, NotifySubscriberChannelEntity> channels = new ConcurrentHashMap<>();
 
-        public NotifySubscriberProviderEntity getProvider(){
+        public NotifySubscriberProviderEntity getProvider() {
             return provider;
         }