完善warp工具，去除api-wrap-boot中的redis依赖

Author: slacrey

README.md

@@ -1,5 +1,8 @@
 # 服务端安全签名验签
 
+## chang list
+- api-wrap-boot去除redis依赖
+
 ## 引入jar包
 ### gradle
 ```
@@ -103,11 +106,15 @@ wrapStore.putSecret(appKey, appSecret);
 api.wrap.secret=testjjhdsa
 # 单位秒，请求时间和服务器时间不能超过300秒
 api.wrap.legal-time=300
+# 若没有redis配置，wrapStore为本地存储
+# 若配置了redis，则wrapStore为redis存储
 #===========api wrap redis=============
 spring.redis.host=localhost
 spring.redis.port=6379
 spring.redis.database=0
 ```
+- 若没有redis配置，wrapStore为本地存储
+- 若配置了redis，则wrapStore为redis存储
 
 # 客户端辅助签名工具
 

api-wrap-boot/pom.xml

@@ -31,6 +31,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

api-wrap-boot/src/main/java/com/seelyn/apiwrap/ApiWrapAutoConfiguration.java

@@ -4,15 +4,15 @@
 import com.seelyn.apiwrap.store.LocalWrapStore;
 import com.seelyn.apiwrap.store.RedisWrapStore;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
 /**
@@ -36,32 +36,6 @@ public ApiWrapAspect apiWrapAspect() {
         return new ApiWrapAspect();
     }
 
-    /**
-     * API包裹存储
-     *
-     * @param apiWrapProperties   配置
-     * @param stringRedisTemplate redis
-     * @return 签名验签处理服务
-     */
-    @Bean
-    @ConditionalOnBean(value = StringRedisTemplate.class)
-    @ConditionalOnMissingBean
-    public WrapStore redisWrapStore(@Autowired ApiWrapProperties apiWrapProperties,
-                                    @Autowired StringRedisTemplate stringRedisTemplate) {
-
-        return new RedisWrapStore(apiWrapProperties, stringRedisTemplate);
-    }
-
-    /**
-     * @param apiWrapProperties 配置
-     * @return
-     */
-    @Bean
-    @ConditionalOnMissingBean(value = {RedisTemplate.class, WrapStore.class})
-    public WrapStore localWrapStore(@Autowired ApiWrapProperties apiWrapProperties) {
-
-        return new LocalWrapStore(apiWrapProperties);
-    }
 
     /**
      * 包裹通过
@@ -71,7 +45,6 @@ public WrapStore localWrapStore(@Autowired ApiWrapProperties apiWrapProperties)
      * @return 签名验签处理
      */
     @Bean
-    @ConditionalOnMissingBean(value = {WrapHandler.class})
     public WrapHandler defaultWrapHandler(@Autowired ApiWrapProperties apiWrapProperties,
                                           @Autowired WrapStore wrapStore) {
 
@@ -88,4 +61,38 @@ public WrapBeanFactoryUtils wrapBeanFactoryUtils() {
         return new WrapBeanFactoryUtils();
     }
 
+    /**
+     * @param apiWrapProperties 配置
+     * @return
+     */
+    @Bean
+    @ConditionalOnMissingClass(value = {"org.springframework.data.redis.core.StringRedisTemplate"})
+    @ConditionalOnMissingBean
+    public WrapStore localWrapStore(@Autowired ApiWrapProperties apiWrapProperties) {
+
+        return new LocalWrapStore(apiWrapProperties);
+    }
+
+    @Configuration
+    @ConditionalOnClass(value = StringRedisTemplate.class)
+    static class RedisWrapStoreConfiguration {
+
+        /**
+         * API包裹存储
+         *
+         * @param apiWrapProperties   配置
+         * @param stringRedisTemplate redis
+         * @return 签名验签处理服务
+         */
+        @Bean
+        @ConditionalOnMissingBean
+        public WrapStore redisWrapStore(@Autowired ApiWrapProperties apiWrapProperties,
+                                        @Autowired StringRedisTemplate stringRedisTemplate) {
+
+            return new RedisWrapStore(apiWrapProperties, stringRedisTemplate);
+        }
+
+
+    }
+
 }

api-wrap-test/pom.xml

@@ -31,6 +31,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.69</version>
+        </dependency>
     </dependencies>
 
     <build>

api-wrap-test/src/main/java/com/parsechina/apiwarp/ApiWrapApplication.java

@@ -1,15 +1,25 @@
 package com.parsechina.apiwarp;
 
+import com.seelyn.apiwrap.WrapStore;
 import com.seelyn.apiwrap.annotation.EnableApiWrap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @EnableApiWrap
 @SpringBootApplication
-public class ApiWrapApplication {
+public class ApiWrapApplication implements CommandLineRunner {
 
     public static void main(String[] args) {
         SpringApplication.run(ApiWrapApplication.class, args);
     }
 
+    @Autowired
+    private WrapStore wrapStore;
+
+    @Override
+    public void run(String... args) throws Exception {
+        wrapStore.putSecret("eqxiu", "eqxiu");
+    }
 }

api-wrap-test/src/test/java/com/seelyn/apiwrap/utils/WrapUtilsTest.java

@@ -1,5 +1,6 @@
 package com.seelyn.apiwrap.utils;
 
+import com.alibaba.fastjson.JSON;
 import com.parsechina.apiwarp.web.DefaultWrapData;
 import com.seelyn.apiwrap.WrapRequest;
 import com.seelyn.apiwrap.client.WrapClient;
@@ -10,8 +11,8 @@ public class WrapUtilsTest {
     public void beanToMap() {
         DefaultWrapData wrapData = new DefaultWrapData();
         wrapData.setUrl("http://www.baidu.com");
-        WrapClient wrapClient = WrapClient.create("123", "123");
+        WrapClient wrapClient = WrapClient.create("eqxiu", "eqxiu");
         WrapRequest<DefaultWrapData> wrapDataWrapRequest = wrapClient.wrap(wrapData);
-
+        System.out.println(JSON.toJSONString(wrapDataWrapRequest));
     }
 }