From 2761b0d83e66bd5b2352f754c95c67c61735e77e Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Thu, 15 Mar 2018 09:53:34 +0800 Subject: [PATCH 1/6] merge --- boot-service/src/main/resources/kdniao.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 024bb37f1345abe69394cefdc498d2e6fbbdd7e7 Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Thu, 15 Mar 2018 10:47:57 +0800 Subject: [PATCH 2/6] merge --- .../src/main/java/com/xwbing/service/other/MailService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { From 31c7f0e21cc76e7d2cc3a1a8d3bbf7aea6928551 Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Thu, 15 Mar 2018 11:25:35 +0800 Subject: [PATCH 3/6] merge --- boot-web/pom.xml | 6 ++++++ .../com/xwbing/configuration/ApplicationContextConfig.java | 1 + 2 files changed, 7 insertions(+) diff --git a/boot-web/pom.xml b/boot-web/pom.xml index 7c9b457..e82793a 100644 --- a/boot-web/pom.xml +++ b/boot-web/pom.xml @@ -67,6 +67,12 @@ org.springframework.boot spring-boot-starter-aop + + + org.springframework.boot + spring-boot-configuration-processor + true + boot-web diff --git a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java index f765314..6de89f5 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java @@ -18,6 +18,7 @@ import javax.servlet.Filter; @Configuration//相当于.xml文件中的 //@Import(xxx.class)//用来导入其他配置类 //@ImportResource("classpath:applicationContext.xml")//用来加载其他xml配置文件 +//@ConfigurationProperties(prefix="myProps") //接收application.yml中的myProps下面的所有属性 public class ApplicationContextConfig { /** * encoding编码问题(springBoot默认已经配置好) From 2ba8fa4223804e84331f9f87638f25f18ea890e4 Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Thu, 15 Mar 2018 15:27:42 +0800 Subject: [PATCH 4/6] merge --- boot-service/pom.xml | 3 --- boot-web/pom.xml | 6 ------ .../com/xwbing/configuration/ApplicationContextConfig.java | 1 - pom.xml | 1 - 4 files changed, 11 deletions(-) diff --git a/boot-service/pom.xml b/boot-service/pom.xml index 1e5f19d..c96c57e 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 @@ -87,7 +85,6 @@ org.apache.httpcomponents httpclient - 4.5.1 diff --git a/boot-web/pom.xml b/boot-web/pom.xml index e82793a..7c9b457 100644 --- a/boot-web/pom.xml +++ b/boot-web/pom.xml @@ -67,12 +67,6 @@ org.springframework.boot spring-boot-starter-aop - - - org.springframework.boot - spring-boot-configuration-processor - true - boot-web diff --git a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java index 6de89f5..f765314 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java @@ -18,7 +18,6 @@ import javax.servlet.Filter; @Configuration//相当于.xml文件中的 //@Import(xxx.class)//用来导入其他配置类 //@ImportResource("classpath:applicationContext.xml")//用来加载其他xml配置文件 -//@ConfigurationProperties(prefix="myProps") //接收application.yml中的myProps下面的所有属性 public class ApplicationContextConfig { /** * encoding编码问题(springBoot默认已经配置好) diff --git a/pom.xml b/pom.xml index 87cd1e8..d4924a6 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,6 @@ UTF-8 1.8 1.3.1 - 1.16.16 3.2.1 1.2.20 From ae2cadee37a00df2f0845eb50ec5ed55e3472d16 Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Thu, 15 Mar 2018 16:33:11 +0800 Subject: [PATCH 5/6] merge --- boot-service/pom.xml | 2 +- pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/boot-service/pom.xml b/boot-service/pom.xml index c96c57e..f166b83 100644 --- a/boot-service/pom.xml +++ b/boot-service/pom.xml @@ -68,7 +68,7 @@ org.bouncycastle bcprov-jdk16 - 1.45 + ${rsa.version} diff --git a/pom.xml b/pom.xml index d4924a6..f1fb911 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ 1.3.1 3.2.1 1.2.20 + 1.45 true 2.4.0 From 75059a1b9c48666703ea0cc0e82f8361231ca64b Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Fri, 16 Mar 2018 09:35:51 +0800 Subject: [PATCH 6/6] merge --- boot-service/pom.xml | 3 ++- .../src/main/java/com/xwbing/redis/RedisConfig.java | 2 +- boot-service/src/main/resources/redis.properties | 6 +++--- boot-web/pom.xml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/boot-service/pom.xml b/boot-service/pom.xml index f166b83..d7cc0cf 100644 --- a/boot-service/pom.xml +++ b/boot-service/pom.xml @@ -70,7 +70,7 @@ bcprov-jdk16 ${rsa.version} - + org.apache.poi poi @@ -85,6 +85,7 @@ org.apache.httpcomponents httpclient + 4.5.1 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/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