wip: 重构框架

.github/workflows/build.yml

@@ -101,7 +101,7 @@ jobs:
           fi
           VERSION="${{ github.sha }}"
           VERSION_HASH="${{ github.sha }}"
-          go build -trimpath -ldflags="-s -w -X github.com/komari-monitor/komari/utils.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/utils.VersionHash=${VERSION_HASH}" -o $BINARY_NAME
+          go build -trimpath -ldflags="-s -w -X github.com/komari-monitor/komari/internal/version.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/internal/version.VersionHash=${VERSION_HASH}" -o $BINARY_NAME
 
       - name: Upload binary as artifact
         uses: actions/upload-artifact@v4

.github/workflows/development.yml

@@ -40,7 +40,7 @@ jobs:
           GOARCH: amd64
         run: |
           VERSION_SHA="${{ github.sha }}"
-          go build -ldflags "-X github.com/komari-monitor/komari/utils.CurrentVersion=dev -X github.com/komari-monitor/komari/utils.VersionHash=${VERSION_SHA}" -o komari .
+          go build -ldflags "-X github.com/komari-monitor/komari/internal/version.CurrentVersion=dev -X github.com/komari-monitor/komari/internal/version.VersionHash=${VERSION_SHA}" -o komari .
 
       - name: Upload binary as artifact
         uses: actions/upload-artifact@v4

.github/workflows/docker-publish.yml

@@ -55,7 +55,7 @@ jobs:
         run: |
           VERSION="${{ github.ref_name }}"
           VERSION_HASH="${{ github.sha }}"
-          LDFLAGS="-s -w -X github.com/komari-monitor/komari/utils.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/utils.VersionHash=${VERSION_HASH}"
+          LDFLAGS="-s -w -X github.com/komari-monitor/komari/internal/version.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/internal/version.VersionHash=${VERSION_HASH}"
 
           echo "Building for linux/amd64..."
           GOARCH=amd64 CC="zig cc -target x86_64-linux-musl" go build -trimpath -ldflags="$LDFLAGS" -o komari-linux-amd64

.github/workflows/release-docker.yml

@@ -58,7 +58,7 @@ jobs:
         run: |
           VERSION="${{ github.event.release.tag_name }}"
           VERSION_HASH="${{ github.sha }}"
-          LDFLAGS="-s -w -X github.com/komari-monitor/komari/utils.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/utils.VersionHash=${VERSION_HASH}"
+          LDFLAGS="-s -w -X github.com/komari-monitor/komari/internal/version.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/internal/version.VersionHash=${VERSION_HASH}"
 
           echo "Building for linux/amd64..."
           GOARCH=amd64 CC="zig cc -target x86_64-linux-musl" go build -trimpath -ldflags="$LDFLAGS" -o komari-linux-amd64

.github/workflows/release.yml

@@ -103,7 +103,7 @@ jobs:
           fi
           VERSION="${{ github.event.release.tag_name }}"
           VERSION_HASH="${{ github.sha }}" # Use commit SHA for hash
-          go build -trimpath -ldflags="-s -w -X github.com/komari-monitor/komari/utils.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/utils.VersionHash=${VERSION_HASH}" -o $BINARY_NAME
+          go build -trimpath -ldflags="-s -w -X github.com/komari-monitor/komari/internal/version.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/internal/version.VersionHash=${VERSION_HASH}" -o $BINARY_NAME
 
       - name: Upload binary to release
         env:

cmd/chpasswd.go

@@ -4,9 +4,9 @@ import (
 	"os"
 
 	"github.com/komari-monitor/komari/cmd/flags"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 	"github.com/spf13/cobra"
 )
 

cmd/disable2FA.go

@@ -3,8 +3,8 @@ package cmd
 import (
 	"os"
 
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 	"github.com/spf13/cobra"
 	"gorm.io/gorm"
 )

cmd/nezha_compat.go

@@ -11,17 +11,17 @@ import (
 	"sync"
 	"time"
 
-	apiClient "github.com/komari-monitor/komari/api/client"
-	"github.com/komari-monitor/komari/common"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils/geoip"
-	"github.com/komari-monitor/komari/utils/notifier"
-	"github.com/komari-monitor/komari/ws"
+	apiClient "github.com/komari-monitor/komari/internal/api_v1/client"
+	"github.com/komari-monitor/komari/internal/common"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/geoip"
+	"github.com/komari-monitor/komari/internal/notifier"
+	"github.com/komari-monitor/komari/internal/ws"
 
-	"github.com/komari-monitor/komari/compat/nezha/proto"
+	"github.com/komari-monitor/komari/internal/nezha/proto"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/metadata"

cmd/permitPasswordLogin.go

@@ -3,8 +3,8 @@ package cmd
 import (
 	"os"
 
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 	"github.com/spf13/cobra"
 	"gorm.io/gorm"
 )

cmd/server.go

@@ -12,42 +12,28 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/api/admin"
-	"github.com/komari-monitor/komari/api/admin/clipboard"
-	log_api "github.com/komari-monitor/komari/api/admin/log"
-	"github.com/komari-monitor/komari/api/admin/notification"
-	"github.com/komari-monitor/komari/api/admin/test"
-	"github.com/komari-monitor/komari/api/admin/update"
-	"github.com/komari-monitor/komari/api/client"
-	"github.com/komari-monitor/komari/api/jsonRpc"
-	"github.com/komari-monitor/komari/api/record"
-	"github.com/komari-monitor/komari/api/task"
 	"github.com/komari-monitor/komari/cmd/flags"
-	"github.com/komari-monitor/komari/database"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	d_notification "github.com/komari-monitor/komari/database/notification"
-	"github.com/komari-monitor/komari/database/records"
-	"github.com/komari-monitor/komari/database/tasks"
-	"github.com/komari-monitor/komari/public"
-	"github.com/komari-monitor/komari/utils"
-	"github.com/komari-monitor/komari/utils/cloudflared"
-	"github.com/komari-monitor/komari/utils/geoip"
-	logutil "github.com/komari-monitor/komari/utils/log"
-	"github.com/komari-monitor/komari/utils/messageSender"
-	"github.com/komari-monitor/komari/utils/notifier"
-	"github.com/komari-monitor/komari/utils/oauth"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	d_notification "github.com/komari-monitor/komari/internal/database/notification"
+	"github.com/komari-monitor/komari/internal/database/records"
+	"github.com/komari-monitor/komari/internal/database/tasks"
+	"github.com/komari-monitor/komari/internal/geoip"
+	logutil "github.com/komari-monitor/komari/internal/log"
+	"github.com/komari-monitor/komari/internal/messageSender"
+	"github.com/komari-monitor/komari/internal/notifier"
+	"github.com/komari-monitor/komari/internal/oauth"
+	"github.com/komari-monitor/komari/internal/version"
+	"github.com/komari-monitor/komari/pkg/cloudflared"
+	"github.com/komari-monitor/komari/server"
 	"github.com/spf13/cobra"
 )
 
