Merge remote-tracking branch 'origin/main'

piexlmax · piexlmax · commit 9ab6ab634d10 · 2022-05-26T14:38:40.000+08:00
diff --git a/server/config/db_list.go b/server/config/db_list.go
@@ -12,7 +12,6 @@ type GeneralDB struct {
 	Path         string `mapstructure:"path" json:"path" yaml:"path"`                               // 服务器地址:端口
 	Port         string `mapstructure:"port" json:"port" yaml:"port"`                               //:端口
 	Config       string `mapstructure:"config" json:"config" yaml:"config"`                         // 高级配置
-	AliasName    string `mapstructure:"alias-name" json:"alias-name" yaml:"alias-name"`             // 在多数据库中 生效
 	Dbname       string `mapstructure:"db-name" json:"db-name" yaml:"db-name"`                      // 数据库名
 	Username     string `mapstructure:"username" json:"username" yaml:"username"`                   // 数据库用户名
 	Password     string `mapstructure:"password" json:"password" yaml:"password"`                   // 数据库密码
diff --git a/server/initialize/db_list.go b/server/initialize/db_list.go
@@ -16,9 +16,9 @@ func DBList() {
 		}
 		switch info.Type {
 		case "mysql":
-			dbMap[info.GeneralDB.AliasName] = GormMysqlByConfig(config.Mysql{GeneralDB: info.GeneralDB})
+			dbMap[info.AliasName] = GormMysqlByConfig(config.Mysql{GeneralDB: info.GeneralDB})
 		case "pgsql":
-			dbMap[info.GeneralDB.AliasName] = GormPgSqlByConfig(config.Pgsql{GeneralDB: info.GeneralDB})
+			dbMap[info.AliasName] = GormPgSqlByConfig(config.Pgsql{GeneralDB: info.GeneralDB})
 		default:
 			continue
 		}

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ func DBList() {`
`16`	`16`	`}`
`17`	`17`	`switch info.Type {`
`18`	`18`	`case "mysql":`
`19`		`- dbMap[info.GeneralDB.AliasName] = GormMysqlByConfig(config.Mysql{GeneralDB: info.GeneralDB})`
	`19`	`+ dbMap[info.AliasName] = GormMysqlByConfig(config.Mysql{GeneralDB: info.GeneralDB})`
`20`	`20`	`case "pgsql":`
`21`		`- dbMap[info.GeneralDB.AliasName] = GormPgSqlByConfig(config.Pgsql{GeneralDB: info.GeneralDB})`
	`21`	`+ dbMap[info.AliasName] = GormPgSqlByConfig(config.Pgsql{GeneralDB: info.GeneralDB})`
`22`	`22`	`default:`
`23`	`23`	`continue`
`24`	`24`	`}`