From 7013fd156838b887e7405d1ebea32038012f38f3 Mon Sep 17 00:00:00 2001
From: xuyuxiang <xuyuxiang29@foxmail.com>
Date: Tue, 9 May 2023 13:51:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/service/impl/GenBasicServiceImpl.java      |  4 ++--
 .../vip/xiaonuo/core/config/GlobalConfigure.java     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java
index ffb746e8..6a4bb502 100644
--- a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java
@@ -268,11 +268,11 @@ public class GenBasicServiceImpl extends ServiceImpl<GenBasicMapper, GenBasic> i
             DatabaseMetaData metaData = conn.getMetaData();
             String url = metaData.getURL();
             String schema = null;
-            if (url.toLowerCase().contains("oracle")) {
+            if (url.toLowerCase().contains("jdbc:oracle")) {
                 schema = metaData.getUserName();
             }
             List<GenBasicTableResult> tables = new ArrayList<>();
-            rs = metaData.getTables(null, schema, "%", new String[]{"TABLE", "VIEW"});
+            rs = metaData.getTables(null, schema, "%", new String[]{"TABLE"});
             while (rs.next()) {
                 String tableName = rs.getString("TABLE_NAME");
                 if (!StrUtil.startWithIgnoreCase(tableName, "ACT_")) {
diff --git a/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java b/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java
index 3d35bd7b..050ae8c4 100644
--- a/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java
+++ b/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java
@@ -509,16 +509,16 @@ public class GlobalConfigure implements WebMvcConfigurer {
 
         @Override
         public String getDatabaseId(DataSource dataSource) throws SQLException {
-            String url = dataSource.getConnection().getMetaData().getURL();
-            if (url.contains("oracle")) {
+            String url = dataSource.getConnection().getMetaData().getURL().toLowerCase();
+            if (url.contains("jdbc:oracle")) {
                 return "oracle";
-            } else if (url.contains("postgresql")) {
+            } else if (url.contains("jdbc:postgresql")) {
                 return "pgsql";
-            } else if (url.contains("mysql")) {
+            } else if (url.contains("jdbc:mysql")) {
                 return "mysql";
-            } else if (url.contains("dm")) {
+            } else if (url.contains("jdbc:dm")) {
                 return "dm";
-            } else if (url.contains("kingbase")) {
+            } else if (url.contains("jdbc:kingbase")) {
                 return "kingbase";
             }  else {
                 return "mysql";