add dao alone redis

quarkiverse · Oct 21, 2022 · 69189f6 · 69189f6
1 parent cf87a12
commit 69189f6
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 29 deletions.
diff --git a/...-resteasy/runtime/src/main/java/io/quarkiverse/satoken/resteasy/SaRequestForResteasy.java b/...-resteasy/runtime/src/main/java/io/quarkiverse/satoken/resteasy/SaRequestForResteasy.java
@@ -39,13 +39,19 @@ public SaRequestForResteasy() {
 
     @Override
     public Object getSource() {
-
         return this.context;
     }
 
+    /**
+     * if there is not @FormParam in Endpoint,the form data will not parsing.
+     * @see <a href="https://github.com/quarkusio/quarkus/discussions/25103">RESTEasy Reactive - get all form data</a>
+     * @see <a href="https://github.com/quarkusio/quarkus/issues/22444">RESTEasy Reactive: make body-reading filters force reading the body</a>
+     * @param name param name
+     * @return param value
+     */
     @Override
     public String getParam(String name) {
-        return Optional.ofNullable(this.context.getQueryParameter(name, true, true))
+        return Optional.ofNullable(this.context.getQueryParameter(name, true, false))
                 .or(() -> Optional.ofNullable(this.context.getFormParameter(name, true, true)))
                 .map(Object::toString)
                 .orElse(null);

diff --git a/...arkus-satoken-dao-alone-redis/integration-tests/src/main/resources/application.properties b/...arkus-satoken-dao-alone-redis/integration-tests/src/main/resources/application.properties
@@ -1,10 +1,7 @@
 sa-token.exception-mapper-enabled=true
 quarkus.application.name=sa-token-dao-alone-redis
-quarkus.redisson.single-server-config.address=redis://127.0.0.1:63790
-quarkus.redisson.single-server-config.database=0
-quarkus.redisson.codec=org.redisson.codec.JsonJacksonCodec
 quarkus.redis.devservices.enabled=true
 quarkus.redis.devservices.port=63790
-sa-token.alone-redis.redisson.single-server-config.address=redis://127.0.0.1:63791
+sa-token.alone-redis.redisson.single-server-config.address=redis://127.0.0.1:63790
 sa-token.alone-redis.redisson.single-server-config.database=0
 sa-token.alone-redis.redisson.codec=org.redisson.codec.JsonJacksonCodec
diff --git a/...lone-redis/integration-tests/src/test/java/io/quarkiverse/satoken/resteasy/BasicTest.java b/...lone-redis/integration-tests/src/test/java/io/quarkiverse/satoken/resteasy/BasicTest.java
@@ -30,11 +30,10 @@
 import io.quarkiverse.satoken.core.context.SaTokenContextForQuarkus;
 import io.quarkiverse.satoken.core.utils.AntPathMatcher;
 import io.quarkiverse.satoken.resteasy.utils.SoMap;
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
-@QuarkusTestResource(RedisResource.class)
+//@QuarkusTestResource(RedisResource.class)
 public class BasicTest extends AbstractRequestTest {
 
     // 持久化Bean

diff --git a/...-redis/integration-tests/src/test/java/io/quarkiverse/satoken/resteasy/ManyLoginTest.java b/...-redis/integration-tests/src/test/java/io/quarkiverse/satoken/resteasy/ManyLoginTest.java
@@ -13,7 +13,6 @@
 import cn.dev33.satoken.session.TokenSign;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 /**
@@ -23,7 +22,7 @@
  * @date 2022/4/12 2:11 PM
  */
 @QuarkusTest
-@QuarkusTestResource(RedisResource.class)
+//@QuarkusTestResource(RedisResource.class)
 public class ManyLoginTest extends AbstractRequestTest {
     // 持久化Bean
     SaTokenDao dao = SaManager.getSaTokenDao();

diff --git a/...-redis/integration-tests/src/test/java/io/quarkiverse/satoken/resteasy/RedisResource.java b/...-redis/integration-tests/src/test/java/io/quarkiverse/satoken/resteasy/RedisResource.java
@@ -14,6 +14,7 @@
  * @author nayan
  * @date 2022/10/20 10:42
  */
+@Deprecated
 public class RedisResource implements QuarkusTestResourceLifecycleManager {
 
     //准备Redis容器，使用withExposedPorts方法暴露端口

diff --git a/...tion-tests/src/test/java/io/quarkiverse/satoken/resteasy/integrate/LoginResourceTest.java b/...tion-tests/src/test/java/io/quarkiverse/satoken/resteasy/integrate/LoginResourceTest.java
@@ -13,14 +13,12 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkiverse.satoken.resteasy.AbstractRequestTest;
-import io.quarkiverse.satoken.resteasy.RedisResource;
 import io.quarkiverse.satoken.resteasy.utils.SoMap;
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.response.ValidatableResponse;
 
 @QuarkusTest
-@QuarkusTestResource(RedisResource.class)
+//@QuarkusTestResource(RedisResource.class)
 public class LoginResourceTest extends AbstractRequestTest {
 
     @Test

diff --git a/...ation-tests/src/test/java/io/quarkiverse/satoken/resteasy/integrate/MoreResourceTest.java b/...ation-tests/src/test/java/io/quarkiverse/satoken/resteasy/integrate/MoreResourceTest.java
@@ -6,12 +6,10 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkiverse.satoken.resteasy.AbstractRequestTest;
-import io.quarkiverse.satoken.resteasy.RedisResource;
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
-@QuarkusTestResource(RedisResource.class)
+//@QuarkusTestResource(RedisResource.class)
 public class MoreResourceTest extends AbstractRequestTest {
 
     // 基础API测试

diff --git a/...tion-tests/src/test/java/io/quarkiverse/satoken/resteasy/integrate/RouteResourceTest.java b/...tion-tests/src/test/java/io/quarkiverse/satoken/resteasy/integrate/RouteResourceTest.java
@@ -10,8 +10,6 @@
 import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.router.SaRouterStaff;
 import io.quarkiverse.satoken.resteasy.AbstractRequestTest;
-import io.quarkiverse.satoken.resteasy.RedisResource;
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
@@ -24,7 +22,7 @@
  */
 @QuarkusTest
 @TestProfile(RouteResourceTest.RouteTestProfile.class)
-@QuarkusTestResource(RedisResource.class)
+//@QuarkusTestResource(RedisResource.class)
 public class RouteResourceTest extends AbstractRequestTest {
 
     // 基础API测试

diff --git a/...sts/src/test/java/io/quarkiverse/satoken/resteasy/integrate/SaAnnotationResourceTest.java b/...sts/src/test/java/io/quarkiverse/satoken/resteasy/integrate/SaAnnotationResourceTest.java
@@ -4,8 +4,6 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkiverse.satoken.resteasy.AbstractRequestTest;
-import io.quarkiverse.satoken.resteasy.RedisResource;
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
@@ -18,7 +16,7 @@
  */
 @QuarkusTest
 @TestProfile(SaAnnotationResourceTest.AnnotationTestProfile.class)
-@QuarkusTestResource(RedisResource.class)
+//@QuarkusTestResource(RedisResource.class)
 public class SaAnnotationResourceTest extends AbstractRequestTest {
 
     // 校验通过的情况

diff --git a/...-tests/src/test/java/io/quarkiverse/satoken/resteasy/integrate/SaIdTokenResourceTest.java b/...-tests/src/test/java/io/quarkiverse/satoken/resteasy/integrate/SaIdTokenResourceTest.java
@@ -11,8 +11,6 @@
 import cn.dev33.satoken.exception.IdTokenInvalidException;
 import cn.dev33.satoken.id.SaIdUtil;
 import io.quarkiverse.satoken.resteasy.AbstractRequestTest;
-import io.quarkiverse.satoken.resteasy.RedisResource;
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.Header;
 import io.restassured.response.ValidatableResponse;
@@ -24,7 +22,7 @@
  * @date 2022/10/8 14:29
  */
 @QuarkusTest
-@QuarkusTestResource(RedisResource.class)
+//@QuarkusTestResource(RedisResource.class)
 public class SaIdTokenResourceTest extends AbstractRequestTest {
 
     // 获取信息

diff --git a/...e/src/main/java/io/quarkiverse/satoken/dao/redis/jackson/core/SaTokenDaoRedisJackson.java b/...e/src/main/java/io/quarkiverse/satoken/dao/redis/jackson/core/SaTokenDaoRedisJackson.java
@@ -7,7 +7,7 @@
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import javax.enterprise.inject.spi.CDI;
 
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
@@ -36,9 +36,28 @@ public class SaTokenDaoRedisJackson implements SaTokenDao {
      */
     public boolean isInit;
 
-    @Inject
     @PostConstruct
-    public void init( RedissonClient redissonClient) {
+    public void init() {
+        if (!this.isInit) {
+            //            try {
+            //                Arc.container().instance(RedissonClientProducer.class).get();
+            //            } catch (Exception e) {
+            //                LOG.debug("redisson init error");
+            //            }
+            try {
+                CDI.current().select(RedissonClient.class).stream().findAny().ifPresent(r -> {
+                    init(r);
+                    LOG.debug("satoken redisson init");
+                });
+            } catch (Exception e) {
+                LOG.debug("satoken redisson init error!");
+            }
+        } else {
+            LOG.debug("satoken redisson had inited!");
+        }
+    }
+
+    public void init(RedissonClient redissonClient) {
         this.redissonClient = redissonClient;
         // 指定相应的序列化方案
         // 通过反射获取Mapper对象, 增加一些配置, 增强兼容性
@@ -48,7 +67,7 @@ public void init( RedissonClient redissonClient) {
         } catch (Exception e) {
             LOG.error("sa token redis jackson init failed", e);
         }
-        if (Objects.nonNull(this.redissonClient)&&Objects.nonNull(SaStrategy.me.createSession)){
+        if (Objects.nonNull(this.redissonClient) && Objects.nonNull(SaStrategy.me.createSession)) {
             this.isInit = true;
         }