fixed: 修复其他数据库类型下无法获取表列表的bug

pixelmaxQm · pixelmaxQm · commit 332a8de2e925 · 2024-08-05T20:05:23.000+08:00
diff --git a/server/api/v1/system/sys_auto_code.go b/server/api/v1/system/sys_auto_code.go
@@ -54,7 +54,7 @@ func (autoApi *AutoCodeApi) GetTables(c *gin.Context) {
 	dbName := c.Query("dbName")
 	businessDB := c.Query("businessDB")
 	if dbName == "" {
-		dbName = global.GVA_CONFIG.Mysql.Dbname
+		dbName = *global.GVA_ACTIVE_DBNAME
 		if businessDB != "" {
 			for _, db := range global.GVA_CONFIG.DBList {
 				if db.AliasName == businessDB {
@@ -85,7 +85,7 @@ func (autoApi *AutoCodeApi) GetColumn(c *gin.Context) {
 	businessDB := c.Query("businessDB")
 	dbName := c.Query("dbName")
 	if dbName == "" {
-		dbName = global.GVA_CONFIG.Mysql.Dbname
+		dbName = *global.GVA_ACTIVE_DBNAME
 		if businessDB != "" {
 			for _, db := range global.GVA_CONFIG.DBList {
 				if db.AliasName == businessDB {
diff --git a/server/global/global.go b/server/global/global.go
@@ -31,6 +31,7 @@ var (
 	GVA_Timer               timer.Timer = timer.NewTimerTask()
 	GVA_Concurrency_Control             = &singleflight.Group{}
 	GVA_ROUTERS             gin.RoutesInfo
+	GVA_ACTIVE_DBNAME       *string
 	BlackCache              local_cache.Cache
 	lock                    sync.RWMutex
 )
diff --git a/server/initialize/gorm.go b/server/initialize/gorm.go
@@ -14,16 +14,22 @@ import (
 func Gorm() *gorm.DB {
 	switch global.GVA_CONFIG.System.DbType {
 	case "mysql":
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Mysql.Dbname
 		return GormMysql()
 	case "pgsql":
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Pgsql.Dbname
 		return GormPgSql()
 	case "oracle":
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Oracle.Dbname
 		return GormOracle()
 	case "mssql":
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Mssql.Dbname
 		return GormMssql()
 	case "sqlite":
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Sqlite.Dbname
 		return GormSqlite()
 	default:
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Mysql.Dbname
 		return GormMysql()
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ var (`
`31`	`31`	`GVA_Timer timer.Timer = timer.NewTimerTask()`
`32`	`32`	`GVA_Concurrency_Control = &singleflight.Group{}`
`33`	`33`	`GVA_ROUTERS gin.RoutesInfo`
	`34`	`+ GVA_ACTIVE_DBNAME *string`
`34`	`35`	`BlackCache local_cache.Cache`
`35`	`36`	`lock sync.RWMutex`
`36`	`37`	`)`