From 3c19d8ed9afe9774263ba8652287bab095cf934e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Thu, 4 Dec 2025 14:51:59 +0800 Subject: [PATCH] fix: ai suggestions --- internal/data/database.go | 7 +++++++ internal/data/database_user.go | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/internal/data/database.go b/internal/data/database.go index 8e2dc89c..eb1ffaf0 100644 --- a/internal/data/database.go +++ b/internal/data/database.go @@ -58,6 +58,10 @@ func (r *databaseRepo) List(page, limit uint) ([]*biz.Database, int64, error) { operator.Close() } + if len(database) < int((page-1)*limit) { + return []*biz.Database{}, int64(len(database)), nil + } + return database[(page-1)*limit:], int64(len(database)), nil } @@ -71,6 +75,7 @@ func (r *databaseRepo) Create(req *request.DatabaseCreate) error { if err != nil { return err } + defer operator.Close() switch server.Type { case biz.DatabaseTypeMysql: @@ -129,6 +134,7 @@ func (r *databaseRepo) Delete(serverID uint, name string) error { if err != nil { return err } + defer operator.Close() return operator.DatabaseDrop(name) } @@ -143,6 +149,7 @@ func (r *databaseRepo) Comment(req *request.DatabaseComment) error { if err != nil { return err } + defer operator.Close() switch server.Type { case biz.DatabaseTypeMysql: diff --git a/internal/data/database_user.go b/internal/data/database_user.go index 94e78349..fa80de6f 100644 --- a/internal/data/database_user.go +++ b/internal/data/database_user.go @@ -71,7 +71,7 @@ func (r *databaseUserRepo) Create(req *request.DatabaseUserCreate) error { defer operator.Close() // 创建用户 - if err = operator.UserCreate(req.Username, req.Password); err != nil { + if err = operator.UserCreate(req.Username, req.Password, req.Host); err != nil { return err } @@ -80,7 +80,7 @@ func (r *databaseUserRepo) Create(req *request.DatabaseUserCreate) error { if err = operator.DatabaseCreate(name); err != nil { return err } - if err = operator.PrivilegesGrant(req.Username, name); err != nil { + if err = operator.PrivilegesGrant(req.Username, name, req.Host); err != nil { return err } } @@ -119,7 +119,7 @@ func (r *databaseUserRepo) Update(req *request.DatabaseUserUpdate) error { // 更新密码 if req.Password != "" { - if err = operator.UserPassword(user.Username, req.Password); err != nil { + if err = operator.UserPassword(user.Username, req.Password, user.Host); err != nil { return err } user.Password = req.Password @@ -130,7 +130,7 @@ func (r *databaseUserRepo) Update(req *request.DatabaseUserUpdate) error { if err = operator.DatabaseCreate(name); err != nil { return err } - if err = operator.PrivilegesGrant(user.Username, name); err != nil { + if err = operator.PrivilegesGrant(user.Username, name, user.Host); err != nil { return err } } @@ -168,7 +168,7 @@ func (r *databaseUserRepo) Delete(id uint) error { } defer operator.Close() - _ = operator.UserDrop(user.Username) + _ = operator.UserDrop(user.Username, user.Host) return r.db.Where("id = ?", id).Delete(&biz.DatabaseUser{}).Error }