syschan
/
pms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: syschan:41d8c8174beea25fa5af5d9b563b960b5d57e02d
Branches Tags
syschan:pms-dev
..
compare: syschan:99ccf7940dce66cf26cf5963befa722a7f959ff5
Branches Tags
syschan:pms-dev

No commits in common. "41d8c8174beea25fa5af5d9b563b960b5d57e02d" and "99ccf7940dce66cf26cf5963befa722a7f959ff5" have entirely different histories.
41d8c8174b ... 99ccf7940d

3 changed files with 2 additions and 9 deletions
Show Stats Expand all files Collapse all files

4
server/api/v1/system/sys_auto_code.go
View File

@ -54,7 +54,7 @@ func (autoApi *AutoCodeApi) GetTables(c *gin.Context) {
dbName := c.Query("dbName") dbName := c.Query("dbName")
businessDB := c.Query("businessDB") businessDB := c.Query("businessDB")
if dbName == "" { if dbName == "" {
dbName = *global.GVA_ACTIVE_DBNAME dbName = global.GVA_CONFIG.Mysql.Dbname
if businessDB != "" { if businessDB != "" {
for _, db := range global.GVA_CONFIG.DBList { for _, db := range global.GVA_CONFIG.DBList {
if db.AliasName == businessDB { if db.AliasName == businessDB {
@ -85,7 +85,7 @@ func (autoApi *AutoCodeApi) GetColumn(c *gin.Context) {
businessDB := c.Query("businessDB") businessDB := c.Query("businessDB")
dbName := c.Query("dbName") dbName := c.Query("dbName")
if dbName == "" { if dbName == "" {
dbName = *global.GVA_ACTIVE_DBNAME dbName = global.GVA_CONFIG.Mysql.Dbname
if businessDB != "" { if businessDB != "" {
for _, db := range global.GVA_CONFIG.DBList { for _, db := range global.GVA_CONFIG.DBList {
if db.AliasName == businessDB { if db.AliasName == businessDB {

1
server/global/global.go
View File

@ -31,7 +31,6 @@ var (
GVA_Timer timer.Timer = timer.NewTimerTask() GVA_Timer timer.Timer = timer.NewTimerTask()
GVA_Concurrency_Control = &singleflight.Group{} GVA_Concurrency_Control = &singleflight.Group{}
GVA_ROUTERS gin.RoutesInfo GVA_ROUTERS gin.RoutesInfo
GVA_ACTIVE_DBNAME *string
BlackCache local_cache.Cache BlackCache local_cache.Cache
lock sync.RWMutex lock sync.RWMutex
) )

6
server/initialize/gorm.go
View File

@ -14,22 +14,16 @@ import (
func Gorm() *gorm.DB { func Gorm() *gorm.DB {
switch global.GVA_CONFIG.System.DbType { switch global.GVA_CONFIG.System.DbType {
case "mysql": case "mysql":
global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Mysql.Dbname
return GormMysql() return GormMysql()
case "pgsql": case "pgsql":
global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Pgsql.Dbname
return GormPgSql() return GormPgSql()
case "oracle": case "oracle":
global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Oracle.Dbname
return GormOracle() return GormOracle()
case "mssql": case "mssql":
global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Mssql.Dbname
return GormMssql() return GormMssql()
case "sqlite": case "sqlite":
global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Sqlite.Dbname
return GormSqlite() return GormSqlite()
default: default:
global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Mysql.Dbname
return GormMysql() return GormMysql()
} }
} }