upgrade version to 2020.1

houko · Oct 9, 2020 · 31ce288 · 31ce288
1 parent e5865ef
commit 31ce288
Show file tree

Hide file tree

Showing 48 changed files with 181 additions and 359 deletions.
diff --git a/Readme.md b/Readme.md
@@ -59,7 +59,7 @@ http://localhost:808/doc.html bootstrap-ui
 - 2017-09-08 crawler模块(网络爬虫):修复本地文件目录不存在会报错的bug。处理方式为：不存在则自动创建
 - 2017-11-02 开源协议从apache更换到MIT
 - 2017-11-02 添加本地运行方式的说明
-- 2017-11-02 版本更新到2017.2
+- 2017-11-02 版本更新到2020.1
 - 2017-11-02 spring boot版本更新到1.5.8
 - 2017-11-03 添加kotlin环境配置
 - 2017-11-03 按照阿里巴巴编程规范插件P3C优化代码

diff --git a/async/pom.xml b/async/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>xiaomo</artifactId>
  <groupId>info.xiaomo</groupId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
  <dependency>
  <groupId>info.xiaomo</groupId>
  <artifactId>core</artifactId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </dependency>
  </dependencies>
 

diff --git a/async/src/main/resources/config/application.properties b/async/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
 logging.config=classpath:config/logback-dev.xml
 server.port=8080
-server.session.timeout=1800
+
 server.max-http-header-size=20971520
 
 # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>info.xiaomo</groupId>
  <artifactId>xiaomo</artifactId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/crawler/pom.xml b/crawler/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>xiaomo</artifactId>
  <groupId>info.xiaomo</groupId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
  <dependency>
  <groupId>info.xiaomo</groupId>
  <artifactId>core</artifactId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>

diff --git a/crawler/src/main/resources/config/application.properties b/crawler/src/main/resources/config/application.properties
@@ -1,14 +1,13 @@
 logging.config=classpath:config/logback-dev.xml
 server.port=8080
-server.session.timeout=1800
 server.max-http-header-size=20971520
 
 #datasource
 spring.datasource.url=jdbc:mysql://ip/db?characterEncoding=utf8&useSSL=true
 # ?useUnicode=true&amp;characterEncoding=UTF-8
 spring.datasource.username=username
 spring.datasource.password=password
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
 #spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 #spring.jackson.time-zone=GMT+8

diff --git a/freemarker/pom.xml b/freemarker/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>xiaomo</artifactId>
  <groupId>info.xiaomo</groupId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
  <dependency>
  <groupId>info.xiaomo</groupId>
  <artifactId>core</artifactId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>

diff --git a/freemarker/src/main/resources/config/application.properties b/freemarker/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
 logging.config=classpath:config/logback-dev.xml
 server.port=8080
-server.session.timeout=1800
+
 server.max-http-header-size=20971520
 
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

diff --git a/javase/pom.xml b/javase/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>xiaomo</artifactId>
  <groupId>info.xiaomo</groupId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
  <dependency>
  <groupId>info.xiaomo</groupId>
  <artifactId>core</artifactId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>

