feat: support the config of "spring-redis"

arex-storage-web-api/src/main/java/com/arextest/storage/beans/RedisAutoConfiguration.java

@@ -3,38 +3,69 @@
 import com.arextest.common.cache.CacheProvider;
 import com.arextest.common.cache.DefaultRedisCacheProvider;
 import com.arextest.common.cache.SentinelRedisCacheProvider;
+import com.arextest.common.cache.redistemplate.RedisTemplateCacheProvider;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.RedisSerializer;
 
 /**
  * @author wildeslam.
  * @create 2024/2/7 14:29
  */
 
 @Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties({StorageConfigurationProperties.class})
 @Slf4j
 public class RedisAutoConfiguration {
 
-  private final StorageConfigurationProperties properties;
+  @Value("${arex.redis.uri:}")
+  private String redisUri;
+
+  @Value("${arex.redis.sentinelUrl:}")
+  private String sentinelUrl;
 
-  public RedisAutoConfiguration(StorageConfigurationProperties configurationProperties) {
-    properties = configurationProperties;
-  }
 
   @Bean
   @ConditionalOnMissingBean(CacheProvider.class)
+  @ConditionalOnExpression("!'${arex.redis.uri:}'.isEmpty() or !'${arex.redis.sentinelUrl:}'.isEmpty()")
   public CacheProvider cacheProvider() {
-    if (StringUtils.isNotEmpty(properties.getCache().getSentinelUrl())) {
-      return new SentinelRedisCacheProvider(properties.getCache().getSentinelUrl());
+    if (StringUtils.isNotEmpty(sentinelUrl)) {
+      return new SentinelRedisCacheProvider(sentinelUrl);
     }
-    if (StringUtils.isEmpty(properties.getCache().getUri())) {
-      return new DefaultRedisCacheProvider();
-    }
-    return new DefaultRedisCacheProvider(properties.getCache().getUri());
+    return new DefaultRedisCacheProvider(redisUri);
+  }
+
+  @Bean
+  @ConditionalOnExpression("!'${arex.redis.uri:}'.isEmpty() or !'${arex.redis.sentinelUrl:}'.isEmpty()")
+  public RedissonClient redissonClient(CacheProvider cacheProvider) {
+    return cacheProvider.getRedissionClient();
   }
+
+  @Bean
+  @ConditionalOnExpression("'${arex.redis.uri:}'.isEmpty() and '${arex.redis.sentinelUrl:}'.isEmpty()")
+  public RedisTemplate<byte[], byte[]> redisTemplate(
+      RedisConnectionFactory redisConnectionFactory) {
+    RedisTemplate<byte[], byte[]> template = new RedisTemplate<>();
+    template.setConnectionFactory(redisConnectionFactory);
+    template.setKeySerializer(RedisSerializer.byteArray());
+    template.setValueSerializer(RedisSerializer.byteArray());
+    return template;
+  }
+
+  @Bean
+  @ConditionalOnMissingBean(CacheProvider.class)
+  @ConditionalOnExpression("'${arex.redis.uri:}'.isEmpty() and '${arex.redis.sentinelUrl:}'.isEmpty()")
+  public CacheProvider redisCacheProvider(RedisTemplate redisTemplate,
+      RedissonClient redissonClient) {
+    return new RedisTemplateCacheProvider(redisTemplate, redissonClient);
+  }
+
+
 }

arex-storage-web-api/src/main/java/com/arextest/storage/beans/StorageConfigurationProperties.java

@@ -1,3 +1,5 @@
+
+
 package com.arextest.storage.beans;
 
 import com.arextest.model.mock.MockCategoryType;
@@ -15,7 +17,6 @@
 public class StorageConfigurationProperties {
 
   private String mongodbUri;
-  private Cache cache;
   private Set<MockCategoryType> categoryTypes;
   // @Value("${arex.storage.enable-auto-discovery-entry-point:true}")
   private boolean enableAutoDiscoveryEntryPoint = true;
@@ -25,13 +26,4 @@ public class StorageConfigurationProperties {
   private Long defaultExpirationDuration;
   private int allowReRunDays;
 
-  @Getter
-  @Setter
-  static class Cache {
-
-    private String uri;
-    private String sentinelUrl;
-    private long expiredSeconds = 7200;
-  }
-
 }

arex-storage-web-api/src/main/resources/application-dev.yaml

@@ -4,10 +4,8 @@ logging:
   config: classpath:log4j2-dev.xml
 arex:
   storage:
-    cache:
-      uri: redis://10.118.1.217:6379/
     enableDiscoveryEntryPoint: true
-    mongodbUri: mongodb://arex:[email protected]:27017/arex_storage_db
+    mongodbUri: mongodb://arex:[email protected]:37017/arex_storage_db
     recordEnv: TEST
     expirationDurationMap:
       ConfigFile: 3456000000
@@ -16,8 +14,13 @@ arex:
   api:
     config:
       agent:
-        url: http://10.118.1.217:8090
+        url: http://10.118.1.217:18090
 #    categoryTypes:
 #      - name: Hi
 #        entryPoint: true
-#        skipComparison: true
+#        skipComparison: true
+
+spring:
+  redis:
+    host: 10.118.1.217
+    port: 16379

arex-storage-web-api/src/main/resources/application-prod.yaml

@@ -1,8 +1,5 @@
 arex:
   storage:
-    cache:
-      uri: ${arex.redis.uri:redis://redis:6379/}
-      sentinelUrl: ${arex.redis.sentinelUrl:}
     enableDiscoveryEntryPoint: true
     mongodbUri: ${arex.mongo.uri:mongodb://arex:password@mongodb:27017/arex_storage_db}
     recordEnv: TEST
@@ -17,4 +14,9 @@ arex:
 #    categoryTypes:
 #      - name: Hi
 #        entryPoint: true
-#        skipComparison: true
+#        skipComparison: true
+
+spring:
+  redis:
+    host: redis
+    port: 6379

pom.xml

@@ -188,7 +188,7 @@
       <dependency>
         <artifactId>arex-extension</artifactId>
         <groupId>com.arextest</groupId>
-        <version>0.0.1</version>
+        <version>0.0.3</version>
       </dependency>
       <dependency>
         <artifactId>compare-sdk</artifactId>
@@ -217,6 +217,11 @@
         <artifactId>jsqlparser</artifactId>
         <version>${jsqlparser.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.redisson</groupId>
+        <artifactId>redisson</artifactId>
+        <version>${reddison.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <description>Arex-storage is used for data storage.</description>
@@ -422,7 +427,7 @@
   </profiles>
 
   <properties>
-    <revision>1.2.3</revision>
+    <revision>1.2.4</revision>
     <commons-lang3.version>3.3.2</commons-lang3.version>
     <java.version>1.8</java.version>
 
@@ -444,7 +449,8 @@
     </sonar.exclusions>
     <!-- Users could specify this property as true to skip the deploy process -->
     <spring.boot.version>2.7.18</spring.boot.version>
-    <arex-common.version>0.1.27</arex-common.version>
+    <arex-common.version>0.1.28</arex-common.version>
+    <reddison.version>3.20.1</reddison.version>
   </properties>
   <scm>
     <connection>scm:git:git://github.com/arextest/arex-storage.git</connection>