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 8f9ea01311498dd83c86a7d5225875a5bf6df421..d67a79026a1ea357753f7e733d7b07c0e81fa303 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 68e8b531dbbad5740bce81ac961c4c8a66725b98..11660bc595696de6fe74285701d82e118112a180 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 8dc9fe884e4ddb9e126ff34cd9ed92770d09dd6e..8b6618068e6dc574c1c9345a79e265cdc7223839 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 5e39b7a42de463cf1b6b05a2b8a72d5cedd2a727..040c9324e4a724987aa0a1af1c29691290565baf 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();