feat: 优化上下文传递

Author: zhou-hao

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

@@ -78,7 +78,7 @@ private static Optional<Authentication> get(Function<AuthenticationSupplier, Opt
      * @return 当前登录的用户权限信息
      */
     public static Optional<Authentication> get() {
-        Authentication current = CURRENT.get();
+        Authentication current = CURRENT.getIfExists();
         if (current != null) {
             return Optional.of(current);
         }

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

@@ -104,7 +104,9 @@ public synchronized void merge(Authentication auth) {
         }
 
         Authentication get() {
-            return auth;
+            return auth == null
+                ? AuthenticationHolder.get().orElse(null)
+                : auth;
         }
     }
 

hsweb-authorization/hsweb-authorization-api/src/test/java/org/hswebframework/web/authorization/context/AuthenticationThreadLocalAccessorTest.java

@@ -12,11 +12,27 @@
 
 class AuthenticationThreadLocalAccessorTest {
 
+    static {
+        Hooks.enableAutomaticContextPropagation();
+    }
 
     @Test
     void testReadFromReactive() {
 
-        Hooks.enableAutomaticContextPropagation();
+        Authentication auth = new SimpleAuthentication();
+
+        Authentication auth2 = AuthenticationHolder.executeWith(
+            auth,
+            () -> Authentication
+                .currentReactive()
+                .subscribeOn(Schedulers.boundedElastic())
+                .block());
+
+        assertEquals(auth,auth2);
+    }
+
+    @Test
+    void testReadInReactive() {
 
         Authentication auth = new SimpleAuthentication();
 
@@ -28,7 +44,6 @@ void testReadFromReactive() {
                     return Authentication.current().orElse(null);
                 })
                 .subscribeOn(Schedulers.boundedElastic())
-                .contextWrite(c->c)
                 .block());
 
         assertEquals(auth, auth2);