Merge remote-tracking branch 'origin/master'

boot-service/pom.xml

@@ -42,7 +42,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
         </dependency>
         <!-- 表单校验 -->
         <dependency>
@@ -53,7 +52,6 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>2.7.3</version>
         </dependency>
         <!-- 二维码 -->
         <dependency>
@@ -70,9 +68,9 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk16</artifactId>
-            <version>1.45</version>
+            <version>${rsa.version}</version>
         </dependency>
-        <!-- 引入excel解析jar包 start -->
+        <!-- 解析excel -->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>

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/java/com/xwbing/service/other/MailService.java

@@ -111,7 +111,7 @@ public class MailService {
      * @param to      收件人
      * @param subject 主题
      * @param content 邮件内容，需要包括一个静态资源的id，比如：<img src='cid:rscId01'>
-     * @param rscPath 静态资源路径和文件名
+     * @param rscPath 静态资源路径
      * @param rscId   静态资源id
      */
     public RestMessage sendInlineResourceMail(String to, String subject, String content, String rscPath, String rscId) {

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

@@ -1,6 +1,6 @@
 #---------------快递鸟config----------------
-###------------ID和Key请到官网申请:http://www.kdniao.com/ServiceApply.aspx-------------###
-###------------相关文档:http://www.kdniao.com/documents-------------###
+#------------ID和Key请到官网申请:http://www.kdniao.com/ServiceApply.aspx-------------#
+#------------相关文档:http://www.kdniao.com/documents-------------#
 EBusinessID=1255383
 appKey=94f7286a-8ae5-4394-8809-26dd645e82ca
 reqURL=http://api.kdniao.cc/Ebusiness/EbusinessOrderHandle.aspx

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>

pom.xml

@@ -36,9 +36,9 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <fileUpLoad.version>1.3.1</fileUpLoad.version>
-        <lombok.version>1.16.16</lombok.version>
         <zxing.version>3.2.1</zxing.version>
         <fastjson.veersion>1.2.20</fastjson.veersion>
+        <rsa.version>1.45</rsa.version>
         <!-- 打包跳过单元测试 -->
         <skipTests>true</skipTests>
         <swagger2.version>2.4.0</swagger2.version>