Skip to content

Commit 31ce288

Browse files
author
houko
committed
upgrade version to 2020.1
1 parent e5865ef commit 31ce288

File tree

48 files changed

+181
-359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+181
-359
lines changed

‎Readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ http://localhost:808/doc.html bootstrap-ui
5959
- 2017-09-08 crawler模块(网络爬虫):修复本地文件目录不存在会报错的bug。处理方式为：不存在则自动创建
6060
- 2017-11-02 开源协议从apache更换到MIT
6161
- 2017-11-02 添加本地运行方式的说明
62-
- 2017-11-02 版本更新到2017.2
62+
- 2017-11-02 版本更新到2020.1
6363
- 2017-11-02 spring boot版本更新到1.5.8
6464
- 2017-11-03 添加kotlin环境配置
6565
- 2017-11-03 按照阿里巴巴编程规范插件P3C优化代码

‎async/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>xiaomo</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>2017.2</version>
8+
<version>2020.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>info.xiaomo</groupId>
1616
<artifactId>core</artifactId>
17-
<version>2017.2</version>
17+
<version>2020.1</version>
1818
</dependency>
1919
</dependencies>
2020

‎async/src/main/resources/config/application.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=8080
3-
server.session.timeout=1800
3+
44
server.max-http-header-size=20971520
55

66
# \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4

‎core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>info.xiaomo</groupId>
77
<artifactId>xiaomo</artifactId>
8-
<version>2017.2</version>
8+
<version>2020.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎crawler/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>xiaomo</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>2017.2</version>
8+
<version>2020.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>info.xiaomo</groupId>
1717
<artifactId>core</artifactId>
18-
<version>2017.2</version>
18+
<version>2020.1</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.springframework.boot</groupId>

‎crawler/src/main/resources/config/application.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=8080
3-
server.session.timeout=1800
43
server.max-http-header-size=20971520
54

65
#datasource
76
spring.datasource.url=jdbc:mysql://ip/db?characterEncoding=utf8&useSSL=true
87
# ?useUnicode=true&amp;characterEncoding=UTF-8
98
spring.datasource.username=username
109
spring.datasource.password=password
11-
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
10+
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
1211
# \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
1312
#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
1413
#spring.jackson.time-zone=GMT+8

‎freemarker/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>xiaomo</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>2017.2</version>
8+
<version>2020.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>info.xiaomo</groupId>
1616
<artifactId>core</artifactId>
17-
<version>2017.2</version>
17+
<version>2020.1</version>
1818
</dependency>
1919
<dependency>
2020
<groupId>org.springframework.boot</groupId>

‎freemarker/src/main/resources/config/application.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=8080
3-
server.session.timeout=1800
3+
44
server.max-http-header-size=20971520
55

66
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

‎javase/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>xiaomo</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>2017.2</version>
8+
<version>2020.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>info.xiaomo</groupId>
1717
<artifactId>core</artifactId>
18-
<version>2017.2</version>
18+
<version>2020.1</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.springframework.boot</groupId>

