From 6d03042e269f31ea9f2fc7c2385cb9f068074de7 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:27:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=8D=B8=E8=BD=BD=20P?= =?UTF-8?q?ostgreSQL=20=E5=90=8E=E6=9C=AA=E5=88=A0=E9=99=A4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98=20(#3542)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/v1/database_mysql.go | 4 ---- backend/app/service/app_utils.go | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/backend/app/api/v1/database_mysql.go b/backend/app/api/v1/database_mysql.go index ba6720740..1168dad49 100644 --- a/backend/app/api/v1/database_mysql.go +++ b/backend/app/api/v1/database_mysql.go @@ -294,10 +294,6 @@ func (b *BaseApi) LoadRemoteAccess(c *gin.Context) { if err := helper.CheckBindAndValidate(&req, c); err != nil { return } - if req.Type == constant.AppPostgresql { - helper.SuccessWithData(c, true) - return - } isRemote, err := mysqlService.LoadRemoteAccess(req) if err != nil { helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err) diff --git a/backend/app/service/app_utils.go b/backend/app/service/app_utils.go index 85bb7e3d7..44b88ac00 100644 --- a/backend/app/service/app_utils.go +++ b/backend/app/service/app_utils.go @@ -251,6 +251,7 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall createPostgresql.Format = "UTF8" createPostgresql.Password = dbConfig.Password createPostgresql.From = database.From + createPostgresql.SuperUser = true pgdb, err := NewIPostgresqlService().Create(ctx, createPostgresql) if err != nil { return err @@ -365,6 +366,8 @@ func deleteAppInstall(install model.AppInstall, deleteBackup bool, forceDelete b _ = websiteDomainRepo.DeleteAll(ctx) case constant.AppMysql, constant.AppMariaDB: _ = 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))