From c8abccad03a0543ef5e91c03ed51292da4c7dbf2 Mon Sep 17 00:00:00 2001
From: songanwei <50330690@qq.com>
Date: Tue, 10 Nov 2020 15:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=B7=A5=E4=BD=9C=E6=B5=81=E8=A1=A8BUG?=
 =?UTF-8?q?=E5=92=8C=20=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=A1=A8=E6=88=90=E5=8A=9F=E5=90=8E=20=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pear-entrance/src/main/resources/application-datasource.yml   | 2 +-
 .../src/main/resources/templates/generator/importTable.html   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pear-entrance/src/main/resources/application-datasource.yml b/pear-entrance/src/main/resources/application-datasource.yml
index cedef2c0..32007cb8 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 ef01ad09..b2b1f680 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();
-- 
Gitee