gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-08 01:20:07 +08:00
Code

fix: 解决卸载 PostgreSQL 后未删除数据的问题 (#3542)

Browse Source
This commit is contained in:
ssongliu 2024-01-09 16:27:33 +08:00 committed by GitHub
parent 45a58b3b4b
commit 6d03042e26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/app/api/v1/database_mysql.go
View File

@ -294,10 +294,6 @@ func (b *BaseApi) LoadRemoteAccess(c *gin.Context) {
if err := helper.CheckBindAndValidate(&req, c); err != nil { if err := helper.CheckBindAndValidate(&req, c); err != nil {
return return
} }
if req.Type == constant.AppPostgresql {
helper.SuccessWithData(c, true)
return
}
isRemote, err := mysqlService.LoadRemoteAccess(req) isRemote, err := mysqlService.LoadRemoteAccess(req)
if err != nil { if err != nil {
helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err) helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)

3
backend/app/service/app_utils.go
View File

@ -251,6 +251,7 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall
createPostgresql.Format = "UTF8" createPostgresql.Format = "UTF8"
createPostgresql.Password = dbConfig.Password createPostgresql.Password = dbConfig.Password
createPostgresql.From = database.From createPostgresql.From = database.From
createPostgresql.SuperUser = true
pgdb, err := NewIPostgresqlService().Create(ctx, createPostgresql) pgdb, err := NewIPostgresqlService().Create(ctx, createPostgresql)
if err != nil { if err != nil {
return err return err
@ -365,6 +366,8 @@ func deleteAppInstall(install model.AppInstall, deleteBackup bool, forceDelete b
_ = websiteDomainRepo.DeleteAll(ctx) _ = websiteDomainRepo.DeleteAll(ctx)
case constant.AppMysql, constant.AppMariaDB: case constant.AppMysql, constant.AppMariaDB:
_ = mysqlRepo.Delete(ctx, mysqlRepo.WithByMysqlName(install.Name)) _ = mysqlRepo.Delete(ctx, mysqlRepo.WithByMysqlName(install.Name))
case constant.AppPostgresql:
_ = postgresqlRepo.Delete(ctx, postgresqlRepo.WithByPostgresqlName(install.Name))
} }
_ = backupRepo.DeleteRecord(ctx, commonRepo.WithByType("app"), commonRepo.WithByName(install.App.Key), backupRepo.WithByDetailName(install.Name)) _ = backupRepo.DeleteRecord(ctx, commonRepo.WithByType("app"), commonRepo.WithByName(install.App.Key), backupRepo.WithByDetailName(install.Name))