feat: 数据库管理提交1

2026-02-04 11:27:17 +08:00 · 2024-11-22 02:58:31 +08:00
parent 39d2eee676
commit a96bbf3dfb
17 changed files with 764 additions and 65 deletions
--- a/internal/data/backup.go
+++ b/internal/data/backup.go
@@ -288,7 +288,7 @@ func (r *backupRepo) createMySQL(to string, name string) error {

 // createPostgres 创建 PostgreSQL 备份
 func (r *backupRepo) createPostgres(to string, name string) error {
-	postgres, err := db.NewPostgres("postgres", "", "127.0.0.1", 5432, fmt.Sprintf("%s/server/postgresql/data/pg_hba.conf", app.Root))
+	postgres, err := db.NewPostgres("postgres", "", "127.0.0.1", 5432)
 	if err != nil {
 		return err
 	}
@@ -436,7 +436,7 @@ func (r *backupRepo) restorePostgres(backup, target string) error {
 		return errors.New("备份文件不存在")
 	}

-	postgres, err := db.NewPostgres("postgres", "", "127.0.0.1", 5432, fmt.Sprintf("%s/server/postgresql/data/pg_hba.conf", app.Root))
+	postgres, err := db.NewPostgres("postgres", "", "127.0.0.1", 5432)
 	if err != nil {
 		return err
 	}
--- a/internal/data/database.go
+++ b/internal/data/database.go
@@ -1,18 +1,25 @@
 package data

 import (
+	"fmt"
+
 	"github.com/TheTNB/panel/internal/app"
 	"github.com/TheTNB/panel/internal/biz"
 	"github.com/TheTNB/panel/internal/http/request"
+	"github.com/TheTNB/panel/pkg/db"
 )

-type databaseRepo struct{}
-
-func NewDatabaseRepo() biz.DatabaseRepo {
-	return &databaseRepo{}
+type databaseRepo struct {
+	databaseServer biz.DatabaseServerRepo
 }

-func (d databaseRepo) Count() (int64, error) {
+func NewDatabaseRepo() biz.DatabaseRepo {
+	return &databaseRepo{
+		databaseServer: NewDatabaseServerRepo(),
+	}
+}
+
+func (r databaseRepo) Count() (int64, error) {
 	var count int64
 	if err := app.Orm.Model(&biz.Database{}).Count(&count).Error; err != nil {
 		return 0, err
@@ -21,14 +28,14 @@ func (d databaseRepo) Count() (int64, error) {
 	return count, nil
 }

-func (d databaseRepo) List(page, limit uint) ([]*biz.Database, int64, error) {
+func (r databaseRepo) List(page, limit uint) ([]*biz.Database, int64, error) {
 	var database []*biz.Database
 	var total int64
 	err := app.Orm.Model(&biz.Database{}).Order("id desc").Count(&total).Offset(int((page - 1) * limit)).Limit(int(limit)).Find(&database).Error
 	return database, total, err
 }

-func (d databaseRepo) Get(id uint) (*biz.Database, error) {
+func (r databaseRepo) Get(id uint) (*biz.Database, error) {
 	database := new(biz.Database)
 	if err := app.Orm.Where("id = ?", id).First(database).Error; err != nil {
 		return nil, err
@@ -37,7 +44,43 @@ func (d databaseRepo) Get(id uint) (*biz.Database, error) {
 	return database, nil
 }

-func (d databaseRepo) Create(req *request.DatabaseCreate) error {
+func (r databaseRepo) Create(req *request.DatabaseCreate) error {
+	server, err := r.databaseServer.Get(req.ServerID)
+	if err != nil {
+		return err
+	}
+
+	switch server.Type {
+	case biz.DatabaseTypeMysql:
+		mysql, err := db.NewMySQL(server.Username, server.Password, fmt.Sprintf("%s:%d", server.Host, server.Port))
+		if err != nil {
+			return err
+		}
+		if err = mysql.UserCreate(req.Username, req.Password); 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
+		}
+	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 err = postgres.DatabaseCreate(req.Name); err != nil {
+			return err
+		}
+		if err = postgres.PrivilegesGrant(req.Username, req.Name); err != nil {
+			return err
+		}
+	}
+
 	database := &biz.Database{
 		Name:     req.Name,
 		Username: req.Username,
@@ -50,7 +93,7 @@ func (d databaseRepo) Create(req *request.DatabaseCreate) error {
 	return app.Orm.Create(database).Error
 }

-func (d databaseRepo) Update(req *request.DatabaseUpdate) error {
+func (r databaseRepo) Update(req *request.DatabaseUpdate) error {
 	database := &biz.Database{
 		Name:     req.Name,
 		Username: req.Username,
@@ -61,6 +104,6 @@ func (d databaseRepo) Update(req *request.DatabaseUpdate) error {
 	return app.Orm.Model(database).Where("id = ?", req.ID).Omit("ServerID").Updates(database).Error
 }

-func (d databaseRepo) Delete(id uint) error {
+func (r databaseRepo) Delete(id uint) error {
 	return app.Orm.Delete(&biz.Database{}, id).Error
 }
--- a/internal/data/database_server.go
+++ b/internal/data/database_server.go
@@ -18,7 +18,7 @@ func NewDatabaseServerRepo() biz.DatabaseServerRepo {
 	return &databaseServerRepo{}
 }

-func (d databaseServerRepo) Count() (int64, error) {
+func (r databaseServerRepo) Count() (int64, error) {
 	var count int64
 	if err := app.Orm.Model(&biz.DatabaseServer{}).Count(&count).Error; err != nil {
 		return 0, err
@@ -27,14 +27,14 @@ func (d databaseServerRepo) Count() (int64, error) {
 	return count, nil
 }

-func (d databaseServerRepo) List(page, limit uint) ([]*biz.DatabaseServer, int64, error) {
+func (r databaseServerRepo) List(page, limit uint) ([]*biz.DatabaseServer, int64, error) {
 	var databaseServer []*biz.DatabaseServer
 	var total int64
 	err := app.Orm.Model(&biz.DatabaseServer{}).Order("id desc").Count(&total).Offset(int((page - 1) * limit)).Limit(int(limit)).Find(&databaseServer).Error
 	return databaseServer, total, err
 }

-func (d databaseServerRepo) Get(id uint) (*biz.DatabaseServer, error) {
+func (r databaseServerRepo) Get(id uint) (*biz.DatabaseServer, error) {
 	databaseServer := new(biz.DatabaseServer)
 	if err := app.Orm.Where("id = ?", id).First(databaseServer).Error; err != nil {
 		return nil, err
@@ -43,14 +43,14 @@ func (d databaseServerRepo) Get(id uint) (*biz.DatabaseServer, error) {
 	return databaseServer, nil
 }

-func (d databaseServerRepo) Create(req *request.DatabaseServerCreate) error {
+func (r databaseServerRepo) Create(req *request.DatabaseServerCreate) error {
 	switch biz.DatabaseType(req.Type) {
 	case biz.DatabaseTypeMysql:
 		if _, err := db.NewMySQL(req.Username, req.Password, fmt.Sprintf("%s:%d", req.Host, req.Port)); err != nil {
 			return err
 		}
 	case biz.DatabaseTypePostgresql:
-		if _, err := db.NewPostgres(req.Username, req.Password, req.Host, req.Port, ""); err != nil {
+		if _, err := db.NewPostgres(req.Username, req.Password, req.Host, req.Port); err != nil {
 			return err
 		}
 	case biz.DatabaseTypeRedis:
@@ -73,18 +73,18 @@ func (d databaseServerRepo) Create(req *request.DatabaseServerCreate) error {
 	return app.Orm.Create(databaseServer).Error
 }

-func (d databaseServerRepo) Update(req *request.DatabaseServerUpdate) error {
+func (r databaseServerRepo) Update(req *request.DatabaseServerUpdate) error {
 	switch biz.DatabaseType(req.Type) {
 	case biz.DatabaseTypeMysql:
-		if _, err := db.NewMySQL(req.Username, req.Password, fmt.Sprintf("%s:%d", req.Host, req.Port)); err != nil {
+		if _, err := db.NewMySQL(req.Username, req.Password, fmt.Sprintf("%s:%r", req.Host, req.Port)); err != nil {
 			return err
 		}
 	case biz.DatabaseTypePostgresql:
-		if _, err := db.NewPostgres(req.Username, req.Password, req.Host, req.Port, ""); err != nil {
+		if _, err := db.NewPostgres(req.Username, req.Password, req.Host, req.Port); err != nil {
 			return err
 		}
 	case biz.DatabaseTypeRedis:
-		if _, err := db.NewRedis(req.Username, req.Password, fmt.Sprintf("%s:%d", req.Host, req.Port)); err != nil {
+		if _, err := db.NewRedis(req.Username, req.Password, fmt.Sprintf("%s:%r", req.Host, req.Port)); err != nil {
 			return err
 		}

@@ -101,7 +101,7 @@ func (d databaseServerRepo) Update(req *request.DatabaseServerUpdate) error {
 	}).Error
 }

-func (d databaseServerRepo) Delete(id uint) error {
+func (r databaseServerRepo) Delete(id uint) error {
 	ds := new(biz.DatabaseServer)
 	if err := app.Orm.Where("id = ?", id).First(ds).Error; err != nil {
 		return err
@@ -113,3 +113,46 @@ func (d databaseServerRepo) Delete(id uint) error {

 	return app.Orm.Delete(&biz.DatabaseServer{}, id).Error
 }
+
+func (r databaseServerRepo) Sync(id uint) error {
+	/*server, err := r.Get(id)
+	if err != nil {
+		return err
+	}
+
+	switch server.Type {
+	case biz.DatabaseTypeMysql:
+		mysql, err := db.NewMySQL(server.Username, server.Password, fmt.Sprintf("%s:%d", server.Host, server.Port))
+		if err != nil {
+			return err
+		}
+		databases, err := mysql.Databases()
+		if err != nil {
+			return err
+		}
+		for database := range slices.Values(databases) {
+			db := &biz.Database{
+				Name:     database.Name,
+				Username: server.Username,
+				Password: server.Password,
+				ServerID: server.ID,
+				Status:   biz.DatabaseStatusInvalid,
+			}
+			if err := app.Orm.Where("name = ? AND server_id = ?", database.Name, server.ID).First(db).Error; err != nil {
+				app.Orm.Create(db)
+			}
+		}
+
+	case biz.DatabaseTypePostgresql:
+		postgres, err := db.NewPostgres(server.Username, server.Password, server.Host, server.Port)
+		if err != nil {
+			return err
+		}
+		databases, err := postgres.Databases()
+		if err != nil {
+			return err
+		}
+	}*/
+
+	return nil
+}
--- a/internal/data/website.go
+++ b/internal/data/website.go
@@ -307,10 +307,10 @@ func (r *websiteRepo) Create(req *request.WebsiteCreate) (*biz.Website, error) {
 		if err != nil {
 			return nil, err
 		}
-		if err = mysql.DatabaseCreate(req.DBName); err != nil {
+		if err = mysql.UserCreate(req.DBUser, req.DBPassword); err != nil {
 			return nil, err
 		}
-		if err = mysql.UserCreate(req.DBUser, req.DBPassword); err != nil {
+		if err = mysql.DatabaseCreate(req.DBName); err != nil {
 			return nil, err
 		}
 		if err = mysql.PrivilegesGrant(req.DBUser, req.DBName); err != nil {
@@ -318,20 +318,17 @@ func (r *websiteRepo) Create(req *request.WebsiteCreate) (*biz.Website, error) {
 		}
 	}
 	if req.DB && req.DBType == "postgresql" {
-		postgres, err := db.NewPostgres("postgres", "", "127.0.0.1", 5432, fmt.Sprintf("%s/server/postgresql/data/pg_hba.conf", app.Root))
+		postgres, err := db.NewPostgres("postgres", "", "127.0.0.1", 5432)
 		if err != nil {
 			return nil, err
 		}
-		if err = postgres.DatabaseCreate(req.DBName); err != nil {
-			return nil, err
-		}
 		if err = postgres.UserCreate(req.DBUser, req.DBPassword); err != nil {
 			return nil, err
 		}
-		if err = postgres.PrivilegesGrant(req.DBUser, req.DBName); err != nil {
+		if err = postgres.DatabaseCreate(req.DBName); err != nil {
 			return nil, err
 		}
-		if err = postgres.HostAdd(req.DBName, req.DBUser, "127.0.0.1/32"); err != nil {
+		if err = postgres.PrivilegesGrant(req.DBUser, req.DBName); err != nil {
 			return nil, err
 		}
 	}
@@ -526,13 +523,14 @@ func (r *websiteRepo) Delete(req *request.WebsiteDelete) error {
 		if err != nil {
 			return err
 		}
-		mysql, err := db.NewMySQL("root", rootPassword, "/tmp/mysql.sock", "unix")
-		if err == nil {
-			_ = mysql.DatabaseDrop(website.Name)
+		if mysql, err := db.NewMySQL("root", rootPassword, "/tmp/mysql.sock", "unix"); err == nil {
 			_ = mysql.UserDrop(website.Name)
+			_ = mysql.DatabaseDrop(website.Name)
+		}
+		if postgres, err := db.NewPostgres("postgres", "", "127.0.0.1", 5432); err == nil {
+			_ = postgres.UserDrop(website.Name)
+			_ = postgres.DatabaseDrop(website.Name)
 		}
-		_, _ = shell.Execf(`echo "DROP DATABASE IF EXISTS '%s';" | su - postgres -c "psql"`, website.Name)
-		_, _ = shell.Execf(`echo "DROP USER IF EXISTS '%s';" | su - postgres -c "psql"`, website.Name)
 	}

 	if err := app.Orm.Delete(website).Error; err != nil {