From 1ed79a86b28597fdead07590e68bc30b1b033a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Thu, 14 Dec 2023 02:09:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=88=B0=E6=A0=B9=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/console/commands/cert_renew.go | 2 +- app/console/commands/monitoring.go | 2 +- app/console/commands/panel.go | 6 +-- app/http/controllers/asset_controller.go | 4 +- app/http/controllers/cert_controller.go | 4 +- app/http/controllers/cron_controller.go | 4 +- app/http/controllers/info_controller.go | 4 +- app/http/controllers/monitor_controller.go | 4 +- app/http/controllers/plugin_controller.go | 4 +- .../plugins/fail2ban_controller.go | 4 +- .../controllers/plugins/mysql57_controller.go | 4 +- .../controllers/plugins/mysql80_controller.go | 4 +- .../controllers/plugins/php74_controller.go | 4 +- .../controllers/plugins/php80_controller.go | 4 +- .../controllers/plugins/php81_controller.go | 4 +- .../controllers/plugins/php82_controller.go | 4 +- .../controllers/plugins/php83_controller.go | 4 +- .../plugins/postgresql15_controller.go | 4 +- .../plugins/postgresql16_controller.go | 4 +- .../controllers/plugins/rsync_controller.go | 4 +- .../controllers/plugins/s3fs_controller.go | 4 +- app/http/controllers/setting_controller.go | 4 +- app/http/controllers/ssh_controller.go | 4 +- app/http/controllers/website_controller.go | 4 +- app/http/middleware/must_install.go | 3 +- {app/internal => internal}/backup.go | 0 {app/internal => internal}/cert.go | 0 {app/internal => internal}/cron.go | 0 {app/internal => internal}/plugin.go | 0 .../plugins/fail2ban/fail2ban.go | 0 {app => internal}/plugins/mysql57/mysql57.go | 0 {app => internal}/plugins/mysql80/mysql80.go | 0 .../plugins/openresty/openresty.go | 0 {app => internal}/plugins/php74/php74.go | 0 {app => internal}/plugins/php80/php80.go | 0 {app => internal}/plugins/php81/php81.go | 0 {app => internal}/plugins/php82/php82.go | 0 {app => internal}/plugins/php83/php83.go | 0 .../plugins/phpmyadmin/phpmyadmin.go | 0 .../plugins/postgresql15/postgresql15.go | 0 .../plugins/postgresql16/postgresql16.go | 0 .../plugins/pureftpd/pureftpd.go | 0 {app => internal}/plugins/redis/redis.go | 0 {app => internal}/plugins/rsync/rsync.go | 0 {app => internal}/plugins/s3fs/s3fs.go | 0 .../plugins/supervisor/supervisor.go | 0 {app => internal}/plugins/toolbox/toolbox.go | 0 {app/internal => internal}/services/backup.go | 40 +++++++++---------- {app/internal => internal}/services/cert.go | 0 {app/internal => internal}/services/cron.go | 0 {app/internal => internal}/services/plugin.go | 38 +++++++++--------- .../internal => internal}/services/setting.go | 0 {app/internal => internal}/services/task.go | 0 {app/internal => internal}/services/user.go | 0 .../internal => internal}/services/website.go | 18 ++++----- {app/internal => internal}/setting.go | 0 {app/internal => internal}/task.go | 0 {app/internal => internal}/user.go | 0 {app/internal => internal}/website.go | 0 tests/setting/setting_test.go | 5 ++- 60 files changed, 100 insertions(+), 98 deletions(-) rename {app/internal => internal}/backup.go (100%) rename {app/internal => internal}/cert.go (100%) rename {app/internal => internal}/cron.go (100%) rename {app/internal => internal}/plugin.go (100%) rename {app => internal}/plugins/fail2ban/fail2ban.go (100%) rename {app => internal}/plugins/mysql57/mysql57.go (100%) rename {app => internal}/plugins/mysql80/mysql80.go (100%) rename {app => internal}/plugins/openresty/openresty.go (100%) rename {app => internal}/plugins/php74/php74.go (100%) rename {app => internal}/plugins/php80/php80.go (100%) rename {app => internal}/plugins/php81/php81.go (100%) rename {app => internal}/plugins/php82/php82.go (100%) rename {app => internal}/plugins/php83/php83.go (100%) rename {app => internal}/plugins/phpmyadmin/phpmyadmin.go (100%) rename {app => internal}/plugins/postgresql15/postgresql15.go (100%) rename {app => internal}/plugins/postgresql16/postgresql16.go (100%) rename {app => internal}/plugins/pureftpd/pureftpd.go (100%) rename {app => internal}/plugins/redis/redis.go (100%) rename {app => internal}/plugins/rsync/rsync.go (100%) rename {app => internal}/plugins/s3fs/s3fs.go (100%) rename {app => internal}/plugins/supervisor/supervisor.go (100%) rename {app => internal}/plugins/toolbox/toolbox.go (100%) rename {app/internal => internal}/services/backup.go (89%) rename {app/internal => internal}/services/cert.go (100%) rename {app/internal => internal}/services/cron.go (100%) rename {app/internal => internal}/services/plugin.go (91%) rename {app/internal => internal}/services/setting.go (100%) rename {app/internal => internal}/services/task.go (100%) rename {app/internal => internal}/services/user.go (100%) rename {app/internal => internal}/services/website.go (97%) rename {app/internal => internal}/setting.go (100%) rename {app/internal => internal}/task.go (100%) rename {app/internal => internal}/user.go (100%) rename {app/internal => internal}/website.go (100%) diff --git a/app/console/commands/cert_renew.go b/app/console/commands/cert_renew.go index 4db81123..0cd95f7f 100644 --- a/app/console/commands/cert_renew.go +++ b/app/console/commands/cert_renew.go @@ -8,9 +8,9 @@ import ( "github.com/goravel/framework/contracts/console/command" "github.com/goravel/framework/facades" "github.com/goravel/framework/support/carbon" - "panel/app/internal/services" "panel/app/models" + "panel/internal/services" ) type CertRenew struct { diff --git a/app/console/commands/monitoring.go b/app/console/commands/monitoring.go index 6102154d..8b080037 100644 --- a/app/console/commands/monitoring.go +++ b/app/console/commands/monitoring.go @@ -9,9 +9,9 @@ import ( "github.com/goravel/framework/facades" "github.com/goravel/framework/support/carbon" "github.com/spf13/cast" - "panel/app/internal/services" "panel/app/models" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/console/commands/panel.go b/app/console/commands/panel.go index 92f27eae..d96bc77a 100644 --- a/app/console/commands/panel.go +++ b/app/console/commands/panel.go @@ -13,9 +13,9 @@ import ( "github.com/goravel/framework/facades" "github.com/goravel/framework/support/carbon" "github.com/spf13/cast" - services2 "panel/app/internal/services" "panel/app/models" + "panel/internal/services" "panel/pkg/tools" ) @@ -69,7 +69,7 @@ func (receiver *Panel) Handle(ctx console.Context) error { return nil } - user := services2.NewUserImpl() + user := services.NewUserImpl() _, err = user.Create("admin", hash) if err != nil { color.Redln("创建管理员失败") @@ -276,7 +276,7 @@ func (receiver *Panel) Handle(ctx console.Context) error { color.Greenln("|-备份成功") case "mysql": - rootPassword := services2.NewSettingImpl().Get(models.SettingKeyMysqlRootPassword) + rootPassword := services.NewSettingImpl().Get(models.SettingKeyMysqlRootPassword) backupFile := name + "_" + carbon.Now().ToShortDateTimeString() + ".sql" err := os.Setenv("MYSQL_PWD", rootPassword) diff --git a/app/http/controllers/asset_controller.go b/app/http/controllers/asset_controller.go index f12980eb..71f75671 100644 --- a/app/http/controllers/asset_controller.go +++ b/app/http/controllers/asset_controller.go @@ -7,8 +7,8 @@ import ( "github.com/goravel/framework/contracts/http" "github.com/goravel/framework/facades" - "panel/app/internal" - "panel/app/internal/services" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/cert_controller.go b/app/http/controllers/cert_controller.go index 7945087e..970b5f8b 100644 --- a/app/http/controllers/cert_controller.go +++ b/app/http/controllers/cert_controller.go @@ -6,9 +6,9 @@ import ( requests "panel/app/http/requests/cert" commonrequests "panel/app/http/requests/common" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/acme" ) diff --git a/app/http/controllers/cron_controller.go b/app/http/controllers/cron_controller.go index ff2b8ae8..014dfd3e 100644 --- a/app/http/controllers/cron_controller.go +++ b/app/http/controllers/cron_controller.go @@ -9,9 +9,9 @@ import ( "github.com/goravel/framework/support/carbon" "github.com/spf13/cast" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/info_controller.go b/app/http/controllers/info_controller.go index b0a4f6f5..fd2037d6 100644 --- a/app/http/controllers/info_controller.go +++ b/app/http/controllers/info_controller.go @@ -9,9 +9,9 @@ import ( "github.com/goravel/framework/contracts/http" "github.com/goravel/framework/facades" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/monitor_controller.go b/app/http/controllers/monitor_controller.go index e0ac248d..a4ed29f5 100644 --- a/app/http/controllers/monitor_controller.go +++ b/app/http/controllers/monitor_controller.go @@ -8,9 +8,9 @@ import ( "github.com/goravel/framework/support/carbon" "github.com/spf13/cast" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" ) type MonitorController struct { diff --git a/app/http/controllers/plugin_controller.go b/app/http/controllers/plugin_controller.go index 1f0e59a1..9f9a4a55 100644 --- a/app/http/controllers/plugin_controller.go +++ b/app/http/controllers/plugin_controller.go @@ -6,9 +6,9 @@ import ( "github.com/goravel/framework/contracts/http" "github.com/goravel/framework/facades" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" ) type PluginController struct { diff --git a/app/http/controllers/plugins/fail2ban_controller.go b/app/http/controllers/plugins/fail2ban_controller.go index 6e7d0933..0c25abc7 100644 --- a/app/http/controllers/plugins/fail2ban_controller.go +++ b/app/http/controllers/plugins/fail2ban_controller.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/cast" "panel/app/http/controllers" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/plugins/mysql57_controller.go b/app/http/controllers/plugins/mysql57_controller.go index eb54bb79..f08ff42a 100644 --- a/app/http/controllers/plugins/mysql57_controller.go +++ b/app/http/controllers/plugins/mysql57_controller.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/cast" "panel/app/http/controllers" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/plugins/mysql80_controller.go b/app/http/controllers/plugins/mysql80_controller.go index dabde79d..09444d8d 100644 --- a/app/http/controllers/plugins/mysql80_controller.go +++ b/app/http/controllers/plugins/mysql80_controller.go @@ -7,11 +7,11 @@ import ( "github.com/goravel/framework/contracts/http" "github.com/spf13/cast" - "panel/app/internal" - "panel/app/internal/services" "panel/app/http/controllers" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/plugins/php74_controller.go b/app/http/controllers/plugins/php74_controller.go index 46c3ed4e..0bb392e5 100644 --- a/app/http/controllers/plugins/php74_controller.go +++ b/app/http/controllers/plugins/php74_controller.go @@ -11,9 +11,9 @@ import ( "github.com/imroc/req/v3" "panel/app/http/controllers" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/plugins/php80_controller.go b/app/http/controllers/plugins/php80_controller.go index 5bd43b1c..1329c3c9 100644 --- a/app/http/controllers/plugins/php80_controller.go +++ b/app/http/controllers/plugins/php80_controller.go @@ -11,9 +11,9 @@ import ( "github.com/imroc/req/v3" "panel/app/http/controllers" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/plugins/php81_controller.go b/app/http/controllers/plugins/php81_controller.go index 0e03b787..d23592de 100644 --- a/app/http/controllers/plugins/php81_controller.go +++ b/app/http/controllers/plugins/php81_controller.go @@ -11,9 +11,9 @@ import ( "github.com/imroc/req/v3" "panel/app/http/controllers" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/plugins/php82_controller.go b/app/http/controllers/plugins/php82_controller.go index 7518b9bb..c685eda8 100644 --- a/app/http/controllers/plugins/php82_controller.go +++ b/app/http/controllers/plugins/php82_controller.go @@ -11,9 +11,9 @@ import ( "github.com/imroc/req/v3" "panel/app/http/controllers" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/plugins/php83_controller.go b/app/http/controllers/plugins/php83_controller.go index a93bf2d0..c632a4c4 100644 --- a/app/http/controllers/plugins/php83_controller.go +++ b/app/http/controllers/plugins/php83_controller.go @@ -11,9 +11,9 @@ import ( "github.com/imroc/req/v3" "panel/app/http/controllers" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/plugins/postgresql15_controller.go b/app/http/controllers/plugins/postgresql15_controller.go index 86976278..2503db66 100644 --- a/app/http/controllers/plugins/postgresql15_controller.go +++ b/app/http/controllers/plugins/postgresql15_controller.go @@ -7,9 +7,9 @@ import ( "github.com/goravel/framework/support/carbon" "panel/app/http/controllers" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/plugins/postgresql16_controller.go b/app/http/controllers/plugins/postgresql16_controller.go index 5beb8829..0978ab20 100644 --- a/app/http/controllers/plugins/postgresql16_controller.go +++ b/app/http/controllers/plugins/postgresql16_controller.go @@ -7,9 +7,9 @@ import ( "github.com/goravel/framework/support/carbon" "panel/app/http/controllers" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/plugins/rsync_controller.go b/app/http/controllers/plugins/rsync_controller.go index bf79991d..542c5000 100644 --- a/app/http/controllers/plugins/rsync_controller.go +++ b/app/http/controllers/plugins/rsync_controller.go @@ -9,8 +9,8 @@ import ( "panel/app/http/controllers" commonrequests "panel/app/http/requests/common" requests "panel/app/http/requests/plugins/rsync" - "panel/app/internal" - "panel/app/internal/services" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/plugins/s3fs_controller.go b/app/http/controllers/plugins/s3fs_controller.go index cb3aed92..56477cfc 100644 --- a/app/http/controllers/plugins/s3fs_controller.go +++ b/app/http/controllers/plugins/s3fs_controller.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cast" "panel/app/http/controllers" - "panel/app/internal" - "panel/app/internal/services" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/setting_controller.go b/app/http/controllers/setting_controller.go index 341f5827..10071415 100644 --- a/app/http/controllers/setting_controller.go +++ b/app/http/controllers/setting_controller.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cast" requests "panel/app/http/requests/setting" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/controllers/ssh_controller.go b/app/http/controllers/ssh_controller.go index ab3bf79a..1d41aab0 100644 --- a/app/http/controllers/ssh_controller.go +++ b/app/http/controllers/ssh_controller.go @@ -13,9 +13,9 @@ import ( "github.com/spf13/cast" "github.com/valyala/fasthttp" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/ssh" ) diff --git a/app/http/controllers/website_controller.go b/app/http/controllers/website_controller.go index 6f873d48..85738a14 100644 --- a/app/http/controllers/website_controller.go +++ b/app/http/controllers/website_controller.go @@ -10,9 +10,9 @@ import ( commonrequests "panel/app/http/requests/common" requests "panel/app/http/requests/website" - "panel/app/internal" - "panel/app/internal/services" "panel/app/models" + "panel/internal" + "panel/internal/services" "panel/pkg/tools" ) diff --git a/app/http/middleware/must_install.go b/app/http/middleware/must_install.go index 0f16552f..691cfe7a 100644 --- a/app/http/middleware/must_install.go +++ b/app/http/middleware/must_install.go @@ -5,7 +5,8 @@ import ( "sync" "github.com/goravel/framework/contracts/http" - "panel/app/internal/services" + + "panel/internal/services" ) // MustInstall 确保已安装插件 diff --git a/app/internal/backup.go b/internal/backup.go similarity index 100% rename from app/internal/backup.go rename to internal/backup.go diff --git a/app/internal/cert.go b/internal/cert.go similarity index 100% rename from app/internal/cert.go rename to internal/cert.go diff --git a/app/internal/cron.go b/internal/cron.go similarity index 100% rename from app/internal/cron.go rename to internal/cron.go diff --git a/app/internal/plugin.go b/internal/plugin.go similarity index 100% rename from app/internal/plugin.go rename to internal/plugin.go diff --git a/app/plugins/fail2ban/fail2ban.go b/internal/plugins/fail2ban/fail2ban.go similarity index 100% rename from app/plugins/fail2ban/fail2ban.go rename to internal/plugins/fail2ban/fail2ban.go diff --git a/app/plugins/mysql57/mysql57.go b/internal/plugins/mysql57/mysql57.go similarity index 100% rename from app/plugins/mysql57/mysql57.go rename to internal/plugins/mysql57/mysql57.go diff --git a/app/plugins/mysql80/mysql80.go b/internal/plugins/mysql80/mysql80.go similarity index 100% rename from app/plugins/mysql80/mysql80.go rename to internal/plugins/mysql80/mysql80.go diff --git a/app/plugins/openresty/openresty.go b/internal/plugins/openresty/openresty.go similarity index 100% rename from app/plugins/openresty/openresty.go rename to internal/plugins/openresty/openresty.go diff --git a/app/plugins/php74/php74.go b/internal/plugins/php74/php74.go similarity index 100% rename from app/plugins/php74/php74.go rename to internal/plugins/php74/php74.go diff --git a/app/plugins/php80/php80.go b/internal/plugins/php80/php80.go similarity index 100% rename from app/plugins/php80/php80.go rename to internal/plugins/php80/php80.go diff --git a/app/plugins/php81/php81.go b/internal/plugins/php81/php81.go similarity index 100% rename from app/plugins/php81/php81.go rename to internal/plugins/php81/php81.go diff --git a/app/plugins/php82/php82.go b/internal/plugins/php82/php82.go similarity index 100% rename from app/plugins/php82/php82.go rename to internal/plugins/php82/php82.go diff --git a/app/plugins/php83/php83.go b/internal/plugins/php83/php83.go similarity index 100% rename from app/plugins/php83/php83.go rename to internal/plugins/php83/php83.go diff --git a/app/plugins/phpmyadmin/phpmyadmin.go b/internal/plugins/phpmyadmin/phpmyadmin.go similarity index 100% rename from app/plugins/phpmyadmin/phpmyadmin.go rename to internal/plugins/phpmyadmin/phpmyadmin.go diff --git a/app/plugins/postgresql15/postgresql15.go b/internal/plugins/postgresql15/postgresql15.go similarity index 100% rename from app/plugins/postgresql15/postgresql15.go rename to internal/plugins/postgresql15/postgresql15.go diff --git a/app/plugins/postgresql16/postgresql16.go b/internal/plugins/postgresql16/postgresql16.go similarity index 100% rename from app/plugins/postgresql16/postgresql16.go rename to internal/plugins/postgresql16/postgresql16.go diff --git a/app/plugins/pureftpd/pureftpd.go b/internal/plugins/pureftpd/pureftpd.go similarity index 100% rename from app/plugins/pureftpd/pureftpd.go rename to internal/plugins/pureftpd/pureftpd.go diff --git a/app/plugins/redis/redis.go b/internal/plugins/redis/redis.go similarity index 100% rename from app/plugins/redis/redis.go rename to internal/plugins/redis/redis.go diff --git a/app/plugins/rsync/rsync.go b/internal/plugins/rsync/rsync.go similarity index 100% rename from app/plugins/rsync/rsync.go rename to internal/plugins/rsync/rsync.go diff --git a/app/plugins/s3fs/s3fs.go b/internal/plugins/s3fs/s3fs.go similarity index 100% rename from app/plugins/s3fs/s3fs.go rename to internal/plugins/s3fs/s3fs.go diff --git a/app/plugins/supervisor/supervisor.go b/internal/plugins/supervisor/supervisor.go similarity index 100% rename from app/plugins/supervisor/supervisor.go rename to internal/plugins/supervisor/supervisor.go diff --git a/app/plugins/toolbox/toolbox.go b/internal/plugins/toolbox/toolbox.go similarity index 100% rename from app/plugins/toolbox/toolbox.go rename to internal/plugins/toolbox/toolbox.go diff --git a/app/internal/services/backup.go b/internal/services/backup.go similarity index 89% rename from app/internal/services/backup.go rename to internal/services/backup.go index 12c70214..4e8e78da 100644 --- a/app/internal/services/backup.go +++ b/internal/services/backup.go @@ -8,14 +8,14 @@ import ( "strings" "github.com/goravel/framework/support/carbon" + internal2 "panel/internal" - "panel/app/internal" "panel/app/models" "panel/pkg/tools" ) type BackupImpl struct { - setting internal.Setting + setting internal2.Setting } func NewBackupImpl() *BackupImpl { @@ -25,30 +25,30 @@ func NewBackupImpl() *BackupImpl { } // WebsiteList 网站备份列表 -func (s *BackupImpl) WebsiteList() ([]internal.BackupFile, error) { +func (s *BackupImpl) WebsiteList() ([]internal2.BackupFile, error) { backupPath := s.setting.Get(models.SettingKeyBackupPath) if len(backupPath) == 0 { - return []internal.BackupFile{}, nil + return []internal2.BackupFile{}, nil } backupPath += "/website" if !tools.Exists(backupPath) { if err := tools.Mkdir(backupPath, 0644); err != nil { - return []internal.BackupFile{}, err + return []internal2.BackupFile{}, err } } files, err := os.ReadDir(backupPath) if err != nil { - return []internal.BackupFile{}, err + return []internal2.BackupFile{}, err } - var backupList []internal.BackupFile + var backupList []internal2.BackupFile for _, file := range files { info, err := file.Info() if err != nil { continue } - backupList = append(backupList, internal.BackupFile{ + backupList = append(backupList, internal2.BackupFile{ Name: file.Name(), Size: tools.FormatBytes(float64(info.Size())), }) @@ -115,30 +115,30 @@ func (s *BackupImpl) WebsiteRestore(website models.Website, backupFile string) e } // MysqlList MySQL备份列表 -func (s *BackupImpl) MysqlList() ([]internal.BackupFile, error) { +func (s *BackupImpl) MysqlList() ([]internal2.BackupFile, error) { backupPath := s.setting.Get(models.SettingKeyBackupPath) if len(backupPath) == 0 { - return []internal.BackupFile{}, nil + return []internal2.BackupFile{}, nil } backupPath += "/mysql" if !tools.Exists(backupPath) { if err := tools.Mkdir(backupPath, 0644); err != nil { - return []internal.BackupFile{}, err + return []internal2.BackupFile{}, err } } files, err := os.ReadDir(backupPath) if err != nil { - return []internal.BackupFile{}, err + return []internal2.BackupFile{}, err } - var backupList []internal.BackupFile + var backupList []internal2.BackupFile for _, file := range files { info, err := file.Info() if err != nil { continue } - backupList = append(backupList, internal.BackupFile{ + backupList = append(backupList, internal2.BackupFile{ Name: file.Name(), Size: tools.FormatBytes(float64(info.Size())), }) @@ -228,30 +228,30 @@ func (s *BackupImpl) MysqlRestore(database string, backupFile string) error { } // PostgresqlList PostgreSQL备份列表 -func (s *BackupImpl) PostgresqlList() ([]internal.BackupFile, error) { +func (s *BackupImpl) PostgresqlList() ([]internal2.BackupFile, error) { backupPath := s.setting.Get(models.SettingKeyBackupPath) if len(backupPath) == 0 { - return []internal.BackupFile{}, nil + return []internal2.BackupFile{}, nil } backupPath += "/postgresql" if !tools.Exists(backupPath) { if err := tools.Mkdir(backupPath, 0644); err != nil { - return []internal.BackupFile{}, err + return []internal2.BackupFile{}, err } } files, err := os.ReadDir(backupPath) if err != nil { - return []internal.BackupFile{}, err + return []internal2.BackupFile{}, err } - var backupList []internal.BackupFile + var backupList []internal2.BackupFile for _, file := range files { info, err := file.Info() if err != nil { continue } - backupList = append(backupList, internal.BackupFile{ + backupList = append(backupList, internal2.BackupFile{ Name: file.Name(), Size: tools.FormatBytes(float64(info.Size())), }) diff --git a/app/internal/services/cert.go b/internal/services/cert.go similarity index 100% rename from app/internal/services/cert.go rename to internal/services/cert.go diff --git a/app/internal/services/cron.go b/internal/services/cron.go similarity index 100% rename from app/internal/services/cron.go rename to internal/services/cron.go diff --git a/app/internal/services/plugin.go b/internal/services/plugin.go similarity index 91% rename from app/internal/services/plugin.go rename to internal/services/plugin.go index d6baae0d..29a91169 100644 --- a/app/internal/services/plugin.go +++ b/internal/services/plugin.go @@ -3,27 +3,27 @@ package services import ( "github.com/goravel/framework/facades" + "panel/internal" - "panel/app/internal" "panel/app/models" - "panel/app/plugins/fail2ban" - "panel/app/plugins/mysql57" - "panel/app/plugins/mysql80" - "panel/app/plugins/openresty" - "panel/app/plugins/php74" - "panel/app/plugins/php80" - "panel/app/plugins/php81" - "panel/app/plugins/php82" - "panel/app/plugins/php83" - "panel/app/plugins/phpmyadmin" - "panel/app/plugins/postgresql15" - "panel/app/plugins/postgresql16" - "panel/app/plugins/pureftpd" - "panel/app/plugins/redis" - "panel/app/plugins/rsync" - "panel/app/plugins/s3fs" - "panel/app/plugins/supervisor" - "panel/app/plugins/toolbox" + "panel/internal/plugins/fail2ban" + "panel/internal/plugins/mysql57" + "panel/internal/plugins/mysql80" + "panel/internal/plugins/openresty" + "panel/internal/plugins/php74" + "panel/internal/plugins/php80" + "panel/internal/plugins/php81" + "panel/internal/plugins/php82" + "panel/internal/plugins/php83" + "panel/internal/plugins/phpmyadmin" + "panel/internal/plugins/postgresql15" + "panel/internal/plugins/postgresql16" + "panel/internal/plugins/pureftpd" + "panel/internal/plugins/redis" + "panel/internal/plugins/rsync" + "panel/internal/plugins/s3fs" + "panel/internal/plugins/supervisor" + "panel/internal/plugins/toolbox" ) type PluginImpl struct { diff --git a/app/internal/services/setting.go b/internal/services/setting.go similarity index 100% rename from app/internal/services/setting.go rename to internal/services/setting.go diff --git a/app/internal/services/task.go b/internal/services/task.go similarity index 100% rename from app/internal/services/task.go rename to internal/services/task.go diff --git a/app/internal/services/user.go b/internal/services/user.go similarity index 100% rename from app/internal/services/user.go rename to internal/services/user.go diff --git a/app/internal/services/website.go b/internal/services/website.go similarity index 97% rename from app/internal/services/website.go rename to internal/services/website.go index e436fed8..78b526e7 100644 --- a/app/internal/services/website.go +++ b/internal/services/website.go @@ -13,14 +13,14 @@ import ( "github.com/goravel/framework/facades" "github.com/spf13/cast" requests "panel/app/http/requests/website" - "panel/app/internal" + internal2 "panel/internal" "panel/app/models" "panel/pkg/tools" ) type WebsiteImpl struct { - setting internal.Setting + setting internal2.Setting } func NewWebsiteImpl() *WebsiteImpl { @@ -41,7 +41,7 @@ func (r *WebsiteImpl) List(page, limit int) (int64, []models.Website, error) { } // Add 添加网站 -func (r *WebsiteImpl) Add(website internal.PanelWebsite) (models.Website, error) { +func (r *WebsiteImpl) Add(website internal2.PanelWebsite) (models.Website, error) { w := models.Website{ Name: website.Name, Status: website.Status, @@ -500,18 +500,18 @@ func (r *WebsiteImpl) Delete(id uint) error { } // GetConfig 获取网站配置 -func (r *WebsiteImpl) GetConfig(id uint) (internal.WebsiteSetting, error) { +func (r *WebsiteImpl) GetConfig(id uint) (internal2.WebsiteSetting, error) { var website models.Website if err := facades.Orm().Query().Where("id", id).First(&website); err != nil { - return internal.WebsiteSetting{}, err + return internal2.WebsiteSetting{}, err } config, err := tools.Read("/www/server/vhost/" + website.Name + ".conf") if err != nil { - return internal.WebsiteSetting{}, err + return internal2.WebsiteSetting{}, err } - var setting internal.WebsiteSetting + var setting internal2.WebsiteSetting setting.Name = website.Name setting.Path = website.Path setting.Ssl = website.Ssl @@ -613,10 +613,10 @@ func (r *WebsiteImpl) GetConfig(id uint) (internal.WebsiteSetting, error) { } // GetConfigByName 根据网站名称获取网站配置 -func (r *WebsiteImpl) GetConfigByName(name string) (internal.WebsiteSetting, error) { +func (r *WebsiteImpl) GetConfigByName(name string) (internal2.WebsiteSetting, error) { var website models.Website if err := facades.Orm().Query().Where("name", name).First(&website); err != nil { - return internal.WebsiteSetting{}, err + return internal2.WebsiteSetting{}, err } return r.GetConfig(website.ID) diff --git a/app/internal/setting.go b/internal/setting.go similarity index 100% rename from app/internal/setting.go rename to internal/setting.go diff --git a/app/internal/task.go b/internal/task.go similarity index 100% rename from app/internal/task.go rename to internal/task.go diff --git a/app/internal/user.go b/internal/user.go similarity index 100% rename from app/internal/user.go rename to internal/user.go diff --git a/app/internal/website.go b/internal/website.go similarity index 100% rename from app/internal/website.go rename to internal/website.go diff --git a/tests/setting/setting_test.go b/tests/setting/setting_test.go index 94c8c5c8..c20149b2 100644 --- a/tests/setting/setting_test.go +++ b/tests/setting/setting_test.go @@ -4,15 +4,16 @@ import ( "testing" "github.com/stretchr/testify/suite" - "panel/app/internal/services" + "panel/internal" + "panel/internal/services" "panel/tests" ) type SettingTestSuite struct { suite.Suite tests.TestCase - setting services.Setting + setting internal.Setting } func TestSettingTestSuite(t *testing.T) {