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

fix: 数据库实例删除等问题修复

Browse Source
This commit is contained in:
meilin.huang
2024-07-05 13:14:31 +08:00
parent 10630847df
commit a80221a950
12 changed files with 94 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/internal/db/application/db_instance.go
View File

@@ -67,17 +67,9 @@ func (app *instanceAppImpl) GetPageList(condition *entity.InstanceQuery, pagePar
func (app *instanceAppImpl) TestConn(instanceEntity *entity.DbInstance, authCert *tagentity.ResourceAuthCert) error {
instanceEntity.Network = instanceEntity.GetNetwork()
if authCert.Id != 0 {
// 密文可能被清除，故需要重新获取
authCert, _ = app.resourceAuthCertApp.GetAuthCert(authCert.Name)
} else {
if authCert.CiphertextType == tagentity.AuthCertCiphertextTypePublic {
publicAuthCert, err := app.resourceAuthCertApp.GetAuthCert(authCert.Ciphertext)
if err != nil {
return err
}
authCert = publicAuthCert
}
authCert, err := app.resourceAuthCertApp.GetRealAuthCert(authCert)
if err != nil {
return err
}
dbConn, err := dbm.Conn(app.toDbInfoByAc(instanceEntity, authCert, ""))
@@ -176,7 +168,7 @@ func (app *instanceAppImpl) Delete(ctx context.Context, instanceId uint64) error
DbInstanceId: instanceId,
}
err = app.restoreApp.restoreRepo.GetByCond(restore)
if err != nil {
if err == nil {
return errorx.NewBiz("不能删除数据库实例【%s】,请先删除关联的数据库恢复任务。", instance.Name)
}
@@ -184,7 +176,7 @@ func (app *instanceAppImpl) Delete(ctx context.Context, instanceId uint64) error
DbInstanceId: instanceId,
}
err = app.backupApp.backupRepo.GetByCond(backup)
if err != nil {
if err == nil {
return errorx.NewBiz("不能删除数据库实例【%s】,请先删除关联的数据库备份任务。", instance.Name)
}