demo工程注释

This reverts commit 098a20fe42.

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-base/src/test/resources/application.properties

@@ -5,28 +5,46 @@ spring.application.name=@pom.artifactId@
 logging.level.root=info
 logging.path=/logs/yexuejc-springboot-parent
 
-
+#========================================================================================================================
+#========================================================================================================================
+#核心
+#开启功能 redis webmvc
+yexuejc.autoconfigure.redis.enable=true
+#webmvc 包含以下功能
+yexuejc.autoconfigure.webmvc.enable=true
+#全局异常处理
+yexuejc.ssl-ignore.enable=true
+#开启HTTPS（SSL）请求证书验证忽略
+yexuejc.global.exception.enable=true
+#开启校验过滤器，目前校验HTTP Header是否符合规范
+yexuejc.web.validation-filter.enable=true
+# 拦截类型（请求路径）：0忽略模式，默认拦截全部；1拦截模式，默认一个都不拦截
+#yexuejc.http.filter=0
 yexuejc.http.filter.type=1
+#忽略路径：示例放开swagger
+#yexuejc.http.filter.ignored=/,/swagger/**,/error,/v2/api-docs,/webjars/**
+#========================================================================================================================
+#========================================================================================================================
 
 
 yexuejc.http.encrypt.encrypt=true
 yexuejc.http.encrypt.decrypt=true
-#<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Կ<EFBFBD><EFBFBD>ʽ
+#配置密钥方式
 #yexuejc.http.encrypt.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAiSo5blJ9-QJ0_QElcy5AaRTq-3oO4lJ8PvIOIt-Xr5SUFODVj3DUbiy6_0bxQYO3NiYHlXPb37UVV3jjlXJsXwIDAQABAkBE0WOJH2hGs93gRl_0vwLf9ffDfkTTdlER_73p70aad3QZRslEkinQH7G5aE_DgBm5m72TCeH-PD2FZ2lwtavBAiEAvnRown5Lpqbl0tN_OUxr_e1u9d_-8dNL_JEETO7BZCECIQC4XtY-18j0bVVLxaXPjKQ00D59yntwObihDNyRK0nAfwIgHPHEGgrnpGQo-Wl7JFIg925mNqfcLxRVsAS6CpcefQECIQCUsLdsmy6QIhTmNRJSXoSXq1KatE_05DhIekzwLs8eFQIgfMawMiu52ZxBI5_pZ7ancQZ6Dsxl45utFqJShzV1pio
 #yexuejc.http.encrypt.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAIkqOW5SffkCdP0BJXMuQGkU6vt6DuJSfD7yDiLfl6-UlBTg1Y9w1G4suv9G8UGDtzYmB5Vz29-1FVd445VybF8CAwEAAQ
-#<EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD>鷽ʽ
+#配置证书方式
 yexuejc.http.encrypt.private-key-path=/lgfishing.keystore
 yexuejc.http.encrypt.private-alias=lgfishing
 yexuejc.http.encrypt.private-pwd=lgfishing2018
 
 
-#<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+#编码
 spring.http.encoding.force=true
 spring.http.encoding.charset=UTF-8
 spring.http.encoding.enabled=true
 server.tomcat.uri-encoding=UTF-8
 
-#<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>HTTPS<EFBFBD><EFBFBD>SSL<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD><EFBFBD>ԣ<EFBFBD>Ĭ<EFBFBD><EFBFBD>false
+#是否开启HTTPS（SSL）请求证书验证忽略：默认false
 yexuejc.enable.ssl-ignore=true
 
 
@@ -48,9 +66,9 @@ yexuejc.alibaba.oss.bucket=guansichou
 
 
 #========================================================================================================================
-# security<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+# security相关
 #reids
-#<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD><EFBFBD>redis<EFBFBD><EFBFBD>db0Ĭ<EFBFBD>Ͽ<EFBFBD><EFBFBD><EFBFBD>
+#开启指定redis库db0默认开启
 yexuejc.redis.db1=true
 spring.redis.jedis.pool.max-active=100
 spring.redis.jedis.pool.max-idle=10
@@ -75,19 +93,19 @@ spring.datasource.data=classpath:db/data.sql
 #========================================================================================================================
 #mybatis-plus
 mybatis-plus.mapper-locations=classpath*:mapper/*.xml
-#ʵ<EFBFBD><EFBFBD>ɨ<EFBFBD>裬<EFBFBD><EFBFBD><EFBFBD><EFBFBD>package<EFBFBD>ö<EFBFBD><EFBFBD>Ż<EFBFBD><EFBFBD>߷ֺŷָ<EFBFBD>
+#实体扫描，多个package用逗号或者分号分隔
 mybatis-plus.type-aliases-package=com.yexuejc.springboot.base.security.domain
-#<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0:"<22><><EFBFBD>ݿ<EFBFBD>ID<49><44><EFBFBD><EFBFBD>", 1:"<22>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>ID",2:"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊδ<CEAA><CEB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", 3:"ȫ<EFBFBD><EFBFBD>ΨһID UUID",4:ȫ<EFBFBD><EFBFBD>ΨһID (UUID),5:<EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>ȫ<EFBFBD><EFBFBD>ΨһID (idWorker <EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ);
+#主键类型0:"数据库ID自增", 1:"用户输入ID",2:"该类型为未设置主键类型", 3:"全局唯一ID UUID",4:全局唯一ID (UUID),5:字符串全局唯一ID (idWorker 的字符串表示);
 mybatis-plus.global-config.db-config.id-type=uuid
 mybatis-plus.global-config.db-config.db-type=POSTGRE_SQL
-#<EFBFBD>ֶβ<EFBFBD><EFBFBD><EFBFBD> 0:"<22><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>",1:"<EFBFBD><EFBFBD> NULL <EFBFBD>ж<EFBFBD>"),2:"<EFBFBD>ǿ<EFBFBD><EFBFBD>ж<EFBFBD>"
+#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
 mybatis-plus.global-config.db-config.field-strategy=not_empty
-#<EFBFBD>շ<EFBFBD><EFBFBD>»<EFBFBD><EFBFBD><EFBFBD>ת<EFBFBD><EFBFBD>
+#驼峰下划线转换
 mybatis-plus.global-config.db-config.column-underline=true
-#<EFBFBD>߼<EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD>
+#逻辑删除配置（下面3个配置）
 mybatis-plus.global-config.db-config.logic-delete-value=true
 mybatis-plus.global-config.db-config.logic-not-delete-value=false
-#<EFBFBD><EFBFBD><EFBFBD>÷<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>(column<6D>»<EFBFBD><C2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>&&<26><><EFBFBD><EFBFBD>javaʵ<61><CAB5><EFBFBD><EFBFBD><EFBFBD>շ<EFBFBD><D5B7><EFBFBD><EFBFBD><EFBFBD>)<29><><EFBFBD>Զ<EFBFBD>ƥ<EFBFBD><C6A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>as<61><73>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>SQL<51><4C>Ҫдas<61><73> select user_id as userId<EFBFBD><EFBFBD>
+#配置返回数据库(column下划线命名&&返回java实体是驼峰命名)，自动匹配无需as（没开启这个，SQL需要写as： select user_id as userId）
 mybatis-plus.configuration.map-underscore-to-camel-case=true
 mybatis-plus.configuration.cache-enabled=false
 #========================================================================================================================

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>