diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index d9b5214a..04f0e8b4 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 2b8dde03..8b36f26d 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 01d34cde..0a1b1e47 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 7a539923..d61073b7 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 0a9492c3..a3efda82 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 04bcb4bd..9b051913 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 5e4e1d4d..9bd5be5a 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 a4f502fc..0f1b339d 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 5b56ac67..a19d063b 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 9f6227d3..c3448415 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 f2d50df2..247051b9 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 4a528ce3..95fb2dc8 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 8f3e5aa1..542353c0 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 17e5a18d..fb43119c 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 5c79b6b7..895f55ff 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 922e4cc3..989408c9 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 0e8ad617..f09a1527 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 9613f488..37bd46a8 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 5852f971..058304f4 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 4db30657..04d728dd 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 edeeb6ff..1e7eb176 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 5d8f6342..197da705 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 ee4bd3ec..c6bbe13f 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 01ffb5d0..67c84bde 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 1e401827..e8b34ce8 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 4f745221..38dd4973 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 b0c8a926..5c0b0d93 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 2c02a3ed..e5d9f41f 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 95d7056a..5c24dafa 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 a058b526..ad4c0cfc 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 9b13973b..1f87c598 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 7b8c56d3..777847ea 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 82f94e3d..f91e2c28 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 99e35bd7..fca3ee53 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 6de9c682..199c8db1 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