add: 去除配置文件中相关配置

.gitignore

+*.iml
+*.idea
+.settings
+.classpath
+.project
+.DS_Store
+.tmp
+.sass-cache
+.DS_Store*.prefs
+*.class
+*.jsdtscope
+*.launch
+node_modules
+bower_components
+dist
+build
+/log
+/logs
+/src/test/mock/output
+/src/main/webapp/styles/css/**/*.css
+**/target/
+**/src/main/webapp
+/swagger
+**/swagger/
+dep

yanxuan-qc-change-system-assembly/src/main/resources/config/online/application.properties

@@ -11,11 +11,6 @@ dschedule.adminAddresses=http://127.0.0.1:8550/proxy/online.dschedule-admin.serv
 spring.http.multipart.max-file-size=100MB
 spring.http.multipart.max-request-size=100MB
 
-#mysql
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://10.131.73.20:6306/yx_qc_change_system?useUnicode=true&characterEncoding=UTF-8&autoReconnet=true
-spring.datasource.username=yx_qc_change_system
-spring.datasource.password=1f28144c4be7e7a0
 
 #tomcat
 server.tomcat.max-threads=600
@@ -24,23 +19,6 @@ server.tomcat.basedir=/home/logs/access
 server.tomcat.accesslog.enabled=true
 server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %{X-Forwarded-For}i %D %{P_INFO}c  %{Referer}i  %{User-Agent}i  %{Host}i
 
-# mybatis
-mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
-mybatis.configuration.cache-enabled=true
-mybatis.configuration.map-underscore-to-camel-case=true
-
-
-# redis
-spring.redis.password=wrXodjsHEa28
-spring.redis.timeout=20000
-spring.redis.sentinel.master=yx_qc_change_ga_onl
-spring.redis.sentinel.nodes=10.104.3.40:11010,10.104.3.50:11010,10.104.3.60:11010
-spring.redis.pool.max-active=50
-spring.redis.pool.max-idle=20
-spring.redis.pool.max-wait=10000
-spring.redis.host=10.104.3.40
-spring.redis.port=11010
-
 # supplier
 supplier.url=http://127.0.0.1:8550/proxy/online.yanxuan-supplier-ms.service.mailsaas
 

yanxuan-qc-change-system-assembly/src/main/resources/config/regression/application.properties

@@ -11,12 +11,6 @@ dschedule.adminAddresses=http://127.0.0.1:8550/proxy/test.dschedule-admin.servic
 spring.http.multipart.max-file-size=100MB
 spring.http.multipart.max-request-size=100MB
 
-# mysql
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://regression-public-instance-uyogz-21338.rds.cn-east-p1.internal.:5566/yx_qc_change_system?useUnicode=true&characterEncoding=UTF-8&autoReconnet=true
-spring.datasource.username=yx_qc_change_system
-spring.datasource.password=fd929d26963a3187
-
 #tomcat
 server.tomcat.max-threads=600
 server.tomcat.uri-encoding=UTF-8
@@ -24,24 +18,6 @@ server.tomcat.basedir=/home/logs/access
 server.tomcat.accesslog.enabled=true
 server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %{X-Forwarded-For}i %D %{P_INFO}c  %{Referer}i  %{User-Agent}i  %{Host}i
 
-
-# mybatis
-mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
-mybatis.configuration.cache-enabled=true
-mybatis.configuration.map-underscore-to-camel-case=true
-
-
-# redis
-spring.redis.password=
-spring.redis.timeout=20000
-spring.redis.sentinel.master=paas-redis/yx-common-repl-1-reg
-spring.redis.sentinel.nodes=yx-cust23-reg.ncr.cn-east-p1.internal.:32025
-spring.redis.pool.max-active=50
-spring.redis.pool.max-idle=20
-spring.redis.pool.max-wait=10000
-spring.redis.host=yx-cust23-reg.ncr.cn-east-p1.internal.
-spring.redis.port=32025
-
 # supplier
 supplier.url=http://127.0.0.1:8550/proxy/regression.yanxuan-supplier-ms.service.mailsaas
 

yanxuan-qc-change-system-assembly/src/main/resources/config/test/application.properties

@@ -11,11 +11,7 @@ dschedule.adminAddresses=http://127.0.0.1:8550/proxy/test.dschedule-admin.servic
 spring.http.multipart.max-file-size=100MB
 spring.http.multipart.max-request-size=100MB
 
-# mysql
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://10.170.155.148:4306/qc_ecr_system?useUnicode=true&characterEncoding=UTF-8&autoReconnet=true
-spring.datasource.username=qc_ecr_system
-spring.datasource.password=qc_ecr_system
+
 
 #tomcat
 server.tomcat.max-threads=600
@@ -25,23 +21,6 @@ server.tomcat.accesslog.enabled=true
 server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %{X-Forwarded-For}i %D %{P_INFO}c  %{Referer}i  %{User-Agent}i  %{Host}i
 
 
-# mybatis
-mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
-mybatis.configuration.cache-enabled=true
-mybatis.configuration.map-underscore-to-camel-case=true
-
-
-# redis
-spring.redis.password=KX4CRYuA68T2
-spring.redis.timeout=20000
-spring.redis.sentinel.master=yx_common1_repl_test
-spring.redis.sentinel.nodes=10.131.99.201:11030
-spring.redis.pool.max-active=50
-spring.redis.pool.max-idle=20
-spring.redis.pool.max-wait=10000
-spring.redis.host=10.131.99.201
-spring.redis.port=11030
-
 # supplier
 supplier.url=http://127.0.0.1:8550/proxy/test.yanxuan-supplier-ms.service.mailsaas
 

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/config/DrmRedisConfig.java

@@ -39,10 +39,7 @@ public class DrmRedisConfig {
     @Value("${redis.maxIdle:20}")
     private Integer maxIdle;
 
-    @Value("${redis.minIdle:1}")
-    private Integer minIdle;
-
-    @Value("${redis.maxWaitMillis:5000}")
+    @Value("${redis.maxWaitMillis:10000}")
     private Integer maxWaitMillis;
 
 }
\ No newline at end of file

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/config/RedisSentinelConfig.java

 package com.netease.mail.yanxuan.change.dal.config;
 
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -15,10 +14,10 @@ import java.util.Arrays;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+
 /**
  * redis文件配置
  */
-@Slf4j
 @Configuration
 public class RedisSentinelConfig {
 
@@ -32,7 +31,6 @@ public class RedisSentinelConfig {
         redisSentinelConfiguration.setPassword(RedisPassword.of(drmRedisConfig.getPassword()));
         GenericObjectPoolConfig genericObjectPoolConfig = new GenericObjectPoolConfig();
         genericObjectPoolConfig.setMaxIdle(drmRedisConfig.getMaxIdle());
-        genericObjectPoolConfig.setMinIdle(drmRedisConfig.getMinIdle());
         genericObjectPoolConfig.setMaxTotal(drmRedisConfig.getMaxTotal());
         genericObjectPoolConfig.setMaxWaitMillis(drmRedisConfig.getMaxWaitMillis());
         LettucePoolingClientConfiguration lettuceClientConfiguration = LettucePoolingClientConfiguration.builder().poolConfig(genericObjectPoolConfig).build();