demo工程注释

This reverts commit 098a20fe429a60a582084ee1abd31b2be012eaa7.

README.md

@@ -13,7 +13,7 @@ parent：版本封装<br/>
 base:功能封装
 
 #### 最新版本
-* yexuejc.springboot.version=1.2.1 <br>
+* yexuejc.springboot.version=1.2.2 <br>
 * yexuejc.base.version=1.3.9
 
 pom.xml

UPDATE.md

@@ -1,6 +1,18 @@
 yexuejc-springboot 更新内容
 -------------------
 
+#### version ：1.2.2
+**time：2019-11-1 13:11:44** <br/>
+**branch：** master    <br/>
+**关联工程：**    <br/>
+```
+springboot-base:1.3.9
+spring-boot-starter-parent:1.5.16.RELEASE
+```
+**update：**     <br/>
+1. redis 配置修改，增加开关，更兼容
+
+#
 #### version ：1.2.1
 **time：2019-7-27 09:39:24** <br/>
 **branch：** master    <br/>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.yexuejc.springboot</groupId>
     <artifactId>yexuejc-springboot-parent</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -306,6 +306,6 @@
 
     <modules>
         <module>yexuejc-springboot-base</module>
-        <module>yexuejc-springboot-example</module>
+        <!--<module>yexuejc-springboot-example</module>-->
     </modules>
 </project>

yexuejc-springboot-base/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yexuejc.springboot</groupId>
         <artifactId>yexuejc-springboot-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <!-- 本地打包：使用相对关联路径 -->
         <!--<relativePath>../../yexuejc</relativePath>-->
     </parent>

yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/autoconfigure/MutiRedisAutoConfiguration.java

@@ -88,6 +88,7 @@ public class MutiRedisAutoConfiguration {
      */
     @Configuration
     @ConditionalOnClass(GenericObjectPool.class)
+    @ConditionalOnProperty(name = "yexuejc.autoconfigure.redis.enable", matchIfMissing = false)
     protected static class RedisConnectionConfiguration {
 
         private final RedisProperties properties;
@@ -288,6 +289,7 @@ public class MutiRedisAutoConfiguration {
      * Standard Redis configuration.
      */
     @Configuration
+    @ConditionalOnProperty(name = "yexuejc.autoconfigure.redis.enable", matchIfMissing = false)
     protected static class RedisConfiguration {
 
         @Primary

yexuejc-springboot-base/src/main/java/com/yexuejc/springboot/base/autoconfigure/WebAutoConfiguration.java

@@ -19,7 +19,6 @@ import com.yexuejc.springboot.base.util.LogUtil;
 import com.yexuejc.springboot.base.util.SSLUtil;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;

yexuejc-springboot-example/springboot-security-login-simple/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.yexuejc.springboot</groupId>
         <artifactId>yexuejc-springboot-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
     <properties>
         <yexuejc.base.version>1.3.9</yexuejc.base.version>

yexuejc-springboot-example/yexuejc-springboot-simple/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.yexuejc.springboot</groupId>
         <artifactId>yexuejc-springboot-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
     <groupId>top.yexuejc</groupId>
     <artifactId>yexuejc-springboot-simple</artifactId>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.yexuejc.springboot</groupId>
             <artifactId>yexuejc-springboot-base</artifactId>
-            <version>1.2.1</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>