升级SpringBoot2.1

Author: dolyw

README.md

@@ -1,6 +1,6 @@
-# SpringBootGenerator(SpringBoot2.0版)
+# SpringBootGenerator(SpringBoot2.1版)
 
-> SpringBoot2.0版(SpringBoot1.5版切换分支(springboot1.5))
+> SpringBoot2.1版(SpringBoot1.5版切换分支(springboot1.5))
 > 参考:[https://github.com/lihengming/spring-boot-api-project-seed](https://github.com/lihengming/spring-boot-api-project-seed)
 
 ### 项目相关
@@ -37,6 +37,12 @@ SpringBoot + Mybatis + PageHelper + 通用Mapper
 1. 可以自行修改src\test\resources\template下的模板
 2. 修改src\test\java\com\example\generator\CodeGenerator.java下的CONTROLLER_TYPE可以生成REST或者POST的Controller模板
 
+#### SpringBoot1.5升级2.1
+
+* SpringBoot官方文档:[https://docs.spring.io/spring-boot/docs/2.1.1.RELEASE/reference/htmlsingle/#common-application-properties](https://docs.spring.io/spring-boot/docs/2.1.1.RELEASE/reference/htmlsingle/#common-application-properties)
+* 感谢清风丿自来的java.sql.SQLException: The server time zone value 'Öйú±ê׼ʱ¼ä' is unrecognized:[https://blog.csdn.net/qq_39098813/article/details/81138648](https://blog.csdn.net/qq_39098813/article/details/81138648)
+* 感谢不信成不了大牛的Loading class 'com.mysql.jdbc.Driver'. This is deprecated. The new driver class is 'com.mysql.cj.jdb:[https://blog.csdn.net/anaini1314/article/details/71157791](https://blog.csdn.net/anaini1314/article/details/71157791)
+
 #### 参与贡献
 
 1. Fork 本项目

pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.16.RELEASE</version>
+        <version>2.1.1.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 

src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 spring:
     datasource:
         name: dev
-        url: jdbc:mysql://127.0.0.1:3306/dev?useSSL=false&useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://127.0.0.1:3306/dev?serverTimezone=GMT%2B8&useSSL=false&useUnicode=true&characterEncoding=UTF-8
         username: root
         password: root

src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 spring:
     datasource:
         name: prod
-        url: jdbc:mysql://127.0.0.1:3306/prod?useSSL=false&useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://127.0.0.1:3306/prod?serverTimezone=GMT%2B8&useSSL=false&useUnicode=true&characterEncoding=UTF-8
         username: root
         password: root

src/main/resources/application-sit.yml

@@ -1,6 +1,6 @@
 spring:
     datasource:
         name: sit
-        url: jdbc:mysql://127.0.0.1:3306/sit?useSSL=false&useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://127.0.0.1:3306/sit?serverTimezone=GMT%2B8&useSSL=false&useUnicode=true&characterEncoding=UTF-8
         username: root
         password: root

src/main/resources/application-uat.yml

@@ -1,6 +1,6 @@
 spring:
     datasource:
         name: uat
-        url: jdbc:mysql://127.0.0.1:3306/uat?useSSL=false&useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://127.0.0.1:3306/uat?serverTimezone=GMT%2B8&useSSL=false&useUnicode=true&characterEncoding=UTF-8
         username: root
         password: root

src/main/resources/application.yml

@@ -8,20 +8,21 @@ spring:
     # 使用Druid数据源
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.jdbc.Driver
-        filters: stat
-        maxActive: 20
-        initialSize: 1
-        maxWait: 60000
-        minIdle: 1
-        timeBetweenEvictionRunsMillis: 60000
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: select 'x'
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        poolPreparedStatements: true
-        maxOpenPreparedStatements: 20
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        druid:
+            filters: stat
+            maxActive: 20
+            initialSize: 1
+            maxWait: 60000
+            minIdle: 1
+            timeBetweenEvictionRunsMillis: 60000
+            minEvictableIdleTimeMillis: 300000
+            validationQuery: select 'x'
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            poolPreparedStatements: true
+            maxOpenPreparedStatements: 20
     # 404交给异常处理器处理
     mvc:
         throw-exception-if-no-handler-found: true

src/test/java/com/example/generator/CodeGenerator.java

@@ -150,7 +150,7 @@ public static void genModelAndMapper(String tableName, String modelName) {
             generator = new MyBatisGenerator(config, callback, warnings);
             generator.generate(null);
         } catch (Exception e) {
-            throw new RuntimeException("生成Model和Mapper失败", e);
+            throw new RuntimeException("生成Model和Mapper失败(请检查数据库是否连接正常及表名是否正确以及权限是否缺失)", e);
         }
 
         if (generator.getGeneratedJavaFiles().isEmpty() || generator.getGeneratedXmlFiles().isEmpty()) {