diff --git a/pear-entrance/src/main/resources/application-datasource.yml b/pear-entrance/src/main/resources/application-datasource.yml
index cedef2c0bedd13951221069c825133a5fdf0e6aa..32007cb82ce1470e8898617d7c6c56703e8c8420 100644
--- a/pear-entrance/src/main/resources/application-datasource.yml
+++ b/pear-entrance/src/main/resources/application-datasource.yml
@@ -6,7 +6,7 @@ spring:
       strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
       datasource:
         master:
-          url: jdbc:mysql://mysql.pearadmin.com:3306/pear-admin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://mysql.pearadmin.com:3306/pear-admin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
           username: root
           password: root
           druid:
diff --git a/pear-entrance/src/main/resources/templates/generator/importTable.html b/pear-entrance/src/main/resources/templates/generator/importTable.html
index ef01ad09b8ef6c33c66da4c70bfec2d6e8b38845..b2b1f68011a4c57957730429fd8d55907b4fb068 100644
--- a/pear-entrance/src/main/resources/templates/generator/importTable.html
+++ b/pear-entrance/src/main/resources/templates/generator/importTable.html
@@ -99,7 +99,9 @@
         let tables = layui.common.joinArray(checks.data, "tableName");
         let data = {"tables": tables};
         layui.common.ajax.post(prefix + "/importTable", data, function (res) {
-            layui.layer.alert(res.msg);
+            if(res.msg!=null){
+                layui.layer.alert(res.msg);
+            }
             if (res.success) {
                 parent.layui.layer.closeAll();
                 parent.layui.table.reload();