refactor: 重构types包

.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' ]

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 证书续签

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 系统监控

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 面板命令行

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 面板每日任务

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 通用成功响应

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 {

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 {

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 {

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 {

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{}

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 {

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 {

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 {

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 {

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 {

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 {

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 检查程序状态

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 {

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 {

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 {

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 {

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 {

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 {

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)

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 命令

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()

pkg/tools/tools.go

@@ -51,8 +51,8 @@ func GetMonitoringInfo() MonitoringInfo {
 	res.Disk, _ = disk.Partitions(true)
 
 	ioCounters, _ := disk.IOCounters()
-	for _, io := range ioCounters {
+	for _, info := range ioCounters {
-		res.DiskIO = append(res.DiskIO, io)
+		res.DiskIO = append(res.DiskIO, info)
 	}
 
 	for _, partition := range res.Disk {