Merge remote-tracking branch 'origin/developer' into developer

gic-store-web/pom.xml

@@ -21,6 +21,7 @@
         <libraryVersion>4.0-SNAPSHOT</libraryVersion>
         <!-- api依赖，正式版会在 gic-pom-base 里生成 -->
         <gic-store-api>4.0-SNAPSHOT</gic-store-api>
+        <gic-redis-data>4.0-SNAPSHOT</gic-redis-data>
     </properties>
 
     <dependencies>
@@ -107,6 +108,11 @@
             <artifactId>poi-ooxml</artifactId>
             <version>3.11</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic </groupId>
+            <artifactId>gic-redis-data </artifactId>
+            <version>${gic-redis-data} </version>
+        </dependency>
     </dependencies>
 
     <build>

gic-store-web/src/main/java/com/gic/store/web/Main.java

@@ -3,6 +3,9 @@ package com.gic.store.web;
 import com.gic.dubbo.util.DubboContextUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
+import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ImportResource;
 
@@ -11,12 +14,20 @@ import org.springframework.context.annotation.ImportResource;
  *
  * @author zhurz
  */
-@SpringBootApplication
+@SpringBootApplication(
+        scanBasePackages = "com.gic",
+        exclude = {
+                RedisAutoConfiguration.class,
+                RedisRepositoriesAutoConfiguration.class,
+                QuartzAutoConfiguration.class
+        }
+)
 @ImportResource(value = {
         "classpath*:applicationContext-init.xml",
         "classpath*:dubbo-setting.xml",
         "classpath*:dubbo-gic-store-web.xml",
-        "classpath*:spring-interceptor.xml"
+        "classpath*:spring-interceptor.xml",
+        "classpath*:redis-init.xml"
 })
 public class Main {