feat: 优化上下文传递

Author: zhou-hao

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

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

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

@@ -3,13 +3,21 @@
 import io.micrometer.context.ThreadLocalAccessor;
 import org.hswebframework.web.authorization.Authentication;
 import org.hswebframework.web.authorization.AuthenticationHolder;
+import org.hswebframework.web.authorization.ReactiveAuthenticationHolder;
 
 import javax.annotation.Nonnull;
 
-public class AuthenticationThreadLocalAccessor implements ThreadLocalAccessor<Authentication> {
+public class AuthenticationThreadLocalAccessor
+    implements ThreadLocalAccessor<Authentication> {
 
     static final String KEY = "cp.hs.auth";
 
+    static {
+        ReactiveAuthenticationHolder.addSupplier(
+            new ThreadLocalReactiveAuthenticationSupplier()
+        );
+    }
+
     @Override
     @Nonnull
     public Object key() {

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

@@ -0,0 +1,18 @@
+package org.hswebframework.web.authorization.context;
+
+import org.hswebframework.web.authorization.Authentication;
+import org.hswebframework.web.authorization.AuthenticationHolder;
+import org.hswebframework.web.authorization.ReactiveAuthenticationSupplier;
+import reactor.core.publisher.Mono;
+
+class ThreadLocalReactiveAuthenticationSupplier implements ReactiveAuthenticationSupplier {
+    @Override
+    public Mono<Authentication> get(String userId) {
+        return Mono.empty();
+    }
+
+    @Override
+    public Mono<Authentication> get() {
+        return Mono.justOrEmpty(AuthenticationHolder.get());
+    }
+}

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

@@ -26,9 +26,10 @@ void testReadFromReactive() {
             () -> Authentication
                 .currentReactive()
                 .subscribeOn(Schedulers.boundedElastic())
+                .contextCapture()
                 .block());
 
-        assertEquals(auth,auth2);
+        assertEquals(auth, auth2);
     }
 
     @Test