diff --git a/internal/data/database_server.go b/internal/data/database_server.go index b0ec0464..5ecf7f52 100644 --- a/internal/data/database_server.go +++ b/internal/data/database_server.go @@ -160,7 +160,7 @@ func (r *databaseServerRepo) Sync(id uint) error { Remark: r.t.Get("sync from server %s", server.Name), } if err = r.db.Create(newUser).Error; err != nil { - r.log.Warn("[DatabaseServer] sync database user failed", slog.Any("err", err)) + r.log.Warn("[DatabaseServer] sync mysql database user failed", slog.Any("err", err)) } } } @@ -178,7 +178,9 @@ func (r *databaseServerRepo) Sync(id uint) error { Username: user.User, Remark: r.t.Get("sync from server %s", server.Name), } - r.db.Create(newUser) + if err = r.db.Create(newUser).Error; err != nil { + r.log.Warn("[DatabaseServer] sync postgresql database user failed", slog.Any("err", err)) + } } } } diff --git a/internal/data/database_user.go b/internal/data/database_user.go index fa80de6f..c209fcc4 100644 --- a/internal/data/database_user.go +++ b/internal/data/database_user.go @@ -236,6 +236,8 @@ func (r *databaseUserRepo) fillUser(user *biz.DatabaseUser) { user.Status = biz.DatabaseUserStatusInvalid } } + } else { + user.Status = biz.DatabaseUserStatusInvalid } } // 初始化,防止 nil diff --git a/pkg/db/postgres.go b/pkg/db/postgres.go index 9a781647..26b5afe0 100644 --- a/pkg/db/postgres.go +++ b/pkg/db/postgres.go @@ -7,8 +7,6 @@ import ( "strings" _ "github.com/lib/pq" - - "github.com/acepanel/panel/pkg/systemctl" ) type Postgres struct { @@ -124,7 +122,7 @@ func (r *Postgres) UserDrop(user string, host ...string) error { return err } - return systemctl.Reload("postgresql") + return nil } func (r *Postgres) UserPassword(user, password string, host ...string) error {