acepanel/panel
2
0
Fork 0
mirror of https://github.com/acepanel/panel.git synced 2026-02-04 16:10:59 +08:00
Code Issues Packages Releases Activity

feat: 数据库管理基本完成

Browse Source
This commit is contained in:
耗子
2024-11-26 03:50:54 +08:00
parent 3fbaecbe9e
commit 9a2e68e24e
15 changed files with 175 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
internal/data/database.go
View File

@@ -33,6 +33,7 @@ func (r databaseRepo) List(page, limit uint) ([]*biz.Database, int64, error) {
if databases, err := mysql.Databases(); err == nil {
for item := range slices.Values(databases) {
database = append(database, &biz.Database{
Type: biz.DatabaseTypeMysql,
Name: item.Name,
Server: server.Name,
ServerID: server.ID,
@@ -47,6 +48,7 @@ func (r databaseRepo) List(page, limit uint) ([]*biz.Database, int64, error) {
if databases, err := postgres.Databases(); err == nil {
for item := range slices.Values(databases) {
database = append(database, &biz.Database{
Type: biz.DatabaseTypePostgresql,
Name: item.Name,
Server: server.Name,
ServerID: server.ID,
@@ -73,28 +75,36 @@ func (r databaseRepo) Create(req *request.DatabaseCreate) error {
if err != nil {
return err
}
if err = mysql.UserCreate(req.Username, req.Password); err != nil {
return err
if req.CreateUser {
if err = mysql.UserCreate(req.Username, req.Password, req.Host); err != nil {
return err
}
}
if err = mysql.DatabaseCreate(req.Name); err != nil {
return err
}
if err = mysql.PrivilegesGrant(req.Username, req.Name); err != nil {
return err
if req.Username != "" {
if err = mysql.PrivilegesGrant(req.Username, req.Name, req.Host); err != nil {
return err
}
}
case biz.DatabaseTypePostgresql:
postgres, err := db.NewPostgres(server.Username, server.Password, server.Host, server.Port)
if err != nil {
return err
}
if err = postgres.UserCreate(req.Username, req.Password); err != nil {
return err
if req.CreateUser {
if err = postgres.UserCreate(req.Username, req.Password); err != nil {
return err
}
}
if err = postgres.DatabaseCreate(req.Name); err != nil {
return err
}
if err = postgres.PrivilegesGrant(req.Username, req.Name); err != nil {
return err
if req.Username != "" {
if err = postgres.PrivilegesGrant(req.Username, req.Name); err != nil {
return err
}
}
}

13
internal/data/database_user.go
View File

@@ -30,7 +30,7 @@ func (r databaseUserRepo) Count() (int64, error) {
func (r databaseUserRepo) List(page, limit uint) ([]*biz.DatabaseUser, int64, error) {
var user []*biz.DatabaseUser
var total int64
err := app.Orm.Model(&biz.DatabaseUser{}).Order("id desc").Count(&total).Offset(int((page - 1) * limit)).Limit(int(limit)).Find(&user).Error
err := app.Orm.Model(&biz.DatabaseUser{}).Preload("Server").Order("id desc").Count(&total).Offset(int((page - 1) * limit)).Limit(int(limit)).Find(&user).Error
for u := range slices.Values(user) {
r.fillUser(u)
@@ -41,7 +41,7 @@ func (r databaseUserRepo) List(page, limit uint) ([]*biz.DatabaseUser, int64, er
func (r databaseUserRepo) Get(id uint) (*biz.DatabaseUser, error) {
user := new(biz.DatabaseUser)
if err := app.Orm.Where("id = ?", id).First(user).Error; err != nil {
if err := app.Orm.Preload("Server").Where("id = ?", id).First(user).Error; err != nil {
return nil, err
}
@@ -62,11 +62,11 @@ func (r databaseUserRepo) Create(req *request.DatabaseUserCreate) error {
if err != nil {
return err
}
if err = mysql.UserCreate(req.Username, req.Password); err != nil {
if err = mysql.UserCreate(req.Username, req.Password, req.Host); err != nil {
return err
}
for name := range slices.Values(req.Privileges) {
if err = mysql.PrivilegesGrant(req.Username, name); err != nil {
if err = mysql.PrivilegesGrant(req.Username, name, req.Host); err != nil {
return err
}
}
@@ -89,6 +89,7 @@ func (r databaseUserRepo) Create(req *request.DatabaseUserCreate) error {
ServerID: req.ServerID,
Username: req.Username,
Password: req.Password,
Host: req.Host,
Remark: req.Remark,
}
@@ -113,12 +114,12 @@ func (r databaseUserRepo) Update(req *request.DatabaseUserUpdate) error {
return err
}
if req.Password != "" {
if err = mysql.UserPassword(user.Username, req.Password); err != nil {
if err = mysql.UserPassword(user.Username, req.Password, user.Host); err != nil {
return err
}
}
for name := range slices.Values(req.Privileges) {
if err = mysql.PrivilegesGrant(user.Username, name); err != nil {
if err = mysql.PrivilegesGrant(user.Username, name, user.Host); err != nil {
return err
}
}

4
internal/data/website.go
View File

@@ -308,13 +308,13 @@ func (r *websiteRepo) Create(req *request.WebsiteCreate) (*biz.Website, error) {
if err != nil {
return nil, err
}
if err = mysql.UserCreate(req.DBUser, req.DBPassword); err != nil {
if err = mysql.UserCreate(req.DBUser, req.DBPassword, "localhost"); err != nil {
return nil, err
}
if err = mysql.DatabaseCreate(req.DBName); err != nil {
return nil, err
}
if err = mysql.PrivilegesGrant(req.DBUser, req.DBName); err != nil {
if err = mysql.PrivilegesGrant(req.DBUser, req.DBName, "localhost"); err != nil {
return nil, err
}
}