2
0
mirror of https://github.com/acepanel/panel.git synced 2026-02-07 18:13:13 +08:00

fix: lint

This commit is contained in:
2025-04-05 20:10:53 +08:00
parent edb5e858e4
commit e6b3858937
15 changed files with 130 additions and 45 deletions

View File

@@ -68,7 +68,9 @@ func (r databaseUserRepo) Create(req *request.DatabaseUserCreate) error {
if err != nil {
return err
}
defer mysql.Close()
defer func(mysql *db.MySQL) {
_ = mysql.Close()
}(mysql)
if err = mysql.UserCreate(req.Username, req.Password, req.Host); err != nil {
return err
}
@@ -87,7 +89,9 @@ func (r databaseUserRepo) Create(req *request.DatabaseUserCreate) error {
if err != nil {
return err
}
defer postgres.Close()
defer func(postgres *db.Postgres) {
_ = postgres.Close()
}(postgres)
if err = postgres.UserCreate(req.Username, req.Password); err != nil {
return err
}
@@ -129,7 +133,9 @@ func (r databaseUserRepo) Update(req *request.DatabaseUserUpdate) error {
if err != nil {
return err
}
defer mysql.Close()
defer func(mysql *db.MySQL) {
_ = mysql.Close()
}(mysql)
if req.Password != "" {
if err = mysql.UserPassword(user.Username, req.Password, user.Host); err != nil {
return err
@@ -145,7 +151,9 @@ func (r databaseUserRepo) Update(req *request.DatabaseUserUpdate) error {
if err != nil {
return err
}
defer postgres.Close()
defer func(postgres *db.Postgres) {
_ = postgres.Close()
}(postgres)
if req.Password != "" {
if err = postgres.UserPassword(user.Username, req.Password); err != nil {
return err
@@ -192,14 +200,18 @@ func (r databaseUserRepo) Delete(id uint) error {
if err != nil {
return err
}
defer mysql.Close()
defer func(mysql *db.MySQL) {
_ = mysql.Close()
}(mysql)
_ = mysql.UserDrop(user.Username, user.Host)
case biz.DatabaseTypePostgresql:
postgres, err := db.NewPostgres(server.Username, server.Password, server.Host, server.Port)
if err != nil {
return err
}
defer postgres.Close()
defer func(postgres *db.Postgres) {
_ = postgres.Close()
}(postgres)
_ = postgres.UserDrop(user.Username)
}
@@ -218,7 +230,9 @@ func (r databaseUserRepo) DeleteByNames(serverID uint, names []string) error {
if err != nil {
return err
}
defer mysql.Close()
defer func(mysql *db.MySQL) {
_ = mysql.Close()
}(mysql)
users := make([]*biz.DatabaseUser, 0)
if err = r.db.Where("server_id = ? AND username IN ?", serverID, names).Find(&users).Error; err != nil {
return err
@@ -238,7 +252,9 @@ func (r databaseUserRepo) DeleteByNames(serverID uint, names []string) error {
if err != nil {
return err
}
defer postgres.Close()
defer func(postgres *db.Postgres) {
_ = postgres.Close()
}(postgres)
for name := range slices.Values(names) {
_ = postgres.UserDrop(name)
}
@@ -254,7 +270,9 @@ func (r databaseUserRepo) fillUser(user *biz.DatabaseUser) {
case biz.DatabaseTypeMysql:
mysql, err := db.NewMySQL(server.Username, server.Password, fmt.Sprintf("%s:%d", server.Host, server.Port))
if err == nil {
defer mysql.Close()
defer func(mysql *db.MySQL) {
_ = mysql.Close()
}(mysql)
privileges, _ := mysql.UserPrivileges(user.Username, user.Host)
user.Privileges = privileges
}
@@ -267,7 +285,9 @@ func (r databaseUserRepo) fillUser(user *biz.DatabaseUser) {
case biz.DatabaseTypePostgresql:
postgres, err := db.NewPostgres(server.Username, server.Password, server.Host, server.Port)
if err == nil {
defer postgres.Close()
defer func(postgres *db.Postgres) {
_ = postgres.Close()
}(postgres)
privileges, _ := postgres.UserPrivileges(user.Username)
user.Privileges = privileges
}