merge

boot-service/pom.xml

@@ -70,7 +70,7 @@
             <artifactId>bcprov-jdk16</artifactId>
             <version>${rsa.version}</version>
         </dependency>
-        <!-- 引入excel解析jar包 start -->
+        <!-- 解析excel -->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
@@ -85,6 +85,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
+            <version>4.5.1</version>
         </dependency>
         <!-- servlet -->
         <dependency>

boot-service/src/main/java/com/xwbing/redis/RedisConfig.java

@@ -45,7 +45,7 @@ public class RedisConfig {
     public JedisPool jedisPool() {
         JedisPoolConfig config = jedisPoolConfig();
         JedisPool pool = new JedisPool(config, host, port, timeOut);
-        logger.info("init JedisPool=================");
+        logger.info("init jedisPool=================");
         return pool;
     }
 }

boot-service/src/main/resources/redis.properties

@@ -4,10 +4,10 @@ password:
 timeout: 10000
 #最大连接数
 maxTotal: 8
-#最大空闲数
+#最大空闲连接数
 maxIdle: 8
-#最小空闲数
+#最小空闲连接数
 minIdle: 0
 
-redisCode=springboot_
+redisCode=springboot:
 systemCode=dataCenter_single

boot-web/pom.xml

@@ -56,7 +56,7 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- maven打war包需要  项目部署到外部tomcat -->
+        <!-- maven打war包需要 项目部署到外部tomcat -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>