From 7ff084e5a84dfcd22a25853a650e6c25fda9978c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Sun, 23 Jun 2024 01:32:45 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84types=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/FUNDING.yml | 2 +- app/console/commands/cert_renew.go | 2 +- app/console/commands/monitoring.go | 2 +- app/console/commands/panel.go | 2 +- app/console/commands/panel_task.go | 2 +- app/http/controllers/controller.go | 3 ++- app/http/controllers/info_controller.go | 2 +- app/http/controllers/plugins/fail2ban_controller.go | 2 +- app/http/controllers/plugins/mysql_controller.go | 2 +- app/http/controllers/plugins/openresty_controller.go | 2 +- app/http/controllers/plugins/php_controller.go | 3 ++- app/http/controllers/plugins/postgresql_controller.go | 2 +- app/http/controllers/plugins/pureftpd_controller.go | 2 +- app/http/controllers/plugins/redis_controller.go | 2 +- app/http/controllers/plugins/rsync_controller.go | 2 +- app/http/controllers/plugins/s3fs_controller.go | 2 +- app/http/controllers/website_controller.go | 2 +- app/http/middleware/status.go | 2 +- app/http/requests/container/container_create.go | 2 +- app/http/requests/container/container_update.go | 2 +- app/http/requests/container/network_create.go | 2 +- app/http/requests/container/volume_create.go | 2 +- internal/backup.go | 2 +- internal/container.go | 2 +- internal/php.go | 4 +++- internal/plugin.go | 2 +- internal/services/backup.go | 2 +- internal/services/container.go | 2 +- internal/services/php.go | 2 +- internal/services/plugin.go | 2 +- internal/services/website.go | 2 +- internal/website.go | 2 +- pkg/shell/exec.go | 3 ++- pkg/ssh/turn.go | 1 + pkg/tools/tools.go | 4 ++-- {types => pkg/types}/backup.go | 0 {types => pkg/types}/common.go | 0 {types => pkg/types}/container.go | 0 {types => pkg/types}/fail2ban.go | 0 {types => pkg/types}/php.go | 0 {types => pkg/types}/plugin.go | 0 {types => pkg/types}/plugin_list.go | 0 {types => pkg/types}/pureftpd.go | 0 {types => pkg/types}/rsync.go | 0 {types => pkg/types}/s3fs.go | 0 {types => pkg/types}/status.go | 0 {types => pkg/types}/website.go | 0 47 files changed, 41 insertions(+), 35 deletions(-) rename {types => pkg/types}/backup.go (100%) rename {types => pkg/types}/common.go (100%) rename {types => pkg/types}/container.go (100%) rename {types => pkg/types}/fail2ban.go (100%) rename {types => pkg/types}/php.go (100%) rename {types => pkg/types}/plugin.go (100%) rename {types => pkg/types}/plugin_list.go (100%) rename {types => pkg/types}/pureftpd.go (100%) rename {types => pkg/types}/rsync.go (100%) rename {types => pkg/types}/s3fs.go (100%) rename {types => pkg/types}/status.go (100%) rename {types => pkg/types}/website.go (100%) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index d9b5214a5..04f0e8b4b 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1,4 @@ # These are supported funding model platforms open_collective: tnb -custom: ['https://afdian.net/a/TheTNB'] +custom: [ 'https://afdian.net/a/TheTNB' ] diff --git a/app/console/commands/cert_renew.go b/app/console/commands/cert_renew.go index 2b8dde032..8b36f26de 100644 --- a/app/console/commands/cert_renew.go +++ b/app/console/commands/cert_renew.go @@ -12,7 +12,7 @@ import ( "github.com/TheTNB/panel/app/models" "github.com/TheTNB/panel/internal/services" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) // CertRenew 证书续签 diff --git a/app/console/commands/monitoring.go b/app/console/commands/monitoring.go index 01d34cded..0a1b1e477 100644 --- a/app/console/commands/monitoring.go +++ b/app/console/commands/monitoring.go @@ -13,7 +13,7 @@ import ( "github.com/TheTNB/panel/app/models" "github.com/TheTNB/panel/internal/services" "github.com/TheTNB/panel/pkg/tools" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) // Monitoring 系统监控 diff --git a/app/console/commands/panel.go b/app/console/commands/panel.go index 7a5399238..d61073b75 100644 --- a/app/console/commands/panel.go +++ b/app/console/commands/panel.go @@ -22,7 +22,7 @@ import ( "github.com/TheTNB/panel/pkg/str" "github.com/TheTNB/panel/pkg/systemctl" "github.com/TheTNB/panel/pkg/tools" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) // Panel 面板命令行 diff --git a/app/console/commands/panel_task.go b/app/console/commands/panel_task.go index 0a9492c3d..a3efda825 100644 --- a/app/console/commands/panel_task.go +++ b/app/console/commands/panel_task.go @@ -10,7 +10,7 @@ import ( "github.com/TheTNB/panel/pkg/io" "github.com/TheTNB/panel/pkg/shell" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) // PanelTask 面板每日任务 diff --git a/app/http/controllers/controller.go b/app/http/controllers/controller.go index 04bcb4bd2..9b0519135 100644 --- a/app/http/controllers/controller.go +++ b/app/http/controllers/controller.go @@ -1,9 +1,10 @@ package controllers import ( - commonrequests "github.com/TheTNB/panel/app/http/requests/common" "github.com/goravel/framework/contracts/http" "github.com/goravel/framework/facades" + + commonrequests "github.com/TheTNB/panel/app/http/requests/common" ) // SuccessResponse 通用成功响应 diff --git a/app/http/controllers/info_controller.go b/app/http/controllers/info_controller.go index 5e4e1d4d0..9bd5be5a1 100644 --- a/app/http/controllers/info_controller.go +++ b/app/http/controllers/info_controller.go @@ -15,7 +15,7 @@ import ( "github.com/TheTNB/panel/pkg/shell" "github.com/TheTNB/panel/pkg/systemctl" "github.com/TheTNB/panel/pkg/tools" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type MenuItem struct { diff --git a/app/http/controllers/plugins/fail2ban_controller.go b/app/http/controllers/plugins/fail2ban_controller.go index a4f502fcf..0f1b339de 100644 --- a/app/http/controllers/plugins/fail2ban_controller.go +++ b/app/http/controllers/plugins/fail2ban_controller.go @@ -16,7 +16,7 @@ import ( "github.com/TheTNB/panel/pkg/os" "github.com/TheTNB/panel/pkg/shell" "github.com/TheTNB/panel/pkg/str" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type Fail2banController struct { diff --git a/app/http/controllers/plugins/mysql_controller.go b/app/http/controllers/plugins/mysql_controller.go index 5b56ac67e..a19d063b7 100644 --- a/app/http/controllers/plugins/mysql_controller.go +++ b/app/http/controllers/plugins/mysql_controller.go @@ -16,7 +16,7 @@ import ( "github.com/TheTNB/panel/pkg/shell" "github.com/TheTNB/panel/pkg/str" "github.com/TheTNB/panel/pkg/systemctl" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type MySQLController struct { diff --git a/app/http/controllers/plugins/openresty_controller.go b/app/http/controllers/plugins/openresty_controller.go index 9f6227d3c..c34484152 100644 --- a/app/http/controllers/plugins/openresty_controller.go +++ b/app/http/controllers/plugins/openresty_controller.go @@ -13,7 +13,7 @@ import ( "github.com/TheTNB/panel/pkg/shell" "github.com/TheTNB/panel/pkg/str" "github.com/TheTNB/panel/pkg/systemctl" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type OpenRestyController struct { diff --git a/app/http/controllers/plugins/php_controller.go b/app/http/controllers/plugins/php_controller.go index f2d50df2d..247051b96 100644 --- a/app/http/controllers/plugins/php_controller.go +++ b/app/http/controllers/plugins/php_controller.go @@ -1,9 +1,10 @@ package plugins import ( + "github.com/goravel/framework/contracts/http" + "github.com/TheTNB/panel/app/http/controllers" "github.com/TheTNB/panel/internal/services" - "github.com/goravel/framework/contracts/http" ) type PHPController struct{} diff --git a/app/http/controllers/plugins/postgresql_controller.go b/app/http/controllers/plugins/postgresql_controller.go index 4a528ce38..95fb2dc8f 100644 --- a/app/http/controllers/plugins/postgresql_controller.go +++ b/app/http/controllers/plugins/postgresql_controller.go @@ -14,7 +14,7 @@ import ( "github.com/TheTNB/panel/pkg/io" "github.com/TheTNB/panel/pkg/shell" "github.com/TheTNB/panel/pkg/systemctl" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type PostgreSQLController struct { diff --git a/app/http/controllers/plugins/pureftpd_controller.go b/app/http/controllers/plugins/pureftpd_controller.go index 8f3e5aa10..542353c08 100644 --- a/app/http/controllers/plugins/pureftpd_controller.go +++ b/app/http/controllers/plugins/pureftpd_controller.go @@ -12,7 +12,7 @@ import ( "github.com/TheTNB/panel/pkg/os" "github.com/TheTNB/panel/pkg/shell" "github.com/TheTNB/panel/pkg/systemctl" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type PureFtpdController struct { diff --git a/app/http/controllers/plugins/redis_controller.go b/app/http/controllers/plugins/redis_controller.go index 17e5a18d1..fb43119ca 100644 --- a/app/http/controllers/plugins/redis_controller.go +++ b/app/http/controllers/plugins/redis_controller.go @@ -9,7 +9,7 @@ import ( "github.com/TheTNB/panel/pkg/io" "github.com/TheTNB/panel/pkg/shell" "github.com/TheTNB/panel/pkg/systemctl" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type RedisController struct { diff --git a/app/http/controllers/plugins/rsync_controller.go b/app/http/controllers/plugins/rsync_controller.go index 5c79b6b77..895f55ff1 100644 --- a/app/http/controllers/plugins/rsync_controller.go +++ b/app/http/controllers/plugins/rsync_controller.go @@ -12,7 +12,7 @@ import ( "github.com/TheTNB/panel/pkg/shell" "github.com/TheTNB/panel/pkg/str" "github.com/TheTNB/panel/pkg/systemctl" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type RsyncController struct { diff --git a/app/http/controllers/plugins/s3fs_controller.go b/app/http/controllers/plugins/s3fs_controller.go index 922e4cc36..989408c94 100644 --- a/app/http/controllers/plugins/s3fs_controller.go +++ b/app/http/controllers/plugins/s3fs_controller.go @@ -13,7 +13,7 @@ import ( "github.com/TheTNB/panel/internal/services" "github.com/TheTNB/panel/pkg/io" "github.com/TheTNB/panel/pkg/shell" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type S3fsController struct { diff --git a/app/http/controllers/website_controller.go b/app/http/controllers/website_controller.go index 0e8ad6172..f09a1527e 100644 --- a/app/http/controllers/website_controller.go +++ b/app/http/controllers/website_controller.go @@ -16,7 +16,7 @@ import ( "github.com/TheTNB/panel/pkg/io" "github.com/TheTNB/panel/pkg/str" "github.com/TheTNB/panel/pkg/systemctl" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type WebsiteController struct { diff --git a/app/http/middleware/status.go b/app/http/middleware/status.go index 9613f4880..37bd46a8a 100644 --- a/app/http/middleware/status.go +++ b/app/http/middleware/status.go @@ -4,7 +4,7 @@ import ( "github.com/goravel/framework/contracts/http" "github.com/goravel/framework/facades" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) // Status 检查程序状态 diff --git a/app/http/requests/container/container_create.go b/app/http/requests/container/container_create.go index 5852f9714..058304f4c 100644 --- a/app/http/requests/container/container_create.go +++ b/app/http/requests/container/container_create.go @@ -4,7 +4,7 @@ import ( "github.com/goravel/framework/contracts/http" "github.com/goravel/framework/contracts/validation" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type ContainerCreate struct { diff --git a/app/http/requests/container/container_update.go b/app/http/requests/container/container_update.go index 4db30657a..04d728dd3 100644 --- a/app/http/requests/container/container_update.go +++ b/app/http/requests/container/container_update.go @@ -4,7 +4,7 @@ import ( "github.com/goravel/framework/contracts/http" "github.com/goravel/framework/contracts/validation" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type ContainerUpdate struct { diff --git a/app/http/requests/container/network_create.go b/app/http/requests/container/network_create.go index edeeb6ffc..1e7eb1766 100644 --- a/app/http/requests/container/network_create.go +++ b/app/http/requests/container/network_create.go @@ -4,7 +4,7 @@ import ( "github.com/goravel/framework/contracts/http" "github.com/goravel/framework/contracts/validation" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type NetworkCreate struct { diff --git a/app/http/requests/container/volume_create.go b/app/http/requests/container/volume_create.go index 5d8f6342d..197da705c 100644 --- a/app/http/requests/container/volume_create.go +++ b/app/http/requests/container/volume_create.go @@ -4,7 +4,7 @@ import ( "github.com/goravel/framework/contracts/http" "github.com/goravel/framework/contracts/validation" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type VolumeCreate struct { diff --git a/internal/backup.go b/internal/backup.go index ee4bd3eca..c6bbe13fe 100644 --- a/internal/backup.go +++ b/internal/backup.go @@ -2,7 +2,7 @@ package internal import ( "github.com/TheTNB/panel/app/models" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type Backup interface { diff --git a/internal/container.go b/internal/container.go index 01ffb5d07..67c84bde1 100644 --- a/internal/container.go +++ b/internal/container.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types/volume" requests "github.com/TheTNB/panel/app/http/requests/container" - paneltypes "github.com/TheTNB/panel/types" + paneltypes "github.com/TheTNB/panel/pkg/types" ) type Container interface { diff --git a/internal/php.go b/internal/php.go index 1e401827e..e8b34ce88 100644 --- a/internal/php.go +++ b/internal/php.go @@ -1,6 +1,8 @@ package internal -import "github.com/TheTNB/panel/types" +import ( + "github.com/TheTNB/panel/pkg/types" +) type PHP interface { Status() (bool, error) diff --git a/internal/plugin.go b/internal/plugin.go index 4f745221f..38dd49737 100644 --- a/internal/plugin.go +++ b/internal/plugin.go @@ -2,7 +2,7 @@ package internal import ( "github.com/TheTNB/panel/app/models" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type Plugin interface { diff --git a/internal/services/backup.go b/internal/services/backup.go index b0c8a926b..5c0b0d931 100644 --- a/internal/services/backup.go +++ b/internal/services/backup.go @@ -14,7 +14,7 @@ import ( "github.com/TheTNB/panel/pkg/io" "github.com/TheTNB/panel/pkg/shell" "github.com/TheTNB/panel/pkg/str" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type BackupImpl struct { diff --git a/internal/services/container.go b/internal/services/container.go index 2c02a3edb..e5d9f41f2 100644 --- a/internal/services/container.go +++ b/internal/services/container.go @@ -16,7 +16,7 @@ import ( "github.com/goravel/framework/support/json" requests "github.com/TheTNB/panel/app/http/requests/container" - paneltypes "github.com/TheTNB/panel/types" + paneltypes "github.com/TheTNB/panel/pkg/types" ) type Container struct { diff --git a/internal/services/php.go b/internal/services/php.go index 95d7056a8..5c24dafa2 100644 --- a/internal/services/php.go +++ b/internal/services/php.go @@ -16,7 +16,7 @@ import ( "github.com/TheTNB/panel/pkg/io" "github.com/TheTNB/panel/pkg/shell" "github.com/TheTNB/panel/pkg/systemctl" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type PHPImpl struct { diff --git a/internal/services/plugin.go b/internal/services/plugin.go index a058b5268..ad4c0cfcd 100644 --- a/internal/services/plugin.go +++ b/internal/services/plugin.go @@ -9,7 +9,7 @@ import ( "github.com/TheTNB/panel/app/models" "github.com/TheTNB/panel/internal" "github.com/TheTNB/panel/pkg/io" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type PluginImpl struct { diff --git a/internal/services/website.go b/internal/services/website.go index 9b13973b0..1f87c598e 100644 --- a/internal/services/website.go +++ b/internal/services/website.go @@ -20,7 +20,7 @@ import ( "github.com/TheTNB/panel/pkg/shell" "github.com/TheTNB/panel/pkg/str" "github.com/TheTNB/panel/pkg/systemctl" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type WebsiteImpl struct { diff --git a/internal/website.go b/internal/website.go index 7b8c56d3e..777847ea2 100644 --- a/internal/website.go +++ b/internal/website.go @@ -3,7 +3,7 @@ package internal import ( requests "github.com/TheTNB/panel/app/http/requests/website" "github.com/TheTNB/panel/app/models" - "github.com/TheTNB/panel/types" + "github.com/TheTNB/panel/pkg/types" ) type Website interface { diff --git a/pkg/shell/exec.go b/pkg/shell/exec.go index 82f94e3db..f91e2c289 100644 --- a/pkg/shell/exec.go +++ b/pkg/shell/exec.go @@ -9,8 +9,9 @@ import ( "strings" "time" - "github.com/TheTNB/panel/pkg/slice" "github.com/goravel/framework/support" + + "github.com/TheTNB/panel/pkg/slice" ) // Execf 执行 shell 命令 diff --git a/pkg/ssh/turn.go b/pkg/ssh/turn.go index 99e35bd70..fca3ee53b 100644 --- a/pkg/ssh/turn.go +++ b/pkg/ssh/turn.go @@ -63,6 +63,7 @@ func (t *Turn) Write(p []byte) (n int, err error) { return writer.Write(p) } + func (t *Turn) Close() error { if t.Session != nil { t.Session.Close() diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go index 6de9c6826..199c8db13 100644 --- a/pkg/tools/tools.go +++ b/pkg/tools/tools.go @@ -51,8 +51,8 @@ func GetMonitoringInfo() MonitoringInfo { res.Disk, _ = disk.Partitions(true) ioCounters, _ := disk.IOCounters() - for _, io := range ioCounters { - res.DiskIO = append(res.DiskIO, io) + for _, info := range ioCounters { + res.DiskIO = append(res.DiskIO, info) } for _, partition := range res.Disk { diff --git a/types/backup.go b/pkg/types/backup.go similarity index 100% rename from types/backup.go rename to pkg/types/backup.go diff --git a/types/common.go b/pkg/types/common.go similarity index 100% rename from types/common.go rename to pkg/types/common.go diff --git a/types/container.go b/pkg/types/container.go similarity index 100% rename from types/container.go rename to pkg/types/container.go diff --git a/types/fail2ban.go b/pkg/types/fail2ban.go similarity index 100% rename from types/fail2ban.go rename to pkg/types/fail2ban.go diff --git a/types/php.go b/pkg/types/php.go similarity index 100% rename from types/php.go rename to pkg/types/php.go diff --git a/types/plugin.go b/pkg/types/plugin.go similarity index 100% rename from types/plugin.go rename to pkg/types/plugin.go diff --git a/types/plugin_list.go b/pkg/types/plugin_list.go similarity index 100% rename from types/plugin_list.go rename to pkg/types/plugin_list.go diff --git a/types/pureftpd.go b/pkg/types/pureftpd.go similarity index 100% rename from types/pureftpd.go rename to pkg/types/pureftpd.go diff --git a/types/rsync.go b/pkg/types/rsync.go similarity index 100% rename from types/rsync.go rename to pkg/types/rsync.go diff --git a/types/s3fs.go b/pkg/types/s3fs.go similarity index 100% rename from types/s3fs.go rename to pkg/types/s3fs.go diff --git a/types/status.go b/pkg/types/status.go similarity index 100% rename from types/status.go rename to pkg/types/status.go diff --git a/types/website.go b/pkg/types/website.go similarity index 100% rename from types/website.go rename to pkg/types/website.go