‎javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ public QuestionController(QuestionService service) {
4444
* @param id id
4545
* @return result
4646
*/
47-
@ApiOperation(value = "查找问题", notes = "查找问题", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
47+
@ApiOperation(value = "查找问题", notes = "查找问题", httpMethod = "GET")
4848
@RequestMapping(value = "findById/{id}", method = RequestMethod.GET)
4949
@ApiImplicitParams({
5050
@ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"),
5151
})
5252
public Result findUserById(@PathVariable("id") Long id) {
5353
QuestionModel questionModel = service.findById(id);
5454
if (questionModel == null) {
55-
return new Result(CodeConst.NOT_FOUNT.getResultCode(), CodeConst.NOT_FOUNT.getMessage());
55+
return new Result<>(CodeConst.NOT_FOUNT.getResultCode(), CodeConst.NOT_FOUNT.getMessage());
5656
}
5757
return new Result<>(questionModel);
5858
}
@@ -62,7 +62,7 @@ public Result findUserById(@PathVariable("id") Long id) {
6262
*
6363
* @return result
6464
*/
65-
@ApiOperation(value = "添加", notes = "添加", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
65+
@ApiOperation(value = "添加", notes = "添加", httpMethod = "POST")
6666
@RequestMapping(value = "findById/{id}", method = RequestMethod.POST)
6767
public Result addQuestion(@RequestBody QuestionModel questionModel) {
6868
boolean add = service.add(questionModel);

‎javase/src/main/resources/config/application.properties

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=8080
3-
server.session.timeout=1800
43
server.max-http-header-size=20971520
54
#datasource
65
spring.datasource.url=jdbc:mysql://ip/db?characterEncoding=utf8&useSSL=true
76
# ?useUnicode=true&amp;characterEncoding=UTF-8
87
spring.datasource.username=xiaomo
98
spring.datasource.password=password
10-
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
9+
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
1110
# \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
1211
#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
1312
#spring.jackson.time-zone=GMT+8
@@ -23,12 +22,12 @@ spring.redis.host=ip
2322
spring.redis.port=6379
2423
spring.redis.password=
2524
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
26-
spring.redis.pool.max-active=8
27-
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
28-
spring.redis.pool.max-wait=-1
29-
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
30-
spring.redis.pool.max-idle=8
31-
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
32-
spring.redis.pool.min-idle=0
25+
#spring.redis.pool.max-active=8
26+
## \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
27+
#spring.redis.pool.max-wait=-1
28+
## \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
29+
#spring.redis.pool.max-idle=8
30+
## \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
31+
#spring.redis.pool.min-idle=0
3332
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
3433
spring.redis.timeout=0

‎mongodb/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>xiaomo</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>2017.2</version>
8+
<version>2020.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>info.xiaomo</groupId>
1616
<artifactId>core</artifactId>
17-
<version>2017.2</version>
17+
<version>2020.1</version>
1818
</dependency>
1919
<dependency>
2020
<groupId>org.springframework.boot</groupId>

‎mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public Result add(@RequestBody MongoUser user) {
5454
@RequestMapping(value = "delete/{id}", method = RequestMethod.GET)
5555
public Result delete(@PathVariable("id") Long id) {
5656
service.delete(id);
57-
return new Result(CodeConst.SUCCESS.getResultCode(), CodeConst.SUCCESS.getMessage());
57+
return new Result<>(CodeConst.SUCCESS.getResultCode(), CodeConst.SUCCESS.getMessage());
5858
}
5959

6060
}

‎mongodb/src/main/resources/config/application.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=8080
3-
server.session.timeout=1800
3+
44
server.max-http-header-size=20971520
55

66
#mongodb

‎multipleSource/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>xiaomo</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>2017.2</version>
8+
<version>2020.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>info.xiaomo</groupId>
1717
<artifactId>core</artifactId>
18-
<version>2017.2</version>
18+
<version>2020.1</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.springframework.boot</groupId>

‎multipleSource/src/main/resources/config/application.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=8080
3-
server.session.timeout=1800
3+
44
server.max-http-header-size=20971520
55

66
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
@@ -10,13 +10,13 @@ spring.jackson.time-zone=GMT+8
1010
spring.datasource.primary.url=jdbc:mysql://ip:3306/test1?characterEncoding=utf8&useSSL=true
1111
spring.datasource.primary.username=\u4F60\u7684\u5E10\u53F7
1212
spring.datasource.primary.password=\u4F60\u7684\u5BC6\u7801
13-
spring.datasource.primary.driver-class-name=com.mysql.jdbc.Driver
13+
spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
1414

1515
#database2
1616
spring.datasource.secondary.url=jdbc:mysql://ip:3306/test2?characterEncoding=utf8&useSSL=true
1717
spring.datasource.secondary.username=\u5E10\u53F7
1818
spring.datasource.secondary.password=\u4F60\u7684\u5BC6\u7801
19-
spring.datasource.secondary.driver-class-name=com.mysql.jdbc.Driver
19+
spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver
2020

2121

2222

‎mybatis/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>xiaomo</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>2017.2</version>
8+
<version>2020.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>info.xiaomo</groupId>
1717
<artifactId>core</artifactId>
18-
<version>2017.2</version>
18+
<version>2020.1</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.mybatis.spring.boot</groupId>

‎mybatis/src/main/resources/config/application.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=8080
3-
server.session.timeout=1800
3+
44
server.max-http-header-size=20971520
55

66
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
@@ -11,7 +11,7 @@ spring.jackson.time-zone=GMT+8
1111
spring.datasource.url=jdbc:mysql://ip:3306/db?characterEncoding=utf8&useSSL=true
1212
spring.datasource.username=username
1313
spring.datasource.password=password
14-
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
14+
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
1515

1616

1717

‎order/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>xiaomo</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>2017.2</version>
8+
<version>2020.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>info.xiaomo</groupId>
1616
<artifactId>core</artifactId>
17-
<version>2017.2</version>
17+
<version>2020.1</version>
1818
</dependency>
1919
<dependency>
2020
<groupId>org.springframework.boot</groupId>

‎order/src/main/java/info/xiaomo/order/controller/OrderController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public OrderController(OrderService orderService) {
2828

2929

3030
@RequestMapping(value = "forbid/{id}", method = RequestMethod.GET)
31-
@ApiOperation(value = "封号", notes = "根据传入的id对修改对应帐号状态", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
31+
@ApiOperation(value = "封号", notes = "根据传入的id对修改对应帐号状态", httpMethod = "GET")
3232
@ApiImplicitParams({
3333
@ApiImplicitParam(name = "id", value = "后台用户唯一id", required = true, dataType = "Long", paramType = "path")
3434
})

0 commit comments

Comments
 (0)