diff --git a/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java b/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java
@@ -44,15 +44,15 @@ public QuestionController(QuestionService service) {
  * @param id id
  * @return result
  */
- @ApiOperation(value = "查找问题", notes = "查找问题", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "查找问题", notes = "查找问题", httpMethod = "GET")
  @RequestMapping(value = "findById/{id}", method = RequestMethod.GET)
  @ApiImplicitParams({
  @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"),
  })
  public Result findUserById(@PathVariable("id") Long id) {
  QuestionModel questionModel = service.findById(id);
  if (questionModel == null) {
- return new Result(CodeConst.NOT_FOUNT.getResultCode(), CodeConst.NOT_FOUNT.getMessage());
+ return new Result<>(CodeConst.NOT_FOUNT.getResultCode(), CodeConst.NOT_FOUNT.getMessage());
  }
  return new Result<>(questionModel);
  }
@@ -62,7 +62,7 @@ public Result findUserById(@PathVariable("id") Long id) {
  *
  * @return result
  */
- @ApiOperation(value = "添加", notes = "添加", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "添加", notes = "添加", httpMethod = "POST")
  @RequestMapping(value = "findById/{id}", method = RequestMethod.POST)
  public Result addQuestion(@RequestBody QuestionModel questionModel) {
  boolean add = service.add(questionModel);

diff --git a/javase/src/main/resources/config/application.properties b/javase/src/main/resources/config/application.properties
@@ -1,13 +1,12 @@
 logging.config=classpath:config/logback-dev.xml
 server.port=8080
-server.session.timeout=1800
 server.max-http-header-size=20971520
 #datasource
 spring.datasource.url=jdbc:mysql://ip/db?characterEncoding=utf8&useSSL=true
 # ?useUnicode=true&amp;characterEncoding=UTF-8
 spring.datasource.username=xiaomo
 spring.datasource.password=password
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
 #spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 #spring.jackson.time-zone=GMT+8
@@ -23,12 +22,12 @@ spring.redis.host=ip
 spring.redis.port=6379
 spring.redis.password=
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.pool.max-active=8
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.pool.max-wait=-1
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.pool.max-idle=8
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.pool.min-idle=0
+#spring.redis.pool.max-active=8
+## \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+#spring.redis.pool.max-wait=-1
+## \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
+#spring.redis.pool.max-idle=8
+## \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
+#spring.redis.pool.min-idle=0
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
 spring.redis.timeout=0
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>xiaomo</artifactId>
  <groupId>info.xiaomo</groupId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
  <dependency>
  <groupId>info.xiaomo</groupId>
  <artifactId>core</artifactId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>

diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java b/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java
@@ -54,7 +54,7 @@ public Result add(@RequestBody MongoUser user) {
  @RequestMapping(value = "delete/{id}", method = RequestMethod.GET)
  public Result delete(@PathVariable("id") Long id) {
  service.delete(id);
- return new Result(CodeConst.SUCCESS.getResultCode(), CodeConst.SUCCESS.getMessage());
+ return new Result<>(CodeConst.SUCCESS.getResultCode(), CodeConst.SUCCESS.getMessage());
  }
 
 }
diff --git a/mongodb/src/main/resources/config/application.properties b/mongodb/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
 logging.config=classpath:config/logback-dev.xml
 server.port=8080
-server.session.timeout=1800
+
 server.max-http-header-size=20971520
 
 #mongodb

diff --git a/multipleSource/pom.xml b/multipleSource/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>xiaomo</artifactId>
  <groupId>info.xiaomo</groupId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
  <dependency>
  <groupId>info.xiaomo</groupId>
  <artifactId>core</artifactId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>

diff --git a/multipleSource/src/main/resources/config/application.properties b/multipleSource/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
 logging.config=classpath:config/logback-dev.xml
 server.port=8080
-server.session.timeout=1800
+
 server.max-http-header-size=20971520
 
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
@@ -10,13 +10,13 @@ spring.jackson.time-zone=GMT+8
 spring.datasource.primary.url=jdbc:mysql://ip:3306/test1?characterEncoding=utf8&useSSL=true
 spring.datasource.primary.username=\u4F60\u7684\u5E10\u53F7
 spring.datasource.primary.password=\u4F60\u7684\u5BC6\u7801
-spring.datasource.primary.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
 
 #database2
 spring.datasource.secondary.url=jdbc:mysql://ip:3306/test2?characterEncoding=utf8&useSSL=true
 spring.datasource.secondary.username=\u5E10\u53F7
 spring.datasource.secondary.password=\u4F60\u7684\u5BC6\u7801
-spring.datasource.secondary.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver
 
 
 

diff --git a/mybatis/pom.xml b/mybatis/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>xiaomo</artifactId>
  <groupId>info.xiaomo</groupId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
  <dependency>
  <groupId>info.xiaomo</groupId>
  <artifactId>core</artifactId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </dependency>
  <dependency>
  <groupId>org.mybatis.spring.boot</groupId>

diff --git a/mybatis/src/main/resources/config/application.properties b/mybatis/src/main/resources/config/application.properties
@@ -1,6 +1,6 @@
 logging.config=classpath:config/logback-dev.xml
 server.port=8080
-server.session.timeout=1800
+
 server.max-http-header-size=20971520
 
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
@@ -11,7 +11,7 @@ spring.jackson.time-zone=GMT+8
 spring.datasource.url=jdbc:mysql://ip:3306/db?characterEncoding=utf8&useSSL=true
 spring.datasource.username=username
 spring.datasource.password=password
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 
 
diff --git a/order/pom.xml b/order/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>xiaomo</artifactId>
  <groupId>info.xiaomo</groupId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
  <dependency>
  <groupId>info.xiaomo</groupId>
  <artifactId>core</artifactId>
- <version>2017.2</version>
+ <version>2020.1</version>
  </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>

diff --git a/order/src/main/java/info/xiaomo/order/controller/OrderController.java b/order/src/main/java/info/xiaomo/order/controller/OrderController.java
@@ -28,7 +28,7 @@ public OrderController(OrderService orderService) {
 
 
  @RequestMapping(value = "forbid/{id}", method = RequestMethod.GET)
- @ApiOperation(value = "封号", notes = "根据传入的id对修改对应帐号状态", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @ApiOperation(value = "封号", notes = "根据传入的id对修改对应帐号状态", httpMethod = "GET")
  @ApiImplicitParams({
  @ApiImplicitParam(name = "id", value = "后台用户唯一id", required = true, dataType = "Long", paramType = "path")
  })