-var (
-	DynamicCorsEnabled bool = false
-)
-
 var ServerCmd = &cobra.Command{
 	Use:   "server",
 	Short: "Start the server",
@@ -66,15 +52,12 @@ func init() {
 
 func RunServer() {
 	// #region 初始化
-	if err := os.MkdirAll("./data", os.ModePerm); err != nil {
-		log.Fatalf("Failed to create data directory: %v", err)
-	}
-	// 创建主题目录
+	// 创建目录
 	if err := os.MkdirAll("./data/theme", os.ModePerm); err != nil {
 		log.Fatalf("Failed to create theme directory: %v", err)
 	}
 	InitDatabase()
-	if utils.VersionHash != "unknown" {
+	if version.VersionHash != "unknown" {
 		gin.SetMode(gin.ReleaseMode)
 	}
 	conf, err := config.Get()
@@ -84,16 +67,10 @@ func RunServer() {
 	go geoip.InitGeoIp()
 	go DoScheduledWork()
 	go messageSender.Initialize()
-	// oidcInit
 	go oauth.Initialize()
 
 	if conf.NezhaCompatEnabled {
-		go func() {
-			if err := StartNezhaCompat(conf.NezhaCompatListen); err != nil {
-				log.Printf("Nezha compat server error: %v", err)
-				auditlog.EventLog("error", fmt.Sprintf("Nezha compat server error: %v", err))
-			}
-		}()
+		server.StartNezhaGRPCServer(conf.NezhaCompatListen)
 	}
 
 	config.Subscribe(func(event config.ConfigEvent) {
@@ -112,21 +89,8 @@ func RunServer() {
 		if event.New.NotificationMethod != event.Old.NotificationMethod {
 			messageSender.Initialize()
 		}
-		if event.New.NezhaCompatEnabled != event.Old.NezhaCompatEnabled {
-			if event.New.NezhaCompatEnabled {
-				if err := StartNezhaCompat(event.New.NezhaCompatListen); err != nil {
-					log.Printf("start Nezha compat server error: %v", err)
-					auditlog.EventLog("error", fmt.Sprintf("start Nezha compat server error: %v", err))
-				}
-			} else {
-				if err := StopNezhaCompat(); err != nil {
-					log.Printf("stop Nezha compat server error: %v", err)
-					auditlog.EventLog("error", fmt.Sprintf("stop Nezha compat server error: %v", err))
-				}
-			}
-		}
-
 	})
+
 	// 初始化 cloudflared
 	if strings.ToLower(GetEnv("KOMARI_ENABLE_CLOUDFLARED", "false")) == "true" {
 		err := cloudflared.RunCloudflared() // 阻塞，确保cloudflared跑起来
@@ -138,210 +102,7 @@ func RunServer() {
 	r := gin.New()
 	r.Use(logutil.GinLogger())
 	r.Use(logutil.GinRecovery())
-
-	// 动态 CORS 中间件
-
-	DynamicCorsEnabled = conf.AllowCors
-	config.Subscribe(func(event config.ConfigEvent) {
-		DynamicCorsEnabled = event.New.AllowCors
-		if event.New.GeoIpProvider != event.Old.GeoIpProvider {
-			go geoip.InitGeoIp()
-		}
-		if event.New.NotificationMethod != event.Old.NotificationMethod {
-			go messageSender.Initialize()
-		}
-	})
-	r.Use(func(c *gin.Context) {
-		if DynamicCorsEnabled {
-			c.Header("Access-Control-Allow-Origin", "*")
-			c.Header("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS")
-			c.Header("Access-Control-Allow-Headers", "Origin, Content-Length, Content-Type, Authorization, Accept, X-CSRF-Token, X-Requested-With, Set-Cookie")
-			c.Header("Access-Control-Expose-Headers", "Content-Length, Authorization, Set-Cookie")
-			c.Header("Access-Control-Allow-Credentials", "true")
-			c.Header("Access-Control-Max-Age", "43200") // 12 hours
-			if c.Request.Method == "OPTIONS" {
-				c.AbortWithStatus(204)
-				return
-			}
-		}
-		c.Next()
-	})
-
-	r.Use(api.PrivateSiteMiddleware())
-
-	r.Use(func(c *gin.Context) {
-		if len(c.Request.URL.Path) >= 4 && c.Request.URL.Path[:4] == "/api" {
-			c.Header("Cache-Control", "no-store")
-		}
-		c.Next()
-	})
-
-	r.Any("/ping", func(c *gin.Context) {
-		c.String(200, "pong")
-	})
-	// #region 公开路由
-	r.POST("/api/login", api.Login)
-	r.GET("/api/me", api.GetMe)
-	r.GET("/api/clients", api.GetClients)
-	r.GET("/api/nodes", api.GetNodesInformation)
-	r.GET("/api/public", api.GetPublicSettings)
-	r.GET("/api/oauth", api.OAuth)
-	r.GET("/api/oauth_callback", api.OAuthCallback)
-	r.GET("/api/logout", api.Logout)
-	r.GET("/api/version", api.GetVersion)
-	r.GET("/api/recent/:uuid", api.GetClientRecentRecords)
-
-	r.GET("/api/records/load", record.GetRecordsByUUID)
-	r.GET("/api/records/ping", record.GetPingRecords)
-	r.GET("/api/task/ping", task.GetPublicPingTasks)
-	r.GET("/api/rpc2", jsonRpc.OnRpcRequest)
-	r.POST("/api/rpc2", jsonRpc.OnRpcRequest)
-
-	// #region Agent
-	r.POST("/api/clients/register", client.RegisterClient)
-	tokenAuthrized := r.Group("/api/clients", api.TokenAuthMiddleware())
-	{
-		tokenAuthrized.GET("/report", client.WebSocketReport) // websocket
-		tokenAuthrized.POST("/uploadBasicInfo", client.UploadBasicInfo)
-		tokenAuthrized.POST("/report", client.UploadReport)
-		tokenAuthrized.GET("/terminal", client.EstablishConnection)
-		tokenAuthrized.POST("/task/result", client.TaskResult)
-	}
-	// #region 管理员
-	adminAuthrized := r.Group("/api/admin", api.AdminAuthMiddleware())
-	{
-		adminAuthrized.GET("/download/backup", admin.DownloadBackup)
-		adminAuthrized.POST("/upload/backup", admin.UploadBackup)
-		// test
-		testGroup := adminAuthrized.Group("/test")
-		{
-			testGroup.GET("/geoip", test.TestGeoIp)
-			testGroup.POST("/sendMessage", test.TestSendMessage)
-		}
-		// update
-		updateGroup := adminAuthrized.Group("/update")
-		{
-			updateGroup.POST("/mmdb", update.UpdateMmdbGeoIP)
-			updateGroup.POST("/user", update.UpdateUser)
-			updateGroup.PUT("/favicon", update.UploadFavicon)
-			updateGroup.POST("/favicon", update.DeleteFavicon)
-		}
-		// tasks
-		taskGroup := adminAuthrized.Group("/task")
-		{
-			taskGroup.GET("/all", admin.GetTasks)
-			taskGroup.POST("/exec", admin.Exec)
-			taskGroup.GET("/:task_id", admin.GetTaskById)
-			taskGroup.GET("/:task_id/result", admin.GetTaskResultsByTaskId)
-			taskGroup.GET("/:task_id/result/:uuid", admin.GetSpecificTaskResult)
-			taskGroup.GET("/client/:uuid", admin.GetTasksByClientId)
-		}
-		// settings
-		settingsGroup := adminAuthrized.Group("/settings")
-		{
-			settingsGroup.GET("/", admin.GetSettings)
-			settingsGroup.POST("/", admin.EditSettings)
-			settingsGroup.POST("/oidc", admin.SetOidcProvider)
-			settingsGroup.GET("/oidc", admin.GetOidcProvider)
-			settingsGroup.POST("/message-sender", admin.SetMessageSenderProvider)
-			settingsGroup.GET("/message-sender", admin.GetMessageSenderProvider)
-		}
-		// themes
-		themeGroup := adminAuthrized.Group("/theme")
-		{
-			themeGroup.PUT("/upload", admin.UploadTheme)
-			themeGroup.GET("/list", admin.ListThemes)
-			themeGroup.POST("/delete", admin.DeleteTheme)
-			themeGroup.GET("/set", admin.SetTheme)
-			themeGroup.POST("/update", admin.UpdateTheme)
-			themeGroup.POST("/settings", admin.UpdateThemeSettings)
-		}
-		// clients
-		clientGroup := adminAuthrized.Group("/client")
-		{
-			clientGroup.POST("/add", admin.AddClient)
-			clientGroup.GET("/list", admin.ListClients)
-			clientGroup.GET("/:uuid", admin.GetClient)
-			clientGroup.POST("/:uuid/edit", admin.EditClient)
-			clientGroup.POST("/:uuid/remove", admin.RemoveClient)
-			clientGroup.GET("/:uuid/token", admin.GetClientToken)
-			clientGroup.POST("/order", admin.OrderWeight)
-			// client terminal
-			clientGroup.GET("/:uuid/terminal", api.RequestTerminal)
-		}
-
-		// records
-		recordGroup := adminAuthrized.Group("/record")
-		{
-			recordGroup.POST("/clear", admin.ClearRecord)
-			recordGroup.POST("/clear/all", admin.ClearAllRecords)
-		}
-		// oauth2
-		oauth2Group := adminAuthrized.Group("/oauth2")
-		{
-			oauth2Group.GET("/bind", admin.BindingExternalAccount)
-			oauth2Group.POST("/unbind", admin.UnbindExternalAccount)
-		}
-		sessionGroup := adminAuthrized.Group("/session")
-		{
-			sessionGroup.GET("/get", admin.GetSessions)
-			sessionGroup.POST("/remove", admin.DeleteSession)
-			sessionGroup.POST("/remove/all", admin.DeleteAllSession)
-		}
-		two_factorGroup := adminAuthrized.Group("/2fa")
-		{
-			two_factorGroup.GET("/generate", admin.Generate2FA)
-			two_factorGroup.POST("/enable", admin.Enable2FA)
-			two_factorGroup.POST("/disable", admin.Disable2FA)
-		}
-		adminAuthrized.GET("/logs", log_api.GetLogs)
-
-		// clipboard
-		clipboardGroup := adminAuthrized.Group("/clipboard")
-		{
-			clipboardGroup.GET("/:id", clipboard.GetClipboard)
-			clipboardGroup.GET("", clipboard.ListClipboard)
-			clipboardGroup.POST("", clipboard.CreateClipboard)
-			clipboardGroup.POST("/:id", clipboard.UpdateClipboard)
-			clipboardGroup.POST("/remove", clipboard.BatchDeleteClipboard)
-			clipboardGroup.POST("/:id/remove", clipboard.DeleteClipboard)
-		}
-
-		notificationGroup := adminAuthrized.Group("/notification")
-		{
-			// offline notifications
-			notificationGroup.GET("/offline", notification.ListOfflineNotifications)
-			notificationGroup.POST("/offline/edit", notification.EditOfflineNotification)
-			notificationGroup.POST("/offline/enable", notification.EnableOfflineNotification)
-			notificationGroup.POST("/offline/disable", notification.DisableOfflineNotification)
-			loadAlertGroup := notificationGroup.Group("/load")
-			{
-				loadAlertGroup.GET("/", notification.GetAllLoadNotifications)
-				loadAlertGroup.POST("/add", notification.AddLoadNotification)
-				loadAlertGroup.POST("/delete", notification.DeleteLoadNotification)
-				loadAlertGroup.POST("/edit", notification.EditLoadNotification)
-			}
-		}
-
-		pingTaskGroup := adminAuthrized.Group("/ping")
-		{
-			pingTaskGroup.GET("/", admin.GetAllPingTasks)
-			pingTaskGroup.POST("/add", admin.AddPingTask)
-			pingTaskGroup.POST("/delete", admin.DeletePingTask)
-			pingTaskGroup.POST("/edit", admin.EditPingTask)
-
-		}
-
-	}
-
-	public.Static(r.Group("/"), func(handlers ...gin.HandlerFunc) {
-		r.NoRoute(handlers...)
-	})
-	// #region 静态文件服务
-	public.UpdateIndex(conf)
-	config.Subscribe(func(event config.ConfigEvent) {
-		public.UpdateIndex(event.New)
-	})
+	server.Init(r)
 
 	srv := &http.Server{
 		Addr:    flags.Listen,

internal/api_v1/AdminAuthMiddleware.go

@@ -1,9 +1,9 @@
-package api
+package api_v1
 
 import (
 	"net/http"
 
-	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/accounts"
 
 	"github.com/gin-gonic/gin"
 )

internal/api_v1/Common.go

@@ -1,4 +1,4 @@
-package api
+package api_v1
 
 import (
 	"log"
@@ -8,15 +8,16 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/common"
+	"github.com/komari-monitor/komari/internal/common"
+	"github.com/komari-monitor/komari/internal/version"
 	"github.com/patrickmn/go-cache"
 
 	"strconv"
 
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/pkg/utils"
 )
 
 var (
@@ -140,8 +141,8 @@ func RespondError(c *gin.Context, httpStatus int, message string) {
 }
 func GetVersion(c *gin.Context) {
 	RespondSuccess(c, gin.H{
-		"version": utils.CurrentVersion,
-		"hash":    utils.VersionHash,
+		"version": version.CurrentVersion,
+		"hash":    version.VersionHash,
 	})
 }
 

internal/api_v1/PrivateSiteMiddleware.go

@@ -1,10 +1,10 @@
-package api
+package api_v1
 
 import (
 	"net/http"
 
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/config"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/config"
 
 	"github.com/gin-gonic/gin"
 )

internal/api_v1/TokenAuthMiddleware.go

@@ -1,4 +1,4 @@
-package api
+package api_v1
 
 import (
 	"bytes"
@@ -7,7 +7,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/komari-monitor/komari/database/clients"
+	"github.com/komari-monitor/komari/internal/database/clients"
 	"gorm.io/gorm"
 
 	"github.com/gin-gonic/gin"

internal/api_v1/admin/2fa.go

@@ -4,8 +4,8 @@ import (
 	"image/png"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/accounts"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/accounts"
 	"github.com/pquerna/otp/totp"
 )
 

internal/api_v1/admin/client.go

@@ -4,10 +4,10 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/records"
-	"github.com/komari-monitor/komari/ws"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/internal/database/clients"
+	"github.com/komari-monitor/komari/internal/database/records"
+	"github.com/komari-monitor/komari/internal/ws"
 )
 
 func AddClient(c *gin.Context) {

internal/api_v1/admin/client_weight.go

@@ -2,10 +2,10 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 func OrderWeight(c *gin.Context) {

internal/api_v1/admin/clipboard/clipboard.go

@@ -5,10 +5,10 @@ import (
 	"strconv"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/auditlog"
-	clipboardDB "github.com/komari-monitor/komari/database/clipboard"
-	"github.com/komari-monitor/komari/database/models"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	clipboardDB "github.com/komari-monitor/komari/internal/database/clipboard"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 // GetClipboard retrieves a clipboard entry by ID

internal/api_v1/admin/download.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
 	"github.com/komari-monitor/komari/cmd/flags"
-	"github.com/komari-monitor/komari/database/dbcore"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
 )
 
 // copyFile 复制单个文件到目标路径（会确保父目录存在）

internal/api_v1/admin/exec.go

@@ -6,12 +6,12 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/tasks"
-	"github.com/komari-monitor/komari/utils"
-	"github.com/komari-monitor/komari/ws"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/database/tasks"
+	"github.com/komari-monitor/komari/internal/ws"
+	"github.com/komari-monitor/komari/pkg/utils"
 )
 
 // 接受数据类型：

internal/api_v1/admin/log/log.go

@@ -4,9 +4,9 @@ import (
 	"strconv"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 func GetLogs(c *gin.Context) {

internal/api_v1/admin/messageSender.go

@@ -2,12 +2,12 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils/messageSender"
-	"github.com/komari-monitor/komari/utils/messageSender/factory"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/messageSender"
+	"github.com/komari-monitor/komari/internal/messageSender/factory"
 )
 
 func GetMessageSenderProvider(c *gin.Context) {

internal/api_v1/admin/notification/load.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/notification"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/database/notification"
 )
 
 // POST body: clients []string, name string, metric string, threshold float32, ratio float32, interval int

internal/api_v1/admin/notification/offline.go

@@ -2,9 +2,9 @@ package notification
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 	"gorm.io/gorm/clause"
 )
 

internal/api_v1/admin/oauth.go

@@ -2,13 +2,13 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils/oauth"
-	"github.com/komari-monitor/komari/utils/oauth/factory"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/oauth"
+	"github.com/komari-monitor/komari/internal/oauth/factory"
 )
 
 func BindingExternalAccount(c *gin.Context) {

internal/api_v1/admin/ping.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/tasks"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/database/tasks"
 )
 
 // POST body: clients []string, target, task_type string, interval int

internal/api_v1/admin/sessions.go

@@ -1,9 +1,9 @@
 package admin
 
 import (
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/auditlog"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
 
 	"github.com/gin-gonic/gin"
 )

internal/api_v1/admin/settings.go

@@ -3,12 +3,12 @@ package admin
 import (
 	"database/sql"
 
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/records"
-	"github.com/komari-monitor/komari/database/tasks"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/database/records"
+	"github.com/komari-monitor/komari/internal/database/tasks"
 
 	"github.com/gin-gonic/gin"
 )

internal/api_v1/admin/task.go

@@ -2,8 +2,8 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/tasks"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/tasks"
 )
 
 func GetTasks(c *gin.Context) {

internal/api_v1/admin/test/test.go

@@ -4,11 +4,11 @@ import (
 	"net"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils/geoip"
-	"github.com/komari-monitor/komari/utils/messageSender"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/geoip"
+	"github.com/komari-monitor/komari/internal/messageSender"
 )
 
 func TestSendMessage(c *gin.Context) {

internal/api_v1/admin/theme.go

@@ -13,10 +13,10 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 // UploadTheme 上传主题

internal/api_v1/admin/update/favicon.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/auditlog"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
 )
 
 func UploadFavicon(c *gin.Context) {

internal/api_v1/admin/update/geoip.go

@@ -2,9 +2,9 @@ package update
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/utils/geoip"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/internal/geoip"
 )
 
 func UpdateMmdbGeoIP(c *gin.Context) {

internal/api_v1/admin/update/user.go

@@ -2,9 +2,9 @@ package update
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/auditlog"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
 )
 
 func UpdateUser(c *gin.Context) {

internal/api_v1/admin/upload.go

@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
+	api "github.com/komari-monitor/komari/internal/api_v1"
 )
 
 // 只有一个备份恢复操作在进行

internal/api_v1/client/autoDiscovery.go

@@ -2,10 +2,10 @@ package client
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/utils"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/clients"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/pkg/utils"
 )
 
 func RegisterClient(c *gin.Context) {

internal/api_v1/client/report.go

@@ -12,13 +12,13 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/common"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/tasks"
-	"github.com/komari-monitor/komari/utils/notifier"
-	"github.com/komari-monitor/komari/ws"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/common"
+	"github.com/komari-monitor/komari/internal/database/clients"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/database/tasks"
+	"github.com/komari-monitor/komari/internal/notifier"
+	"github.com/komari-monitor/komari/internal/ws"
 	"github.com/patrickmn/go-cache"
 )
 

internal/api_v1/client/task.go

@@ -4,9 +4,9 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/tasks"
+	"github.com/komari-monitor/komari/internal/database/clients"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/database/tasks"
 )
 
 func TaskResult(c *gin.Context) {

internal/api_v1/client/terminal.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/api"
+	api "github.com/komari-monitor/komari/internal/api_v1"
 )
 
 func EstablishConnection(c *gin.Context) {

internal/api_v1/client/uploadBasicInfo.go

@@ -3,9 +3,9 @@ package client
 import (
 	"net"
 
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/utils/geoip"
+	"github.com/komari-monitor/komari/internal/database/clients"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/geoip"
 
 	"github.com/gin-gonic/gin"
 )

internal/api_v1/jsonRpc/JsonRpc.go

@@ -11,12 +11,12 @@ import (
 	"sync"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils/rpc"
-	"github.com/komari-monitor/komari/ws"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/clients"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/ws"
+	"github.com/komari-monitor/komari/pkg/rpc"
 )
 
 // Json Rpc2 over websocket, /api/rpc2

internal/api_v1/jsonRpc/common.go

@@ -8,17 +8,17 @@ import (
 	"strings"
 	"time"
 
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/common"
-	"github.com/komari-monitor/komari/database"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/tasks"
-	"github.com/komari-monitor/komari/utils"
-	"github.com/komari-monitor/komari/utils/rpc"
-	"github.com/komari-monitor/komari/ws"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/common"
+	"github.com/komari-monitor/komari/internal/database"
+	"github.com/komari-monitor/komari/internal/database/clients"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/database/tasks"
+	"github.com/komari-monitor/komari/internal/version"
+	"github.com/komari-monitor/komari/internal/ws"
+	"github.com/komari-monitor/komari/pkg/rpc"
 
 	cache "github.com/patrickmn/go-cache"
 )
@@ -455,8 +455,8 @@ func getVersion(_ context.Context, _ *rpc.JsonRpcRequest) (any, *rpc.JsonRpcErro
 		Version string `json:"version"`
 		Hash    string `json:"hash"`
 	}{
-		Version: utils.CurrentVersion,
-		Hash:    utils.VersionHash,
+		Version: version.CurrentVersion,
+		Hash:    version.VersionHash,
 	}, nil
 }
 

internal/api_v1/jsonRpc/common.record.go

@@ -7,12 +7,12 @@ import (
 	"sort"
 	"time"
 
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	recordsdb "github.com/komari-monitor/komari/database/records"
-	"github.com/komari-monitor/komari/database/tasks"
-	"github.com/komari-monitor/komari/utils/rpc"
+	"github.com/komari-monitor/komari/internal/database/clients"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	recordsdb "github.com/komari-monitor/komari/internal/database/records"
+	"github.com/komari-monitor/komari/internal/database/tasks"
+	"github.com/komari-monitor/komari/pkg/rpc"
 )
 
 func init() {

internal/api_v1/latestRecord.go

@@ -1,10 +1,10 @@
-package api
+package api_v1
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 func GetClientRecentRecords(c *gin.Context) {

internal/api_v1/login.go

@@ -1,13 +1,13 @@
-package api
+package api_v1
 
 import (
 	"encoding/json"
 	"io"
 	"net/http"
 
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/config"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/internal/database/config"
 
 	"github.com/gin-gonic/gin"
 )

internal/api_v1/login_test.go

@@ -1,4 +1,4 @@
-package api
+package api_v1
 
 import (
 	"bytes"
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/accounts"
 	"github.com/stretchr/testify/assert"
 )
 

internal/api_v1/me.go

@@ -1,7 +1,7 @@
-package api
+package api_v1
 
 import (
-	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/accounts"
 
 	"github.com/gin-gonic/gin"
 )

internal/api_v1/me_test.go

@@ -1,4 +1,4 @@
-package api
+package api_v1
 
 import (
 	"encoding/json"
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/accounts"
 	"github.com/stretchr/testify/assert"
 )
 

internal/api_v1/nodes.go

@@ -1,9 +1,9 @@
-package api
+package api_v1
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/clients"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/clients"
 )
 
 func GetNodesInformation(c *gin.Context) {

internal/api_v1/oauth.go

@@ -1,15 +1,15 @@
-package api
+package api_v1
 
 import (
 	"fmt"
 	"slices"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/utils"
-	"github.com/komari-monitor/komari/utils/oauth"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/oauth"
+	"github.com/komari-monitor/komari/pkg/utils"
 )
 
 // /api/oauth

internal/api_v1/public.go

@@ -1,8 +1,8 @@
-package api
+package api_v1
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database"
+	"github.com/komari-monitor/komari/internal/database"
 )
 
 func GetPublicSettings(c *gin.Context) {

internal/api_v1/record/record.go

@@ -6,12 +6,12 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	records "github.com/komari-monitor/komari/database/records"
-	"github.com/komari-monitor/komari/database/tasks"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	records "github.com/komari-monitor/komari/internal/database/records"
+	"github.com/komari-monitor/komari/internal/database/tasks"
 )
 
 func GetRecordsByUUID(c *gin.Context) {
@@ -131,13 +131,13 @@ func GetRecordsByUUID(c *gin.Context) {
 // filterRecordsByLoadType 根据 load_type 过滤记录，只返回相关字段
 func filterRecordsByLoadType(records []models.Record, loadType string) []gin.H {
 	filteredRecords := make([]gin.H, 0, len(records))
-	
+
 	for _, r := range records {
 		record := gin.H{
 			"client": r.Client,
 			"time":   r.Time,
 		}
-		
+
 		switch loadType {
 		case "cpu":
 			record["cpu"] = r.Cpu
@@ -177,10 +177,10 @@ func filterRecordsByLoadType(records []models.Record, loadType string) []gin.H {
 			record["connections_udp"] = r.ConnectionsUdp
 			record["connections_tcp"] = r.Connections - r.ConnectionsUdp
 		}
-		
+
 		filteredRecords = append(filteredRecords, record)
 	}
-	
+
 	return filteredRecords
 }
 
@@ -341,7 +341,7 @@ func GetPingRecords(c *gin.Context) {
 				Max:    stats.max,
 			})
 		}
-		
+
 		// 如果同时指定了 uuid 和 task_id，BasicInfo 应该只有一条记录
 		// 这种情况下可以在响应中标记查询模式
 		if uuid != "" && taskId != -1 && len(response.BasicInfo) == 1 {
@@ -396,7 +396,7 @@ func GetPingRecords(c *gin.Context) {
 				if uuid != "" && r.Client != uuid {
 					continue
 				}
-				
+
 				totalCount++
 				if r.Value < 0 {
 					lossCount++
@@ -431,12 +431,12 @@ func GetPingRecords(c *gin.Context) {
 				"avg":      avgLatency,
 				"total":    totalCount,
 			}
-			
+
 			// 如果是仅 task_id 查询，添加客户端列表信息
 			if uuid == "" && taskId != -1 {
 				taskInfo["clients"] = t.Clients
 			}
-			
+
 			tasksList = append(tasksList, taskInfo)
 		}
 		response.Tasks = tasksList

internal/api_v1/task/ping.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/tasks"
+	api "github.com/komari-monitor/komari/internal/api_v1"
+	"github.com/komari-monitor/komari/internal/database/tasks"
 )
 
 type PublicPingTask struct {
@@ -35,4 +35,4 @@ func GetPublicPingTasks(c *gin.Context) {
 	}
 
 	api.RespondSuccess(c, publicTasks)
-}
+}

internal/api_v1/terminal.go

@@ -1,4 +1,4 @@
-package api
+package api_v1
 
 import (
 	"log"
@@ -7,10 +7,10 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/utils"
-	"github.com/komari-monitor/komari/ws"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/internal/database/clients"
+	"github.com/komari-monitor/komari/internal/ws"
+	"github.com/komari-monitor/komari/pkg/utils"
 )
 
 func RequestTerminal(c *gin.Context) {

internal/api_v1/ws.go

@@ -1,4 +1,4 @@
-package api
+package api_v1
 
 import (
 	"net/http"
@@ -6,12 +6,12 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/common"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/ws"
+	"github.com/komari-monitor/komari/internal/common"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/ws"
 )
 
 func GetClients(c *gin.Context) {

internal/common/modules.go

@@ -86,18 +86,18 @@ type CPUReport struct {
 
 // GPUDetailReport 详细GPU信息报告
 type GPUDetailReport struct {
-	Count          int                 `json:"count"`          // GPU数量
-	AverageUsage   float64             `json:"average_usage"`  // 平均使用率
-	DetailedInfo   []GPUDeviceInfo     `json:"detailed_info"`  // 每个GPU的详细信息
+	Count        int             `json:"count"`         // GPU数量
+	AverageUsage float64         `json:"average_usage"` // 平均使用率
+	DetailedInfo []GPUDeviceInfo `json:"detailed_info"` // 每个GPU的详细信息
 }
 
 // GPUDeviceInfo 单个GPU设备信息
 type GPUDeviceInfo struct {
-	Name         string  `json:"name"`          // GPU型号名称
-	MemoryTotal  int64   `json:"memory_total"`  // 显存总量(字节)
-	MemoryUsed   int64   `json:"memory_used"`   // 显存已用(字节)
-	Utilization  float64 `json:"utilization"`   // GPU使用率(%)
-	Temperature  int     `json:"temperature"`   // GPU温度(°C)
+	Name        string  `json:"name"`         // GPU型号名称
+	MemoryTotal int64   `json:"memory_total"` // 显存总量(字节)
+	MemoryUsed  int64   `json:"memory_used"`  // 显存已用(字节)
+	Utilization float64 `json:"utilization"`  // GPU使用率(%)
+	Temperature int     `json:"temperature"`  // GPU温度(°C)
 }
 
 // 保持向后兼容的旧GPUReport结构

internal/database/accounts/2fa.go

@@ -3,8 +3,8 @@ package accounts
 import (
 	"image"
 
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 	"github.com/pquerna/otp/totp"
 )
 

internal/database/accounts/accounts.go

@@ -7,9 +7,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/pkg/utils"
 
 	"github.com/google/uuid"
 )

internal/database/accounts/sessions.go

@@ -6,13 +6,13 @@ import (
 	"net"
 	"time"
 
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	messageevent "github.com/komari-monitor/komari/database/models/messageEvent"
-	"github.com/komari-monitor/komari/utils"
-	"github.com/komari-monitor/komari/utils/geoip"
-	"github.com/komari-monitor/komari/utils/messageSender"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	messageevent "github.com/komari-monitor/komari/internal/database/models/messageEvent"
+	"github.com/komari-monitor/komari/internal/geoip"
+	"github.com/komari-monitor/komari/internal/messageSender"
+	"github.com/komari-monitor/komari/pkg/utils"
 )
 
 // GetAllSessions 获取所有会话

internal/database/auditlog/log.go

@@ -4,8 +4,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 func Log(ip, uuid, message, msgType string) {

internal/database/clients/client.go

@@ -4,10 +4,10 @@ import (
 	"math"
 	"time"
 
-	"github.com/komari-monitor/komari/common"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils"
+	"github.com/komari-monitor/komari/internal/common"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/pkg/utils"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 

internal/database/clients/report.go

@@ -6,9 +6,9 @@ import (
 	"math"
 	"time"
 
-	"github.com/komari-monitor/komari/common"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/common"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 
 	"gorm.io/gorm"
 )

internal/database/clipboard/clipboard.go

@@ -1,8 +1,8 @@
 package clipboard
 
 import (
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 // CreateClipboard 创建剪贴板记录

internal/database/config/config.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 	"gorm.io/gorm"
 )
 

internal/database/config/events.go

@@ -3,7 +3,7 @@ package config
 import (
 	"sync"
 
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 // ConfigEvent represents a configuration change event

internal/database/dbcore/dbcore.go

@@ -13,9 +13,9 @@ import (
 	"time"
 
 	"github.com/komari-monitor/komari/cmd/flags"
-	"github.com/komari-monitor/komari/common"
-	"github.com/komari-monitor/komari/database/models"
-	logutil "github.com/komari-monitor/komari/utils/log"
+	"github.com/komari-monitor/komari/internal/common"
+	"github.com/komari-monitor/komari/internal/database/models"
+	logutil "github.com/komari-monitor/komari/internal/log"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"

internal/database/messageSender.go

@@ -1,8 +1,8 @@
 package database
 
 import (
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 func GetAllMessageSenderConfigs() []models.MessageSenderProvider {

internal/database/notification/load.go

@@ -1,9 +1,9 @@
 package notification
 
 import (
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils/notifier"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/notifier"
 	"gorm.io/gorm"
 )
 

internal/database/oauth.go

@@ -1,8 +1,8 @@
 package database
 
 import (
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 func GetAllOidcConfigs() []models.OidcProvider {

internal/database/records/records.go

@@ -9,8 +9,8 @@ import (
 	"gorm.io/gorm"
 
 	"github.com/komari-monitor/komari/cmd/flags"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 func RecordOne(rec models.Record) error {

internal/database/records/records_test.go

@@ -11,7 +11,7 @@ import (
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 var uuid = "7901508c-304f-49aa-b84f-957c33ae6f8a"

internal/database/tasks/ping.go

@@ -3,9 +3,9 @@ package tasks
 import (
 	"time"
 
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/pkg/utils"
 	"gorm.io/gorm"
 )
 

internal/database/tasks/tasks.go

@@ -3,8 +3,8 @@ package tasks
 import (
 	"time"
 
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 func CreateTask(taskId string, clients []string, command string) error {

internal/database/utils.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/database/config"
+	"github.com/komari-monitor/komari/internal/database/dbcore"
+	"github.com/komari-monitor/komari/internal/database/models"
 )
 
 func GetPublicInfo() (any, error) {

internal/geoip/geoip.go

@@ -7,7 +7,7 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/komari-monitor/komari/database/config"
+	"github.com/komari-monitor/komari/internal/database/config"
 	"github.com/patrickmn/go-cache"
 )
 

internal/geoip/geoip_test.go

@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/komari-monitor/komari/utils/geoip"
+	"github.com/komari-monitor/komari/internal/geoip"
 )
 
 // 测试GeoIP数据库的初始化和更新功能

internal/geoip/mmdb.go

@@ -10,7 +10,7 @@ import (
 	"path/filepath" // 新增导入，用于处理文件路径
 	"sync"
 
-	"github.com/komari-monitor/komari/database/auditlog"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
 	"github.com/oschwald/maxminddb-golang"
 )
 

internal/log/gorm.go

@@ -7,7 +7,7 @@ import (
 	"log/slog"
 	"time"
 
-	komari_utils "github.com/komari-monitor/komari/utils"
+	"github.com/komari-monitor/komari/internal/version"
 	"gorm.io/gorm"
 	gormlogger "gorm.io/gorm/logger"
 	"gorm.io/gorm/utils"
@@ -30,7 +30,7 @@ func NewGormLogger() *GormLogger {
 				return gormlogger.Info
 			}
 			return gormlogger.Silent
-		}(komari_utils.VersionHash),
+		}(version.VersionHash),
 	}
 }
 

internal/messageSender/all.go

@@ -0,0 +1,15 @@
+package messageSender
+
+import (
+	_ "github.com/komari-monitor/komari/internal/messageSender/bark"
+	_ "github.com/komari-monitor/komari/internal/messageSender/email"
+	_ "github.com/komari-monitor/komari/internal/messageSender/empty"
+	_ "github.com/komari-monitor/komari/internal/messageSender/javascript"
+	_ "github.com/komari-monitor/komari/internal/messageSender/serverchan3"
+	_ "github.com/komari-monitor/komari/internal/messageSender/serverchanturbo"
+	_ "github.com/komari-monitor/komari/internal/messageSender/telegram"
+	_ "github.com/komari-monitor/komari/internal/messageSender/webhook"
+)
+
+func All() {
+}

internal/messageSender/bark/bark.go

@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/komari-monitor/komari/utils/messageSender/factory"
+	"github.com/komari-monitor/komari/internal/messageSender/factory"
 )
 
 type BarkSender struct {

internal/messageSender/bark/meta.go

@@ -1,7 +1,7 @@
 package bark
 
 import (
-	"github.com/komari-monitor/komari/utils/messageSender/factory"
+	"github.com/komari-monitor/komari/internal/messageSender/factory"
 )
 
 type Addition struct {

internal/messageSender/email/email.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/komari-monitor/komari/utils/messageSender/factory"
+	"github.com/komari-monitor/komari/internal/messageSender/factory"
 )
 
 type EmailSender struct {