From 2864dded5dfc0cd409f2a5d0ac33a42393fa04bc Mon Sep 17 00:00:00 2001 From: zhenggm Date: Fri, 10 Jun 2022 18:15:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/db/impl/DefaultDatabaseInfoImpl.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultDatabaseInfoImpl.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultDatabaseInfoImpl.java index 1ba2d15..eca592a 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultDatabaseInfoImpl.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultDatabaseInfoImpl.java @@ -1,7 +1,10 @@ package cc.smtweb.framework.core.db.impl; import cc.smtweb.framework.core.db.DbEngine; +import cc.smtweb.framework.core.db.cache.ModelDatabaseCache; +import cc.smtweb.framework.core.db.vo.ModelDatabase; import cc.smtweb.framework.core.util.SpringUtil; +import com.sun.org.apache.xpath.internal.operations.Mod; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.support.JdbcUtils; @@ -113,12 +116,12 @@ public class DefaultDatabaseInfoImpl implements IDatabaseInfo { } if (dbEngine.isMysql()) {//非oracle才需要 String dbName = dbEngine.getDbSchema(); - /*Set list = .getInstance().getModelReader().getListSchema(); + Collection list = ModelDatabaseCache.getInstance().getAll(); if (list != null && !list.isEmpty()) { - for (String catalog : list) { - getTableSet(dbData, dbName + "_" + catalog, needsUpperCase, lookupSchemaName); + for (ModelDatabase db : list) { + getTableSet(dbData, dbName + "_" + db.getName(), needsUpperCase, lookupSchemaName); } - }*/ + } //当前库都要去读 getTableSet(dbData, dbName, needsUpperCase, lookupSchemaName); } else { @@ -209,12 +212,12 @@ public class DefaultDatabaseInfoImpl implements IDatabaseInfo { if (dbEngine.isMysql()) {//非oracle才需要 String dbName = dbEngine.getDbSchema(); - /*Set list = ModelConfigUtil.getInstance().getModelReader().getListSchema(); + Collection list = ModelDatabaseCache.getInstance().getAll(); if (list != null && !list.isEmpty()) { - for (String catalog : list) { - getColumnInfo(dbData, dbName + "_" + catalog, needsUpperCase, lookupSchemaName); + for (ModelDatabase db : list) { + getColumnInfo(dbData, dbName + "_" + db.getName(), needsUpperCase, lookupSchemaName); } - }*/ + } } getColumnInfo(dbData, null, needsUpperCase, lookupSchemaName);