upgrade version to 2020.1

Author: houko

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优化代码

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>
 

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

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>
 

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>

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&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

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>

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

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>

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);