TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-04 00:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 获取数据库连接调整

Browse Source
This commit is contained in:
wanli
2023-09-05 15:22:16 +08:00
parent 0eaff33168
commit 52f72400ba
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/internal/db/api/db.go
View File

@@ -212,7 +212,7 @@ func (d *Db) ExecSqlFile(rc *req.Ctx) {
break break
} }
if err != nil { if err != nil {
d.MsgApp.CreateAndSend(rc.LoginAccount, ws.ErrMsg("sql脚本执行失败", fmt.Sprintf("[%s][%s] 解析SQL失败: [%s]", filename, dbInstance.Info.GetLogDesc(), err.Error()))) d.MsgApp.CreateAndSend(rc.LoginAccount, ws.ErrMsg("sql脚本执行失败", fmt.Sprintf("[%s][%s] 解析SQL失败: [%s]", filename, dbConn.Info.GetLogDesc(), err.Error())))
return return
} }
sql := sqlparser.String(stmt) sql := sqlparser.String(stmt)
@@ -272,18 +272,17 @@ func (d *Db) DumpSql(rc *req.Ctx) {
tables = strings.Split(tablesStr, ",") tables = strings.Split(tablesStr, ",")
} }
instance := d.InstanceApp.GetById(db.InstanceId)
writer := gzipResponseWriter{writer: gzip.NewWriter(g.Writer)} writer := gzipResponseWriter{writer: gzip.NewWriter(g.Writer)}
defer writer.Close() defer writer.Close()
for _, dbName := range dbNames { for _, dbName := range dbNames {
d.dumpHeader(writer, instance, dbName, len(dbNames) > 1) d.dumpDb(writer, dbId, dbName, tables, needStruct, needData, len(dbNames) > 1)
d.dumpDb(writer, db, instance, dbName, tables, needStruct, needData)
} }
rc.ReqParam = fmt.Sprintf("DB[id=%d, tag=%s, name=%s, databases=%s, tables=%s, dumpType=%s]", db.Id, db.TagPath, db.Name, dbNamesStr, tablesStr, dumpType) rc.ReqParam = fmt.Sprintf("DB[id=%d, tag=%s, name=%s, databases=%s, tables=%s, dumpType=%s]", db.Id, db.TagPath, db.Name, dbNamesStr, tablesStr, dumpType)
} }
func (d *Db) dumpHeader(writer gzipResponseWriter, instance *entity.Instance, dbName string, switchDb bool) { func (d *Db) dumpDb(writer gzipResponseWriter, dbId uint64, dbName string, tables []string, needStruct bool, needData bool, switchDb bool) {
dbConn := d.DbApp.GetDbConnection(dbId, dbName)
writer.WriteString("-- ----------------------------") writer.WriteString("-- ----------------------------")
writer.WriteString("\n-- 导出平台: mayfly-go") writer.WriteString("\n-- 导出平台: mayfly-go")
writer.WriteString(fmt.Sprintf("\n-- 导出时间: %s ", time.Now().Format("2006-01-02 15:04:05"))) writer.WriteString(fmt.Sprintf("\n-- 导出时间: %s ", time.Now().Format("2006-01-02 15:04:05")))
@@ -291,18 +290,14 @@ func (d *Db) dumpHeader(writer gzipResponseWriter, instance *entity.Instance, db
writer.WriteString("\n-- ----------------------------\n") writer.WriteString("\n-- ----------------------------\n")
if switchDb { if switchDb {
switch instance.Type { switch dbConn.Info.Type {
case entity.DbTypeMysql: case entity.DbTypeMysql:
writer.WriteString(fmt.Sprintf("use `%s`;\n", dbName)) writer.WriteString(fmt.Sprintf("use `%s`;\n", dbName))
default: default:
biz.IsTrue(false, "数据库类型必须为 %s", entity.DbTypeMysql) biz.IsTrue(false, "数据库类型必须为 %s", entity.DbTypeMysql)
} }
} }
} dbMeta := dbConn.GetMeta()
func (d *Db) dumpDb(writer gzipResponseWriter, db *entity.Db, instance *entity.Instance, dbName string, tables []string, needStruct bool, needData bool) {
dbInst := d.DbApp.GetDbConnection(db, instance, dbName)
dbMeta := dbInst.GetMeta()
if len(tables) == 0 { if len(tables) == 0 {
ti := dbMeta.GetTableInfos() ti := dbMeta.GetTableInfos()
tables = make([]string, len(ti)) tables = make([]string, len(ti))

2
server/internal/db/application/db.go
View File

@@ -147,7 +147,7 @@ func (d *dbAppImpl) GetDbConnection(dbId uint64, dbName string) *DbConnection {
db := d.GetById(dbId) db := d.GetById(dbId)
biz.NotNil(db, "数据库信息不存在") biz.NotNil(db, "数据库信息不存在")
biz.IsTrue(strings.Contains(" "+db.Database+" ", " "+dbName+" "), "未配置该库的操作权限") biz.IsTrue(strings.Contains(" "+db.Database+" ", " "+dbName+" "), "未配置数据库【%s】的操作权限", dbName)
instance := d.dbInstanceApp.GetById(db.InstanceId) instance := d.dbInstanceApp.GetById(db.InstanceId)
// 密码解密 // 密码解密