diff --git a/boot-service/pom.xml b/boot-service/pom.xml
index 1e5f19d..d7cc0cf 100644
--- a/boot-service/pom.xml
+++ b/boot-service/pom.xml
@@ -42,7 +42,6 @@
org.projectlombok
lombok
- ${lombok.version}
@@ -53,7 +52,6 @@
redis.clients
jedis
- 2.7.3
@@ -70,9 +68,9 @@
org.bouncycastle
bcprov-jdk16
- 1.45
+ ${rsa.version}
-
+
org.apache.poi
poi
diff --git a/boot-service/src/main/java/com/xwbing/redis/RedisConfig.java b/boot-service/src/main/java/com/xwbing/redis/RedisConfig.java
index cb61f1b..cf66207 100644
--- a/boot-service/src/main/java/com/xwbing/redis/RedisConfig.java
+++ b/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;
}
}
diff --git a/boot-service/src/main/java/com/xwbing/service/other/MailService.java b/boot-service/src/main/java/com/xwbing/service/other/MailService.java
index 1695c7e..3786b87 100644
--- a/boot-service/src/main/java/com/xwbing/service/other/MailService.java
+++ b/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,比如:
- * @param rscPath 静态资源路径和文件名
+ * @param rscPath 静态资源路径
* @param rscId 静态资源id
*/
public RestMessage sendInlineResourceMail(String to, String subject, String content, String rscPath, String rscId) {
diff --git a/boot-service/src/main/resources/kdniao.properties b/boot-service/src/main/resources/kdniao.properties
index 5cbbf76..f389072 100644
--- a/boot-service/src/main/resources/kdniao.properties
+++ b/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
diff --git a/boot-service/src/main/resources/redis.properties b/boot-service/src/main/resources/redis.properties
index 368d9dc..aec9e84 100644
--- a/boot-service/src/main/resources/redis.properties
+++ b/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
\ No newline at end of file
diff --git a/boot-web/pom.xml b/boot-web/pom.xml
index 7c9b457..acd7420 100644
--- a/boot-web/pom.xml
+++ b/boot-web/pom.xml
@@ -56,7 +56,7 @@
spring-boot-starter-test
test
-
+
org.springframework.boot
spring-boot-starter-tomcat
diff --git a/pom.xml b/pom.xml
index 87cd1e8..f1fb911 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,9 +36,9 @@
UTF-8
1.8
1.3.1
- 1.16.16
3.2.1
1.2.20
+ 1.45
true
2.4.0