From 4639b918ea464e0d345bc43874ec1725a018a6ac Mon Sep 17 00:00:00 2001
From: wingmyway <409681336@qq.com>
Date: Mon, 3 Aug 2020 15:22:08 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9mysql=E9=A9=B1?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=BAcom.mysql.cj.jdbc.Driver=202=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9mysql=20jdbc=E8=BF=9E=E6=8E=A5=E4=B8=B2,?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0serverTimezone=3DAsia/Shanghai=203=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=BA=93=E5=90=8D(dbName)?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB'-'=E7=9A=84=E5=BC=82=E5=B8=B8.=E5=A6=82(plat?=
 =?UTF-8?q?form-cloud)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gen/src/main/java/com/gitee/gen/common/DbType.java              | 2 +-
 gen/src/main/java/com/gitee/gen/gen/GeneratorConfig.java        | 2 +-
 gen/src/main/java/com/gitee/gen/gen/SqlHelper.java              | 2 +-
 .../main/java/com/gitee/gen/gen/mysql/MySqlTableSelector.java   | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gen/src/main/java/com/gitee/gen/common/DbType.java b/gen/src/main/java/com/gitee/gen/common/DbType.java
index 8f9ea01..d67a790 100644
--- a/gen/src/main/java/com/gitee/gen/common/DbType.java
+++ b/gen/src/main/java/com/gitee/gen/common/DbType.java
@@ -5,7 +5,7 @@ package com.gitee.gen.common;
  */
 public enum DbType {
 
-    MYSQL(1, "com.mysql.jdbc.Driver"),
+    MYSQL(1, "com.mysql.cj.jdbc.Driver"),
     ORACLE(2, "oracle.jdbc.driver.OracleDriver"),
     SQL_SERVER(3, "net.sourceforge.jtds.jdbc.Driver"),
 
diff --git a/gen/src/main/java/com/gitee/gen/gen/GeneratorConfig.java b/gen/src/main/java/com/gitee/gen/gen/GeneratorConfig.java
index 68e8b53..11660bc 100644
--- a/gen/src/main/java/com/gitee/gen/gen/GeneratorConfig.java
+++ b/gen/src/main/java/com/gitee/gen/gen/GeneratorConfig.java
@@ -11,7 +11,7 @@ public class GeneratorConfig {
     private static final Map<String, String> JDBC_URL_MAP = new HashMap<String, String>();
 
     static {
-        JDBC_URL_MAP.put("com.mysql.jdbc.Driver", "jdbc:mysql://%s:%s/%s?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true");
+        JDBC_URL_MAP.put("com.mysql.cj.jdbc.Driver", "jdbc:mysql://%s:%s/%s?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai");
         JDBC_URL_MAP.put("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@%s:%s:%s");
         JDBC_URL_MAP.put("net.sourceforge.jtds.jdbc.Driver", "jdbc:jtds:sqlserver://%s:%s;databaseName=%s");
     }
diff --git a/gen/src/main/java/com/gitee/gen/gen/SqlHelper.java b/gen/src/main/java/com/gitee/gen/gen/SqlHelper.java
index 8dc9fe8..8b66180 100644
--- a/gen/src/main/java/com/gitee/gen/gen/SqlHelper.java
+++ b/gen/src/main/java/com/gitee/gen/gen/SqlHelper.java
@@ -41,7 +41,7 @@ public class SqlHelper {
      * String sql = "SELECT * FROM datasource_config WHERE dc_id=${id}";
      *
      * DataSourceConfig dataSourceConfig = new DataSourceConfig();
-     * dataSourceConfig.setDriverClass("com.mysql.jdbc.Driver");
+     * dataSourceConfig.setDriverClass("com.mysql.cj.jdbc.Driver");
      * dataSourceConfig.setJdbcUrl("jdbc:mysql://localhost:3306/auto_code");
      * dataSourceConfig.setUsername("root");
      * dataSourceConfig.setPassword("root");
diff --git a/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlTableSelector.java b/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlTableSelector.java
index 5e39b7a..040c932 100644
--- a/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlTableSelector.java
+++ b/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlTableSelector.java
@@ -19,6 +19,8 @@ public class MySqlTableSelector extends TableSelector {
 
 	@Override
 	protected String getShowTablesSQL(String dbName) {
+		// 兼容dbName包含'-'字段会报错的情况
+		dbName = dbName.contains("-") ? String.format("`%s`",dbName): dbName;
 		String sql = "SHOW TABLE STATUS FROM " + dbName;
 		if(this.getSchTableNames() != null && this.getSchTableNames().size() > 0) {
 			StringBuilder tables = new StringBuilder();
-- 
Gitee