Merge pull request #485 from airium/main

feat: 支持自定义排序延迟检测任务

.github/workflows/build.yml

@@ -70,8 +70,15 @@ jobs:
           npm install
           npm run build
           cd ..
-          mkdir -p public/dist
-          cp -r web/dist/* public/dist/
+          mkdir -p public/defaultTheme/dist
+          rm -rf public/defaultTheme/dist/*
+          cp -r web/dist/* public/defaultTheme/dist/
+          cp -f web/komari-theme.json public/defaultTheme/
+          if [ -f web/preview.png ]; then cp -f web/preview.png public/defaultTheme/; fi
+          if [ -f web/perview.png ]; then cp -f web/perview.png public/defaultTheme/; fi
+          # Compatibility: ensure both filenames exist if only one is present
+          if [ -f public/defaultTheme/preview.png ] && [ ! -f public/defaultTheme/perview.png ]; then cp -f public/defaultTheme/preview.png public/defaultTheme/perview.png; fi
+          if [ -f public/defaultTheme/perview.png ] && [ ! -f public/defaultTheme/preview.png ]; then cp -f public/defaultTheme/perview.png public/defaultTheme/preview.png; fi
 
       - name: Set up Go
         uses: actions/setup-go@v5
@@ -101,7 +108,7 @@ jobs:
           fi
           VERSION="${{ github.sha }}"
           VERSION_HASH="${{ github.sha }}"
-          go build -trimpath -ldflags="-s -w -X github.com/komari-monitor/komari/internal/conf.Version=${VERSION} -X github.com/komari-monitor/komari/internal/conf.CommitHash=${VERSION_HASH}" -o $BINARY_NAME
+          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
 
       - name: Upload binary as artifact
         uses: actions/upload-artifact@v4

.github/workflows/development.yml

@@ -1,9 +1,9 @@
 name: Development Environment
 
 on:
-  # push:
-  #   branches:
-  #     - dev
+  push:
+    branches:
+      - dev
   workflow_dispatch:
 
 jobs:
@@ -16,8 +16,8 @@ jobs:
 
       #- name: Create dummy index.html
       #  run: |
-      #    mkdir -p public/dist
-      #    echo "<html><body><h1>This is komari development server.</h1></body></html>" > public/dist/index.html
+      #    mkdir -p public/defaultTheme/dist
+      #    echo "<html><body><h1>This is komari development server.</h1></body></html>" > public/defaultTheme/dist/index.html
 
       - name: Clone and build frontend
         run: |
@@ -26,8 +26,15 @@ jobs:
           npm install
           npm run build
           cd ..
-          mkdir -p public/dist
-          cp -r web/dist/* public/dist/
+          mkdir -p public/defaultTheme/dist
+          rm -rf public/defaultTheme/dist/*
+          cp -r web/dist/* public/defaultTheme/dist/
+          cp -f web/komari-theme.json public/defaultTheme/
+          if [ -f web/preview.png ]; then cp -f web/preview.png public/defaultTheme/; fi
+          if [ -f web/perview.png ]; then cp -f web/perview.png public/defaultTheme/; fi
+          # Compatibility: ensure both filenames exist if only one is present
+          if [ -f public/defaultTheme/preview.png ] && [ ! -f public/defaultTheme/perview.png ]; then cp -f public/defaultTheme/preview.png public/defaultTheme/perview.png; fi
+          if [ -f public/defaultTheme/perview.png ] && [ ! -f public/defaultTheme/preview.png ]; then cp -f public/defaultTheme/perview.png public/defaultTheme/preview.png; fi
 
       - name: Set up Go
         uses: actions/setup-go@v5
@@ -40,7 +47,7 @@ jobs:
           GOARCH: amd64
         run: |
           VERSION_SHA="${{ github.sha }}"
-          go build -ldflags "-X github.com/komari-monitor/komari/internal/conf.Version=dev -X github.com/komari-monitor/komari/internal/conf.CommitHash=${VERSION_SHA}" -o komari .
+          go build -ldflags "-X github.com/komari-monitor/komari/utils.CurrentVersion=dev -X github.com/komari-monitor/komari/utils.VersionHash=${VERSION_SHA}" -o komari .
 
       - name: Upload binary as artifact
         uses: actions/upload-artifact@v4

.github/workflows/docker-publish.yml

@@ -33,8 +33,15 @@ jobs:
           npm install
           npm run build
           cd ..
-          mkdir -p public/dist
-          cp -r web/dist/* public/dist/
+          mkdir -p public/defaultTheme/dist
+          rm -rf public/defaultTheme/dist/*
+          cp -r web/dist/* public/defaultTheme/dist/
+          cp -f web/komari-theme.json public/defaultTheme/
+          if [ -f web/preview.png ]; then cp -f web/preview.png public/defaultTheme/; fi
+          if [ -f web/perview.png ]; then cp -f web/perview.png public/defaultTheme/; fi
+          # Compatibility: ensure both filenames exist if only one is present
+          if [ -f public/defaultTheme/preview.png ] && [ ! -f public/defaultTheme/perview.png ]; then cp -f public/defaultTheme/preview.png public/defaultTheme/perview.png; fi
+          if [ -f public/defaultTheme/perview.png ] && [ ! -f public/defaultTheme/preview.png ]; then cp -f public/defaultTheme/perview.png public/defaultTheme/preview.png; fi
 
       - name: Set up Go
         uses: actions/setup-go@v5
@@ -55,7 +62,7 @@ jobs:
         run: |
           VERSION="${{ github.ref_name }}"
           VERSION_HASH="${{ github.sha }}"
-          LDFLAGS="-s -w -X github.com/komari-monitor/komari/internal/conf.Version=${VERSION} -X github.com/komari-monitor/komari/internal/conf.CommitHash=${VERSION_HASH}"
+          LDFLAGS="-s -w -X github.com/komari-monitor/komari/utils.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/utils.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

@@ -36,8 +36,15 @@ jobs:
           npm install
           npm run build
           cd ..
-          mkdir -p public/dist
-          cp -r web/dist/* public/dist/
+          mkdir -p public/defaultTheme/dist
+          rm -rf public/defaultTheme/dist/*
+          cp -r web/dist/* public/defaultTheme/dist/
+          cp -f web/komari-theme.json public/defaultTheme/
+          if [ -f web/preview.png ]; then cp -f web/preview.png public/defaultTheme/; fi
+          if [ -f web/perview.png ]; then cp -f web/perview.png public/defaultTheme/; fi
+          # Compatibility: ensure both filenames exist if only one is present
+          if [ -f public/defaultTheme/preview.png ] && [ ! -f public/defaultTheme/perview.png ]; then cp -f public/defaultTheme/preview.png public/defaultTheme/perview.png; fi
+          if [ -f public/defaultTheme/perview.png ] && [ ! -f public/defaultTheme/preview.png ]; then cp -f public/defaultTheme/perview.png public/defaultTheme/preview.png; fi
 
       - name: Set up Go
         uses: actions/setup-go@v5
@@ -58,7 +65,7 @@ jobs:
         run: |
           VERSION="${{ github.event.release.tag_name }}"
           VERSION_HASH="${{ github.sha }}"
-          LDFLAGS="-s -w -X github.com/komari-monitor/komari/internal/conf.Version=${VERSION} -X github.com/komari-monitor/komari/internal/conf.CommitHash=${VERSION_HASH}"
+          LDFLAGS="-s -w -X github.com/komari-monitor/komari/utils.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/utils.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

@@ -73,8 +73,15 @@ jobs:
           npm install
           npm run build
           cd ..
-          mkdir -p public/dist
-          cp -r web/dist/* public/dist/
+          mkdir -p public/defaultTheme/dist
+          rm -rf public/defaultTheme/dist/*
+          cp -r web/dist/* public/defaultTheme/dist/
+          cp -f web/komari-theme.json public/defaultTheme/
+          if [ -f web/preview.png ]; then cp -f web/preview.png public/defaultTheme/; fi
+          if [ -f web/perview.png ]; then cp -f web/perview.png public/defaultTheme/; fi
+          # Compatibility: ensure both filenames exist if only one is present
+          if [ -f public/defaultTheme/preview.png ] && [ ! -f public/defaultTheme/perview.png ]; then cp -f public/defaultTheme/preview.png public/defaultTheme/perview.png; fi
+          if [ -f public/defaultTheme/perview.png ] && [ ! -f public/defaultTheme/preview.png ]; then cp -f public/defaultTheme/perview.png public/defaultTheme/preview.png; fi
 
       - name: Set up Go
         uses: actions/setup-go@v5
@@ -103,7 +110,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/internal/conf.Version=${VERSION} -X github.com/komari-monitor/komari/internal/conf.CommitHash=${VERSION_HASH}" -o $BINARY_NAME
+          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
 
       - name: Upload binary to release
         env:

README.md

@@ -25,6 +25,10 @@ Komari is a lightweight, self-hosted server monitoring tool designed to provide
 
 [![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_)
 
+- 1Panel App Store
+
+Available on 1Panel App Store. Install via **App Store > Utilities > Komari**.
+
 ### 1. Use the One-click Install Script
 
 Suitable for distributions using systemd (Ubuntu, Debian...).
@@ -75,7 +79,7 @@ sudo ./install-komari.sh
 
 #### Dependencies
 
-- Go 1.24+ and Node.js 20+ (for manual build)
+- Go 1.18+ and Node.js 20+ (for manual build)
 
 1. Build the frontend static files:
    ```bash
@@ -89,7 +93,7 @@ sudo ./install-komari.sh
    git clone https://github.com/komari-monitor/komari
    cd komari
    ```
-   Copy the static files generated in step 1 to the `/public/dist` folder in the root of the `komari` project.
+   Copy the static files generated in step 1 to the `/public/defaultTheme/dist` folder in the root of the `komari` project, and copy `komari-theme.json` + `preview.png`/`perview.png` to `/public/defaultTheme`.
    ```bash
    go build -o komari
    ```
@@ -113,6 +117,10 @@ Issues and Pull Requests are welcome!
 
 ## Acknowledgements
 
+### 破碎工坊云
+
+[破碎工坊云 - 专业云计算服务平台，提供高效、稳定、安全的高防服务器与CDN解决方案](https://www.crash.work/)
+
 ### DreamCloud
 
 [DreamCloud - 极高性价比解锁直连亚太高防](https://as211392.com/)
@@ -123,7 +131,7 @@ Issues and Pull Requests are welcome!
 
 SharonNetworks 为您的业务起飞保驾护航！
 
-亚太数据中心提供顶级的中国优化网络接入 · 低延时&高带宽&提供 Tbps 级本地清洗高防服务, 为您的业务保驾护航, 为您的客户提供极致体验. 加入社区 [Telegram 群组](https://t.me/SharonNetwork) 可参与公益募捐或群内抽奖免费使用
+亚太数据中心提供顶级的中国优化网络接入 · 低延时&高带宽&提供Tbps级本地清洗高防服务, 为您的业务保驾护航, 为您的客户提供极致体验. 加入社区 [Telegram群组](https://t.me/SharonNetwork) 可参与公益募捐或群内抽奖免费使用
 
 ### The open source software community
 

api/Auth.go

@@ -0,0 +1,234 @@
+package api
+
+import (
+	"bytes"
+	"database/sql"
+	"encoding/json"
+	"io"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/database/clients"
+	"gorm.io/gorm"
+)
+
+const (
+	RoleAdmin  = "admin"
+	RoleClient = "client"
+	RoleGuest  = "guest"
+)
+
+// IdentityMiddleware 统一身份识别中间件，在路由栈最外层运行。
+// 负责识别当前请求者身份（Admin / Client / Guest），并写入 Context。
+func IdentityMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// 1. API Key 认证
+		apiKey := c.GetHeader("Authorization")
+		if isApiKeyValid(apiKey) {
+			c.Set("role", RoleAdmin)
+			c.Set("api_key", apiKey[7:])
+			c.Set("uuid", "00000000-0000-0000-0000-000000000000") // API Key
+			c.Next()
+			return
+		}
+
+		// 2. Session 认证
+		session, err := c.Cookie("session_token")
+		if err == nil && session != "" {
+			uuid, err := accounts.GetSession(session)
+			if err == nil {
+				c.Set("role", RoleAdmin)
+				c.Set("session", session)
+				c.Set("uuid", uuid)
+				accounts.UpdateLatest(session, c.Request.UserAgent(), c.ClientIP())
+				c.Next()
+				return
+			}
+		}
+
+		// 3. Client Token 认证
+		token := extractClientToken(c)
+		if token != "" {
+			uuid, err := checkTokenAndGetUUID(token)
+			if err == nil && uuid != "" {
+				c.Set("role", RoleClient)
+				c.Set("client_uuid", uuid)
+				c.Next()
+				return
+			}
+		}
+
+		// 4. 未识别身份，标记为访客
+		c.Set("role", RoleGuest)
+		c.Next()
+	}
+}
+
+// RequireRole 声明式权限校验中间件，仅允许指定角色通过。
+func RequireRole(allowedRoles ...string) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		current := GetRole(c)
+		for _, role := range allowedRoles {
+			if current == role {
+				c.Next()
+				return
+			}
+		}
+		RespondError(c, http.StatusUnauthorized, "Unauthorized.")
+		c.Abort()
+	}
+}
+
+// GetRole 获取当前请求的角色
+func GetRole(c *gin.Context) string {
+	role, exists := c.Get("role")
+	if !exists {
+		return RoleGuest
+	}
+	if s, ok := role.(string); ok {
+		return s
+	}
+	return RoleGuest
+}
+
+// --- 私有站点访问控制 ---
+
+var publicPaths = []string{
+	"/ping",
+	"/api/public",
+	"/api/login",
+	"/api/me",
+	"/api/oauth",
+	"/api/oauth_callback",
+	"/api/version",
+	"/api/recent",
+	"/api/admin",    // 由 RequireRole 处理
+	"/api/clients/", // 由 RequireRole 处理
+}
+
+// PrivateSiteMiddleware 私有站点访问控制。
+// 依赖 IdentityMiddleware 已设置的 role，对未认证的访客在私有站点模式下进行拦截。
+func PrivateSiteMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// 已认证用户直接放行
+		if GetRole(c) != RoleGuest {
+			c.Next()
+			return
+		}
+
+		path := c.Request.URL.Path
+
+		// 公开路径直接放行
+		for _, p := range publicPaths {
+			if strings.HasPrefix(path, p) {
+				c.Next()
+				return
+			}
+		}
+
+		// 非 API 路径直接放行（静态资源等）
+		if !strings.HasPrefix(path, "/api") {
+			c.Next()
+			return
+		}
+
+		// 非私有站点直接放行
+		privateSite, err := config.GetAs[bool](config.PrivateSiteKey, false)
+		if err != nil {
+			RespondError(c, http.StatusInternalServerError, "Failed to get configuration.")
+			c.Abort()
+			return
+		}
+		if !privateSite {
+			c.Next()
+			return
+		}
+
+		// 临时访问许可
+		if hasTempAccess(c) {
+			c.Next()
+			return
+		}
+
+		RespondError(c, http.StatusUnauthorized, "Private site is enabled, please login first.")
+		c.Abort()
+	}
+}
+
+func hasTempAccess(c *gin.Context) bool {
+	tempKey, err := c.Cookie("temp_key")
+	if err != nil {
+		return false
+	}
+	expireAt, err := config.GetAs[int64]("tempory_share_token_expire_at", 0)
+	if err != nil {
+		return false
+	}
+	allowKey, err := config.GetAs[string]("tempory_share_token", "")
+	if err != nil {
+		return false
+	}
+	if allowKey == "" || tempKey != allowKey {
+		return false
+	}
+	return expireAt >= time.Now().Unix()
+}
+
+func extractClientToken(c *gin.Context) string {
+	token := c.Query("token")
+	if token != "" {
+		return token
+	}
+
+	if c.Request.Method != http.MethodGet {
+		bodyBytes, err := io.ReadAll(c.Request.Body)
+		if err != nil {
+			return ""
+		}
+		c.Request.Body = io.NopCloser(bytes.NewReader(bodyBytes))
+
+		var bodyMap map[string]interface{}
+		if len(bodyBytes) > 0 {
+			if err := json.Unmarshal(bodyBytes, &bodyMap); err == nil {
+				if tokenVal, exists := bodyMap["token"]; exists {
+					if str, ok := tokenVal.(string); ok && str != "" {
+						return str
+					}
+				}
+			}
+		}
+	}
+
+	return ""
+}
+
+func checkTokenAndGetUUID(token string) (string, error) {
+	uuid, err := clients.GetClientUUIDByToken(token)
+
+	if err == sql.ErrNoRows {
+		return "", nil
+	}
+	if err == gorm.ErrRecordNotFound {
+		return "", nil
+	}
+	if err != nil {
+		return "", err
+	}
+	return uuid, nil
+}
+
+func isApiKeyValid(apiKey string) bool {
+	apiKeyConfig, err := config.GetAs[string](config.ApiKeyKey, "")
+	if err != nil {
+		return false
+	}
+
+	if apiKeyConfig == "" || len(apiKeyConfig) < 12 {
+		return false
+	}
+	return apiKey == "Bearer "+apiKeyConfig
+}

api/Common.go

@@ -1,19 +1,23 @@
-package api_v1
+package api
 
 import (
 	"log"
+	"net/http"
 	"time"
 
-	"github.com/komari-monitor/komari/internal/api_v1/vars"
-	"github.com/komari-monitor/komari/internal/common"
-	"github.com/komari-monitor/komari/internal/conf"
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/common"
 	"github.com/patrickmn/go-cache"
 
 	"strconv"
 
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
-	"github.com/komari-monitor/komari/pkg/utils"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/utils"
+)
+
+var (
+	Records = cache.New(1*time.Minute, 1*time.Minute)
 )
 
 func SaveClientReportToDB() error {
@@ -22,7 +26,7 @@ func SaveClientReportToDB() error {
 	var gpuRecords []models.GPURecord
 
 	// 遍历所有客户端记录
-	for uuid, x := range vars.Records.Items() {
+	for uuid, x := range Records.Items() {
 		if uuid == "" {
 			continue
 		}
@@ -42,7 +46,7 @@ func SaveClientReportToDB() error {
 		}
 
 		// 更新缓存
-		vars.Records.Set(uuid, filtered, cache.DefaultExpiration)
+		Records.Set(uuid, filtered, cache.DefaultExpiration)
 
 		// 计算平均报告并添加到记录列表
 		if len(filtered) > 0 {
@@ -95,13 +99,28 @@ func SaveClientReportToDB() error {
 	return nil
 }
 
-func isApiKeyValid(apiKey string) bool {
-	cfg, err := conf.GetWithV1Format()
-	if err != nil {
-		return false
-	}
-	if cfg.ApiKey == "" || len(cfg.ApiKey) < 12 {
-		return false
-	}
-	return apiKey == "Bearer "+cfg.ApiKey
+type Response struct {
+	Status  string      `json:"status"`
+	Message string      `json:"message"`
+	Data    interface{} `json:"data,omitempty"`
+}
+
+// Respond sends a standardized JSON response.
+func Respond(c *gin.Context, httpStatus int, status string, message string, data interface{}) {
+	c.JSON(httpStatus, Response{Status: status, Message: message, Data: data})
+}
+
+// RespondSuccess sends a success response with data.
+func RespondSuccess(c *gin.Context, data interface{}) {
+	Respond(c, http.StatusOK, "success", "", data)
+}
+
+// RespondSuccessMessage sends a success response with message and data.
+func RespondSuccessMessage(c *gin.Context, message string, data interface{}) {
+	Respond(c, http.StatusOK, "success", message, data)
+}
+
+// RespondError sends an error response with message.
+func RespondError(c *gin.Context, httpStatus int, message string) {
+	Respond(c, httpStatus, "error", message, nil)
 }

api/admin/2fa.go

@@ -4,15 +4,15 @@ import (
 	"image/png"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/database/accounts"
 	"github.com/pquerna/otp/totp"
 )
 
 func Generate2FA(c *gin.Context) {
 	secret, img, err := accounts.Generate2Fa()
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to generate 2FA: "+err.Error())
+		api.RespondError(c, 500, "Failed to generate 2FA: "+err.Error())
 		return
 	}
 	c.SetCookie("2fa_secret", secret, 1800, "/", "", false, true)
@@ -26,29 +26,29 @@ func Enable2FA(c *gin.Context) {
 	secret, _ := c.Cookie("2fa_secret")
 	code := c.Query("code")
 	if secret == "" || uuid == nil || code == "" {
-		resp.RespondError(c, 400, "2FA secret or code not provided")
+		api.RespondError(c, 400, "2FA secret or code not provided")
 		return
 	}
 	if !totp.Validate(code, secret) {
-		resp.RespondError(c, 400, "Invalid 2FA code")
+		api.RespondError(c, 400, "Invalid 2FA code")
 		return
 	}
 	err := accounts.Enable2Fa(uuid.(string), secret)
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to enable 2FA: "+err.Error())
+		api.RespondError(c, 500, "Failed to enable 2FA: "+err.Error())
 		return
 	}
 	c.SetCookie("2fa_secret", "", -1, "/", "", false, true)
 
-	resp.RespondSuccess(c, "2FA enabled successfully")
+	api.RespondSuccess(c, "2FA enabled successfully")
 }
 
 func Disable2FA(c *gin.Context) {
 	uuid, _ := c.Get("uuid")
 	err := accounts.Disable2Fa(uuid.(string))
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to disable 2FA: "+err.Error())
+		api.RespondError(c, 500, "Failed to disable 2FA: "+err.Error())
 		return
 	}
-	resp.RespondSuccess(c, "")
+	api.RespondSuccess(c, "")
 }

api/admin/client.go

@@ -4,12 +4,10 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/gookit/event"
-	clients "github.com/komari-monitor/komari/internal/client"
-	"github.com/komari-monitor/komari/internal/database/auditlog"
-	"github.com/komari-monitor/komari/internal/database/records"
-	"github.com/komari-monitor/komari/internal/eventType"
-	"github.com/komari-monitor/komari/internal/ws"
+	"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"
 )
 
 func AddClient(c *gin.Context) {
@@ -32,10 +30,6 @@ func AddClient(c *gin.Context) {
 	}
 	user_uuid, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), user_uuid.(string), "create client:"+uuid, "info")
-	event.Trigger(eventType.ClientCreated, event.M{
-		"client": uuid,
-		"token":  token,
-	})
 	c.JSON(http.StatusOK, gin.H{"status": "success", "uuid": uuid, "token": token, "message": ""})
 }
 
@@ -51,17 +45,13 @@ func EditClient(c *gin.Context) {
 		return
 	}
 	req["uuid"] = uuid
-	err := clients.PartialUpdate(req)
+	err := clients.SaveClient(req)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"status": "error", "message": err.Error()})
 		return
 	}
 	user_uuid, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), user_uuid.(string), "edit client:"+uuid, "info")
-	event.Trigger(eventType.ClientUpdated, event.M{
-		"client": uuid,
-		"data":   req,
-	})
 	c.JSON(http.StatusOK, gin.H{"status": "success"})
 }
 
@@ -80,9 +70,6 @@ func RemoveClient(c *gin.Context) {
 	c.JSON(200, gin.H{"status": "success"})
 	ws.DeleteConnectedClients(uuid)
 	ws.DeleteLatestReport(uuid)
-	event.Trigger(eventType.ClientDeleted, event.M{
-		"client": uuid,
-	})
 }
 
 func ClearRecord(c *gin.Context) {

api/admin/client_weight.go

@@ -2,27 +2,27 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/auditlog"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"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"
 )
 
 func OrderWeight(c *gin.Context) {
 	var req = make(map[string]int)
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, 400, "Invalid or missing request body: "+err.Error())
+		api.RespondError(c, 400, "Invalid or missing request body: "+err.Error())
 		return
 	}
 	db := dbcore.GetDBInstance()
 	for uuid, weight := range req {
 		err := db.Model(&models.Client{}).Where("uuid = ?", uuid).Update("weight", weight).Error
 		if err != nil {
-			resp.RespondError(c, 500, "Failed to update client weight: "+err.Error())
+			api.RespondError(c, 500, "Failed to update client weight: "+err.Error())
 			return
 		}
 	}
 	uuid, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), uuid.(string), "order clients", "info")
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }

api/admin/clipboard/clipboard.go

@@ -5,10 +5,10 @@ import (
 	"strconv"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"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"
+	"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"
 )
 
 // GetClipboard retrieves a clipboard entry by ID
@@ -16,41 +16,41 @@ func GetClipboard(c *gin.Context) {
 	idStr := c.Param("id")
 	id, err := strconv.Atoi(idStr)
 	if err != nil {
-		resp.RespondError(c, http.StatusBadRequest, "Invalid ID")
+		api.RespondError(c, http.StatusBadRequest, "Invalid ID")
 		return
 	}
 	cb, err := clipboardDB.GetClipboardByID(id)
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "Failed to get clipboard: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "Failed to get clipboard: "+err.Error())
 		return
 	}
-	resp.RespondSuccess(c, cb)
+	api.RespondSuccess(c, cb)
 }
 
 // ListClipboard lists all clipboard entries
 func ListClipboard(c *gin.Context) {
 	list, err := clipboardDB.ListClipboard()
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "Failed to list clipboard: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "Failed to list clipboard: "+err.Error())
 		return
 	}
-	resp.RespondSuccess(c, list)
+	api.RespondSuccess(c, list)
 }
 
 // CreateClipboard creates a new clipboard entry
 func CreateClipboard(c *gin.Context) {
 	var req models.Clipboard
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
+		api.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
 		return
 	}
 	if err := clipboardDB.CreateClipboard(&req); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "Failed to create clipboard: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "Failed to create clipboard: "+err.Error())
 		return
 	}
 	userUUID, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), userUUID.(string), "create clipboard:"+strconv.Itoa(req.Id), "info")
-	resp.RespondSuccess(c, req)
+	api.RespondSuccess(c, req)
 }
 
 // UpdateClipboard updates an existing clipboard entry
@@ -58,21 +58,21 @@ func UpdateClipboard(c *gin.Context) {
 	idStr := c.Param("id")
 	id, err := strconv.Atoi(idStr)
 	if err != nil {
-		resp.RespondError(c, http.StatusBadRequest, "Invalid ID")
+		api.RespondError(c, http.StatusBadRequest, "Invalid ID")
 		return
 	}
 	var fields map[string]interface{}
 	if err := c.ShouldBindJSON(&fields); err != nil {
-		resp.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
+		api.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
 		return
 	}
 	if err := clipboardDB.UpdateClipboardFields(id, fields); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "Failed to update clipboard: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "Failed to update clipboard: "+err.Error())
 		return
 	}
 	userUUID, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), userUUID.(string), "update clipboard:"+strconv.Itoa(id), "info")
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }
 
 // DeleteClipboard deletes a clipboard entry
@@ -80,16 +80,16 @@ func DeleteClipboard(c *gin.Context) {
 	idStr := c.Param("id")
 	id, err := strconv.Atoi(idStr)
 	if err != nil {
-		resp.RespondError(c, http.StatusBadRequest, "Invalid ID")
+		api.RespondError(c, http.StatusBadRequest, "Invalid ID")
 		return
 	}
 	if err := clipboardDB.DeleteClipboard(id); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "Failed to delete clipboard: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "Failed to delete clipboard: "+err.Error())
 		return
 	}
 	userUUID, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), userUUID.(string), "delete clipboard:"+strconv.Itoa(id), "warn")
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }
 
 // BatchDeleteClipboard deletes multiple clipboard entries
@@ -98,18 +98,18 @@ func BatchDeleteClipboard(c *gin.Context) {
 		IDs []int `json:"ids" binding:"required"`
 	}
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
+		api.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
 		return
 	}
 	if len(req.IDs) == 0 {
-		resp.RespondError(c, http.StatusBadRequest, "IDs cannot be empty")
+		api.RespondError(c, http.StatusBadRequest, "IDs cannot be empty")
 		return
 	}
 	if err := clipboardDB.DeleteClipboardBatch(req.IDs); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "Failed to batch delete clipboard: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "Failed to batch delete clipboard: "+err.Error())
 		return
 	}
 	userUUID, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), userUUID.(string), "batch delete clipboard: "+strconv.Itoa(len(req.IDs))+" items", "warn")
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }

api/admin/download.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/cmd/flags"
+	"github.com/komari-monitor/komari/database/dbcore"
 )
 
 // copyFile 复制单个文件到目标路径（会确保父目录存在）
@@ -108,35 +108,35 @@ func DownloadBackup(c *gin.Context) {
 	// 1) 创建临时目录
 	tempDir, err := os.MkdirTemp("", "komari-backup-*")
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating temporary directory: %v", err))
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating temporary directory: %v", err))
 		return
 	}
 	defer os.RemoveAll(tempDir)
 
 	// 2) 复制 ./data 下除 .db/.db-wal/.db-shm 外的所有文件到临时目录
 	if err := copyDataToTempExcludingDB(tempDir); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error copying data to temp: %v", err))
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error copying data to temp: %v", err))
 		return
 	}
 
 	// 3) 处理数据库备份 -> 临时目录/komari.db
 	destDB := filepath.Join(tempDir, "komari.db")
-	dbFilePath := conf.Conf.Database.DatabaseFile
+	dbFilePath := flags.DatabaseFile
 
-	if conf.Conf.Database.DatabaseType == "sqlite" || conf.Conf.Database.DatabaseType == "" {
+	if flags.DatabaseType == "sqlite" || flags.DatabaseType == "" {
 		if err := backupSQLiteTo(destDB); err != nil {
-			resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error backing up sqlite database: %v", err))
+			api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error backing up sqlite database: %v", err))
 			return
 		}
 	} else if dbFilePath != "" {
 		// 非 sqlite 的情况：若配置了文件路径且存在，则直接复制（按用户需求仍然将名称固定为 komari.db）
 		if _, err := os.Stat(dbFilePath); err == nil {
 			if err := copyFile(dbFilePath, destDB); err != nil {
-				resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error copying database file: %v", err))
+				api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error copying database file: %v", err))
 				return
 			}
 		} else if !os.IsNotExist(err) {
-			resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error stating database file: %v", err))
+			api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error stating database file: %v", err))
 			return
 		}
 	}
@@ -188,7 +188,7 @@ func DownloadBackup(c *gin.Context) {
 		return err
 	})
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error archiving temp folder: %v", err))
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error archiving temp folder: %v", err))
 		return
 	}
 
@@ -200,11 +200,11 @@ func DownloadBackup(c *gin.Context) {
 		Modified: time.Now(),
 	})
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating backup markup file: %v", err))
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating backup markup file: %v", err))
 		return
 	}
 	if _, err = markupWriter.Write([]byte(markupContent)); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error writing backup markup file: %v", err))
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error writing backup markup file: %v", err))
 		return
 	}
 }

api/admin/exec.go

@@ -6,12 +6,12 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"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"
+	"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"
 )
 
 // 接受数据类型：
@@ -25,7 +25,7 @@ func Exec(c *gin.Context) {
 	var onlineClients []string
 	var offlineClients []string
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, 400, "Invalid or missing request body: "+err.Error())
+		api.RespondError(c, 400, "Invalid or missing request body: "+err.Error())
 		return
 	}
 	// for uuid := range ws.GetConnectedClients() {
@@ -33,7 +33,7 @@ func Exec(c *gin.Context) {
 	// 		onlineClients = append(onlineClients, uuid)
 	// 	}
 	// 	// else {
-	// 	// 	resp.RespondError(c, 400, "Client not connected: "+uuid)
+	// 	// 	api.RespondError(c, 400, "Client not connected: "+uuid)
 	// 	// 	return
 	// 	// }
 	// }
@@ -45,12 +45,12 @@ func Exec(c *gin.Context) {
 		}
 	}
 	if len(onlineClients) == 0 {
-		resp.RespondError(c, 400, "No clients connected")
+		api.RespondError(c, 400, "No clients connected")
 		return
 	}
 	taskId := utils.GenerateRandomString(16)
 	if err := tasks.CreateTask(taskId, append(onlineClients, offlineClients...), req.Command); err != nil {
-		resp.RespondError(c, 500, "Failed to create task: "+err.Error())
+		api.RespondError(c, 500, "Failed to create task: "+err.Error())
 		return
 	}
 	for _, uuid := range onlineClients {
@@ -67,17 +67,17 @@ func Exec(c *gin.Context) {
 		client := ws.GetConnectedClients()[uuid]
 		if client != nil {
 			if err := client.WriteMessage(websocket.TextMessage, payload); err != nil {
-				resp.RespondError(c, 400, "Client connection is broke: "+uuid)
+				api.RespondError(c, 400, "Client connection is broke: "+uuid)
 				return
 			}
 		} else {
-			resp.RespondError(c, 400, "Client connection is null: "+uuid)
+			api.RespondError(c, 400, "Client connection is null: "+uuid)
 			return
 		}
 	}
 	uuid, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), uuid.(string), "REC, task id: "+taskId, "warn")
-	resp.RespondSuccess(c, gin.H{
+	api.RespondSuccess(c, gin.H{
 		"task_id": taskId,
 		"clients": onlineClients,
 	})

api/admin/log/log.go

@@ -4,9 +4,9 @@ import (
 	"strconv"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
 )
 
 func GetLogs(c *gin.Context) {
@@ -22,12 +22,12 @@ func GetLogs(c *gin.Context) {
 	// If conversion fails, return an error
 	limitInt, err := strconv.Atoi(limit)
 	if err != nil || limitInt <= 0 {
-		resp.RespondError(c, 400, "Invalid limit: "+limit)
+		api.RespondError(c, 400, "Invalid limit: "+limit)
 		return
 	}
 	pageInt, err := strconv.Atoi(page)
 	if err != nil || pageInt <= 0 {
-		resp.RespondError(c, 400, "Invalid page: "+page)
+		api.RespondError(c, 400, "Invalid page: "+page)
 		return
 	}
 	db := dbcore.GetDBInstance()
@@ -37,13 +37,13 @@ func GetLogs(c *gin.Context) {
 
 	var total int64
 	if err := db.Model(&models.Log{}).Count(&total).Error; err != nil {
-		resp.RespondError(c, 500, "Failed to count logs: "+err.Error())
+		api.RespondError(c, 500, "Failed to count logs: "+err.Error())
 		return
 	}
 
 	if err := db.Order("time desc").Limit(limitInt).Offset(offset).Find(&logs).Error; err != nil {
-		resp.RespondError(c, 500, "Failed to retrieve logs: "+err.Error())
+		api.RespondError(c, 500, "Failed to retrieve logs: "+err.Error())
 		return
 	}
-	resp.RespondSuccess(c, gin.H{"logs": logs, "total": total})
+	api.RespondSuccess(c, gin.H{"logs": logs, "total": total})
 }

api/admin/messageSender.go

@@ -0,0 +1,64 @@
+package admin
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/utils/messageSender"
+	"github.com/komari-monitor/komari/utils/messageSender/factory"
+)
+
+func GetMessageSenderProvider(c *gin.Context) {
+	provider := c.Query("provider")
+	if provider != "" {
+		// 如果指定了provider，返回单个提供者的配置
+		config, err := database.GetMessageSenderConfigByName(provider)
+		if err != nil {
+			api.RespondError(c, 404, "Provider not found: "+err.Error())
+			return
+		}
+		api.RespondSuccess(c, config)
+		return
+	}
+	// 否则返回所有提供者的配置项模板
+	providers := factory.GetSenderConfigs()
+	if len(providers) == 0 {
+		api.RespondError(c, 404, "No message sender providers found")
+		return
+	}
+	api.RespondSuccess(c, providers)
+}
+
+func SetMessageSenderProvider(c *gin.Context) {
+	var senderConfig models.MessageSenderProvider
+	if err := c.ShouldBindJSON(&senderConfig); err != nil {
+		api.RespondError(c, 400, "Invalid configuration: "+err.Error())
+		return
+	}
+	if senderConfig.Name == "" {
+		api.RespondError(c, 400, "Provider name is required")
+		return
+	}
+	_, exists := factory.GetConstructor(senderConfig.Name)
+	if !exists {
+		api.RespondError(c, 404, "Provider not found: "+senderConfig.Name)
+		return
+	}
+	if err := database.SaveMessageSenderConfig(&senderConfig); err != nil {
+		api.RespondError(c, 500, "Failed to save message sender provider configuration: "+err.Error())
+		return
+	}
+	NotificationMethod, _ := config.GetAs[string](config.NotificationMethodKey, "none")
+
+	// 正在使用，重载
+	if NotificationMethod == senderConfig.Name {
+		err := messageSender.LoadProvider(senderConfig.Name, senderConfig.Addition)
+		if err != nil {
+			api.RespondError(c, 500, "Failed to load message sender provider: "+err.Error())
+			return
+		}
+	}
+	api.RespondSuccess(c, gin.H{"message": "Message sender provider set successfully"})
+}

api/admin/notification/load.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/database/notification"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/database/notification"
 )
 
 // POST body: clients []string, name string, metric string, threshold float32, ratio float32, interval int
@@ -21,23 +21,23 @@ func AddLoadNotification(c *gin.Context) {
 	}
 
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, http.StatusBadRequest, err.Error())
+		api.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
 	if req.Interval > 4*60 || req.Interval <= 0 {
-		resp.RespondError(c, http.StatusBadRequest, "Interval must be between 1 and 240 minutes")
+		api.RespondError(c, http.StatusBadRequest, "Interval must be between 1 and 240 minutes")
 		return
 	}
 	if req.Ratio <= 0 || req.Ratio > 1 {
-		resp.RespondError(c, http.StatusBadRequest, "Ratio must be between 0 and 1")
+		api.RespondError(c, http.StatusBadRequest, "Ratio must be between 0 and 1")
 		return
 	}
 
 	if taskID, err := notification.AddLoadNotification(req.Clients, req.Name, req.Metric, req.Threshold, req.Ratio, req.Interval); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, err.Error())
+		api.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
-		resp.RespondSuccess(c, gin.H{"task_id": taskID})
+		api.RespondSuccess(c, gin.H{"task_id": taskID})
 	}
 }
 
@@ -47,14 +47,14 @@ func DeleteLoadNotification(c *gin.Context) {
 		ID []uint `json:"id" binding:"required"`
 	}
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, http.StatusBadRequest, err.Error())
+		api.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
 	if err := notification.DeleteLoadNotification(req.ID); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, err.Error())
+		api.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
-		resp.RespondSuccess(c, nil)
+		api.RespondSuccess(c, nil)
 	}
 }
 
@@ -65,26 +65,26 @@ func EditLoadNotification(c *gin.Context) {
 	}
 
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, http.StatusBadRequest, "Invalid request data")
+		api.RespondError(c, http.StatusBadRequest, "Invalid request data")
 		return
 	}
 
 	if err := notification.EditLoadNotification(req.Notifications); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, err.Error())
+		api.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
 		// for _, notification := range req.Notifications {
 		// 	notification.DeleteLoadNotification([]uint{notification.Id})
 		// }
-		resp.RespondSuccess(c, nil)
+		api.RespondSuccess(c, nil)
 	}
 }
 
 func GetAllLoadNotifications(c *gin.Context) {
 	notifications, err := notification.GetAllLoadNotifications()
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, err.Error())
+		api.RespondError(c, http.StatusInternalServerError, err.Error())
 		return
 	}
 
-	resp.RespondSuccess(c, notifications)
+	api.RespondSuccess(c, notifications)
 }

api/admin/notification/offline.go

@@ -2,9 +2,9 @@ package notification
 
 import (
 	"github.com/gin-gonic/gin"
-	resp "github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
 	"gorm.io/gorm/clause"
 )
 
@@ -12,7 +12,7 @@ import (
 func EnableOfflineNotification(c *gin.Context) {
 	var uuids []string
 	if err := c.ShouldBindJSON(&uuids); err != nil {
-		resp.RespondError(c, 400, "Invalid request body: "+err.Error())
+		api.RespondError(c, 400, "Invalid request body: "+err.Error())
 		return
 	}
 	var notifications []models.OfflineNotification
@@ -30,17 +30,17 @@ func EnableOfflineNotification(c *gin.Context) {
 		Select("client", "enable").
 		Create(notifications).Error
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to enable offline notifications: "+err.Error())
+		api.RespondError(c, 500, "Failed to enable offline notifications: "+err.Error())
 		return
 	}
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }
 
 // POST body : []uuid
 func DisableOfflineNotification(c *gin.Context) {
 	var uuids []string
 	if err := c.ShouldBindJSON(&uuids); err != nil {
-		resp.RespondError(c, 400, "Invalid request body: "+err.Error())
+		api.RespondError(c, 400, "Invalid request body: "+err.Error())
 		return
 	}
 	var notifications []models.OfflineNotification
@@ -58,29 +58,29 @@ func DisableOfflineNotification(c *gin.Context) {
 		Select("client", "enable").
 		Create(notifications).Error
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to disable offline notifications: "+err.Error())
+		api.RespondError(c, 500, "Failed to disable offline notifications: "+err.Error())
 		return
 	}
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }
 
 func EditOfflineNotification(c *gin.Context) {
 	var notifications []models.OfflineNotification
 	if err := c.ShouldBindJSON(&notifications); err != nil {
-		resp.RespondError(c, 400, "Invalid request body: "+err.Error())
+		api.RespondError(c, 400, "Invalid request body: "+err.Error())
 		return
 	}
 	if len(notifications) == 0 {
-		resp.RespondError(c, 400, "At least one notification is required")
+		api.RespondError(c, 400, "At least one notification is required")
 		return
 	}
 	for _, noti := range notifications {
 		if noti.Client == "" {
-			resp.RespondError(c, 400, "Client UUID cannot be empty")
+			api.RespondError(c, 400, "Client UUID cannot be empty")
 			return
 		}
 		if noti.GracePeriod <= 0 {
-			resp.RespondError(c, 400, "GracePeriod must be a positive integer")
+			api.RespondError(c, 400, "GracePeriod must be a positive integer")
 			return
 		}
 	}
@@ -92,18 +92,18 @@ func EditOfflineNotification(c *gin.Context) {
 		Select("*").
 		Create(notifications).Error
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to edit offline notifications: "+err.Error())
+		api.RespondError(c, 500, "Failed to edit offline notifications: "+err.Error())
 		return
 	}
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }
 
 func ListOfflineNotifications(c *gin.Context) {
 	var notifications []models.OfflineNotification
 	err := dbcore.GetDBInstance().Model(&models.OfflineNotification{}).Find(&notifications).Error
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to list offline notifications: "+err.Error())
+		api.RespondError(c, 500, "Failed to list offline notifications: "+err.Error())
 		return
 	}
-	resp.RespondSuccess(c, notifications)
+	api.RespondSuccess(c, notifications)
 }

api/admin/oauth.go

@@ -2,20 +2,20 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/database"
-	"github.com/komari-monitor/komari/internal/database/accounts"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/oauth"
-	"github.com/komari-monitor/komari/internal/oauth/factory"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database"
+	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/utils/oauth"
+	"github.com/komari-monitor/komari/utils/oauth/factory"
 )
 
 func BindingExternalAccount(c *gin.Context) {
 	session, _ := c.Cookie("session_token")
 	user, err := accounts.GetUserBySession(session)
 	if err != nil {
-		resp.RespondError(c, 500, "No user found: "+err.Error())
+		api.RespondError(c, 500, "No user found: "+err.Error())
 		return
 	}
 
@@ -26,17 +26,17 @@ func UnbindExternalAccount(c *gin.Context) {
 	session, _ := c.Cookie("session_token")
 	user, err := accounts.GetUserBySession(session)
 	if err != nil {
-		resp.RespondError(c, 500, "No user found: "+err.Error())
+		api.RespondError(c, 500, "No user found: "+err.Error())
 		return
 	}
 
 	err = accounts.UnbindExternalAccount(user.UUID)
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to unbind external account: "+err.Error())
+		api.RespondError(c, 500, "Failed to unbind external account: "+err.Error())
 		return
 	}
 
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }
 
 func GetOidcProvider(c *gin.Context) {
@@ -45,49 +45,49 @@ func GetOidcProvider(c *gin.Context) {
 		// 如果指定了provider，返回单个提供者的配置
 		config, err := database.GetOidcConfigByName(provider)
 		if err != nil {
-			resp.RespondError(c, 404, "Provider not found: "+err.Error())
+			api.RespondError(c, 404, "Provider not found: "+err.Error())
 			return
 		}
-		resp.RespondSuccess(c, config)
+		api.RespondSuccess(c, config)
 		return
 	}
 	// 否则返回所有提供者的配置
 	providers := factory.GetProviderConfigs()
 	if len(providers) == 0 {
-		resp.RespondError(c, 404, "No OIDC providers found")
+		api.RespondError(c, 404, "No OIDC providers found")
 		return
 	}
-	resp.RespondSuccess(c, providers)
+	api.RespondSuccess(c, providers)
 }
 
 func SetOidcProvider(c *gin.Context) {
 	var oidcConfig models.OidcProvider
 	if err := c.ShouldBindJSON(&oidcConfig); err != nil {
-		resp.RespondError(c, 400, "Invalid configuration: "+err.Error())
+		api.RespondError(c, 400, "Invalid configuration: "+err.Error())
 		return
 	}
 	if oidcConfig.Name == "" {
-		resp.RespondError(c, 400, "Provider name is required")
+		api.RespondError(c, 400, "Provider name is required")
 		return
 	}
 	_, exists := factory.GetConstructor(oidcConfig.Name)
 	if !exists {
-		resp.RespondError(c, 404, "Provider not found: "+oidcConfig.Name)
+		api.RespondError(c, 404, "Provider not found: "+oidcConfig.Name)
 		return
 	}
 
 	if err := database.SaveOidcConfig(&oidcConfig); err != nil {
-		resp.RespondError(c, 500, "Failed to save OIDC provider configuration: "+err.Error())
+		api.RespondError(c, 500, "Failed to save OIDC provider configuration: "+err.Error())
 		return
 	}
-	cfg, _ := conf.GetWithV1Format()
+	OAuthProvider, _ := config.GetAs[string](config.OAuthProviderKey, "github")
 	// 正在使用，重载
-	if cfg.OAuthProvider == oidcConfig.Name {
+	if OAuthProvider == oidcConfig.Name {
 		err := oauth.LoadProvider(oidcConfig.Name, oidcConfig.Addition)
 		if err != nil {
-			resp.RespondError(c, 500, "Failed to load OIDC provider: "+err.Error())
+			api.RespondError(c, 500, "Failed to load OIDC provider: "+err.Error())
 			return
 		}
 	}
-	resp.RespondSuccess(c, gin.H{"message": "OIDC provider set successfully"})
+	api.RespondSuccess(c, gin.H{"message": "OIDC provider set successfully"})
 }

api/admin/ping.go

@@ -2,11 +2,12 @@ package admin
 
 import (
 	"net/http"
+	"strconv"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/database/tasks"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/database/tasks"
 )
 
 // POST body: clients []string, target, task_type string, interval int
@@ -20,14 +21,14 @@ func AddPingTask(c *gin.Context) {
 	}
 
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, http.StatusBadRequest, err.Error())
+		api.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
 	if taskID, err := tasks.AddPingTask(req.Clients, req.Name, req.Target, req.TaskType, req.Interval); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, err.Error())
+		api.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
-		resp.RespondSuccess(c, gin.H{"task_id": taskID})
+		api.RespondSuccess(c, gin.H{"task_id": taskID})
 	}
 }
 
@@ -37,14 +38,14 @@ func DeletePingTask(c *gin.Context) {
 		ID []uint `json:"id" binding:"required"`
 	}
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, http.StatusBadRequest, err.Error())
+		api.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
 	if err := tasks.DeletePingTask(req.ID); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, err.Error())
+		api.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
-		resp.RespondSuccess(c, nil)
+		api.RespondSuccess(c, nil)
 	}
 }
 
@@ -55,26 +56,51 @@ func EditPingTask(c *gin.Context) {
 	}
 
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, http.StatusBadRequest, "Invalid request data")
+		api.RespondError(c, http.StatusBadRequest, "Invalid request data")
 		return
 	}
 
 	if err := tasks.EditPingTask(req.Tasks); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, err.Error())
+		api.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
 		// for _, task := range req.Tasks {
 		// 	tasks.DeletePingRecords([]uint{task.Id})
 		// }
-		resp.RespondSuccess(c, nil)
+		api.RespondSuccess(c, nil)
 	}
 }
 
 func GetAllPingTasks(c *gin.Context) {
 	tasks, err := tasks.GetAllPingTasks()
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, err.Error())
+		api.RespondError(c, http.StatusInternalServerError, err.Error())
 		return
 	}
 
-	resp.RespondSuccess(c, tasks)
+	api.RespondSuccess(c, tasks)
+}
+
+func OrderPingTask(c *gin.Context) {
+	var req map[string]int
+	if err := c.ShouldBindJSON(&req); err != nil {
+		api.RespondError(c, http.StatusBadRequest, "Invalid or missing request body: "+err.Error())
+		return
+	}
+
+	order := make(map[uint]int, len(req))
+	for idStr, weight := range req {
+		id, err := strconv.ParseUint(idStr, 10, 64)
+		if err != nil {
+			api.RespondError(c, http.StatusBadRequest, "Invalid task id: "+idStr)
+			return
+		}
+		order[uint(id)] = weight
+	}
+
+	if err := tasks.UpdatePingTaskOrder(order); err != nil {
+		api.RespondError(c, http.StatusInternalServerError, err.Error())
+		return
+	}
+
+	api.RespondSuccess(c, nil)
 }

api/admin/sessions.go

@@ -1,9 +1,9 @@
 package admin
 
 import (
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/accounts"
-	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/database/auditlog"
 
 	"github.com/gin-gonic/gin"
 )
@@ -12,7 +12,7 @@ func GetSessions(c *gin.Context) {
 
 	ss, err := accounts.GetAllSessions()
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to retrieve sessions: "+err.Error())
+		api.RespondError(c, 500, "Failed to retrieve sessions: "+err.Error())
 		return
 	}
 	current, _ := c.Cookie("session_token")
@@ -24,27 +24,27 @@ func DeleteSession(c *gin.Context) {
 		Session string `json:"session" binding:"required"`
 	}
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, 400, "Invalid request: "+err.Error())
+		api.RespondError(c, 400, "Invalid request: "+err.Error())
 		return
 	}
 	err := accounts.DeleteSession(req.Session)
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to delete session: "+err.Error())
+		api.RespondError(c, 500, "Failed to delete session: "+err.Error())
 		return
 	}
 	uuid, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), uuid.(string), "delete session", "info")
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }
 
 func DeleteAllSession(c *gin.Context) {
 
 	err := accounts.DeleteAllSessions()
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to delete all sessions: "+err.Error())
+		api.RespondError(c, 500, "Failed to delete all sessions: "+err.Error())
 		return
 	}
 	uuid, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), uuid.(string), "delete all sessions", "warn")
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }

api/admin/settings.go

@@ -0,0 +1,54 @@
+package admin
+
+import (
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/auditlog"
+	"github.com/komari-monitor/komari/database/records"
+	"github.com/komari-monitor/komari/database/tasks"
+
+	"github.com/gin-gonic/gin"
+)
+
+// GetSettings 获取自定义配置
+func GetSettings(c *gin.Context) {
+	cst, err := config.GetAll()
+	if err != nil {
+		api.RespondError(c, 500, "Failed to get settings: "+err.Error())
+		return
+	}
+	api.RespondSuccess(c, cst)
+}
+
+// EditSettings 更新自定义配置
+func EditSettings(c *gin.Context) {
+	cfg := make(map[string]interface{})
+	if err := c.ShouldBindJSON(&cfg); err != nil {
+		api.RespondError(c, 400, "Invalid or missing request body: "+err.Error())
+		return
+	}
+
+	if err := config.SetMany(cfg); err != nil {
+		api.RespondError(c, 500, "Failed to update settings: "+err.Error())
+		return
+	}
+
+	uuid, _ := c.Get("uuid")
+	message := "update settings: "
+	for key := range cfg {
+		message += key + ", "
+	}
+	if len(message) > 2 {
+		message = message[:len(message)-2]
+	}
+	auditlog.Log(c.ClientIP(), uuid.(string), message, "info")
+	api.RespondSuccess(c, nil)
+}
+
+func ClearAllRecords(c *gin.Context) {
+	records.DeleteAll()
+	tasks.DeleteAllPingRecords()
+	uuid, _ := c.Get("uuid")
+	auditlog.Log(c.ClientIP(), uuid.(string), "clear all records", "info")
+	api.RespondSuccess(c, nil)
+}

api/admin/task.go

@@ -2,21 +2,21 @@ package admin
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/tasks"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/database/tasks"
 )
 
 func GetTasks(c *gin.Context) {
 	dbTasks, err := tasks.GetAllTasks()
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to retrieve tasks: "+err.Error())
+		api.RespondError(c, 500, "Failed to retrieve tasks: "+err.Error())
 		return
 	}
 	var responseTasks []gin.H
 	for _, t := range dbTasks {
 		results, err := tasks.GetTaskResultsByTaskId(t.TaskId)
 		if err != nil {
-			resp.RespondError(c, 500, "Failed to retrieve task results: "+err.Error())
+			api.RespondError(c, 500, "Failed to retrieve task results: "+err.Error())
 			return
 		}
 
@@ -38,27 +38,27 @@ func GetTasks(c *gin.Context) {
 			"results": filteredResults,
 		})
 	}
-	resp.RespondSuccess(c, responseTasks)
+	api.RespondSuccess(c, responseTasks)
 }
 
 func GetTaskById(c *gin.Context) {
 	taskId := c.Param("task_id")
 	if taskId == "" {
-		resp.RespondError(c, 400, "Task ID is required")
+		api.RespondError(c, 400, "Task ID is required")
 		return
 	}
 	task, err := tasks.GetTaskByTaskId(taskId)
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to retrieve task: "+err.Error())
+		api.RespondError(c, 500, "Failed to retrieve task: "+err.Error())
 		return
 	}
 	if task == nil {
-		resp.RespondError(c, 404, "Task not found")
+		api.RespondError(c, 404, "Task not found")
 		return
 	}
 	results, err := tasks.GetTaskResultsByTaskId(taskId)
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to retrieve task results: "+err.Error())
+		api.RespondError(c, 500, "Failed to retrieve task results: "+err.Error())
 		return
 	}
 	var filteredResults []gin.H
@@ -71,7 +71,7 @@ func GetTaskById(c *gin.Context) {
 			"created_at":  r.CreatedAt,
 		})
 	}
-	resp.RespondSuccess(c, gin.H{
+	api.RespondSuccess(c, gin.H{
 		"task_id": task.TaskId,
 		"clients": task.Clients,
 		"command": task.Command,
@@ -82,73 +82,73 @@ func GetTaskById(c *gin.Context) {
 func GetTasksByClientId(c *gin.Context) {
 	clientId := c.Param("uuid")
 	if clientId == "" {
-		resp.RespondError(c, 400, "Client ID is required")
+		api.RespondError(c, 400, "Client ID is required")
 		return
 	}
 	tasks, err := tasks.GetTasksByClientId(clientId)
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to retrieve tasks: "+err.Error())
+		api.RespondError(c, 500, "Failed to retrieve tasks: "+err.Error())
 		return
 	}
 	if len(tasks) == 0 {
-		resp.RespondError(c, 404, "No tasks found for this client")
+		api.RespondError(c, 404, "No tasks found for this client")
 		return
 	}
-	resp.RespondSuccess(c, tasks)
+	api.RespondSuccess(c, tasks)
 }
 
 func GetSpecificTaskResult(c *gin.Context) {
 	taskId := c.Param("task_id")
 	clientId := c.Param("uuid")
 	if taskId == "" || clientId == "" {
-		resp.RespondError(c, 400, "Task ID and Client ID are required")
+		api.RespondError(c, 400, "Task ID and Client ID are required")
 		return
 	}
 	result, err := tasks.GetSpecificTaskResult(taskId, clientId)
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to retrieve task result: "+err.Error())
+		api.RespondError(c, 500, "Failed to retrieve task result: "+err.Error())
 		return
 	}
 	if result == nil {
-		resp.RespondError(c, 404, "No result found for this task and client")
+		api.RespondError(c, 404, "No result found for this task and client")
 		return
 	}
-	resp.RespondSuccess(c, result)
+	api.RespondSuccess(c, result)
 }
 
 // Param: task_id
 func GetTaskResultsByTaskId(c *gin.Context) {
 	taskId := c.Param("task_id")
 	if taskId == "" {
-		resp.RespondError(c, 400, "Task ID is required")
+		api.RespondError(c, 400, "Task ID is required")
 		return
 	}
 	results, err := tasks.GetTaskResultsByTaskId(taskId)
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to retrieve task results: "+err.Error())
+		api.RespondError(c, 500, "Failed to retrieve task results: "+err.Error())
 		return
 	}
 	if len(results) == 0 {
-		resp.RespondError(c, 404, "No results found for this task")
+		api.RespondError(c, 404, "No results found for this task")
 		return
 	}
-	resp.RespondSuccess(c, results)
+	api.RespondSuccess(c, results)
 }
 
 func GetAllTaskResultByUUID(c *gin.Context) {
 	clientId := c.Param("uuid")
 	if clientId == "" {
-		resp.RespondError(c, 400, "Client ID is required")
+		api.RespondError(c, 400, "Client ID is required")
 		return
 	}
 	results, err := tasks.GetAllTasksResultByUUID(clientId)
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to retrieve tasks: "+err.Error())
+		api.RespondError(c, 500, "Failed to retrieve tasks: "+err.Error())
 		return
 	}
 	if len(results) == 0 {
-		resp.RespondError(c, 404, "No tasks found for this client")
+		api.RespondError(c, 404, "No tasks found for this client")
 		return
 	}
-	resp.RespondSuccess(c, results)
+	api.RespondSuccess(c, results)
 }

api/admin/test/test.go

@@ -0,0 +1,50 @@
+package test
+
+import (
+	"net"
+
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/utils/geoip"
+	"github.com/komari-monitor/komari/utils/messageSender"
+)
+
+func TestSendMessage(c *gin.Context) {
+	err := messageSender.SendEvent(models.EventMessage{
+		Event:   "Test",
+		Message: "This is a test message from Komari.",
+	})
+	if err != nil {
+		api.RespondError(c, 500, "Failed to send message: "+err.Error())
+		return
+	}
+	api.RespondSuccess(c, nil)
+}
+
+func TestGeoIp(c *gin.Context) {
+	ip := c.Query("ip")
+	if ip == "" {
+		if cfIP := c.GetHeader("CF-Connecting-IP"); cfIP != "" {
+			ip = cfIP
+		} else {
+			ip = c.ClientIP()
+		}
+	}
+	cfg, err := config.GetAs[bool](config.GeoIpEnabledKey, false)
+	if err != nil {
+		api.RespondError(c, 500, "Failed to get configuration: "+err.Error())
+		return
+	}
+	if !cfg {
+		api.RespondError(c, 400, "GeoIP is not enabled in the configuration.")
+		return
+	}
+	GeoIpRecord, err := geoip.GetGeoInfo(net.ParseIP(ip))
+	if err != nil {
+		api.RespondError(c, 500, "Failed to get GeoIP record: "+err.Error())
+		return
+	}
+	api.RespondSuccess(c, GeoIpRecord)
+}

api/admin/theme.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"net"
 	"net/http"
 	"net/url"
 	"os"
@@ -13,10 +14,11 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/public"
 )
 
 // UploadTheme 上传主题
@@ -24,32 +26,32 @@ func UploadTheme(c *gin.Context) {
 	// 读取上传的文件内容
 	data, err := io.ReadAll(c.Request.Body)
 	if err != nil || len(data) == 0 {
-		resp.RespondError(c, http.StatusBadRequest, "请选择要上传的主题文件")
+		api.RespondError(c, http.StatusBadRequest, "请选择要上传的主题文件")
 		return
 	}
 
 	// 临时文件名
 	tempFile := filepath.Join(os.TempDir(), "uploaded_theme.zip")
 	if err := os.WriteFile(tempFile, data, 0644); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "保存文件失败: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "保存文件失败: "+err.Error())
 		return
 	}
 	defer os.Remove(tempFile)
 
 	// 检查文件扩展名（这里假定上传的就是zip）
 	if !strings.HasSuffix(strings.ToLower(tempFile), ".zip") {
-		resp.RespondError(c, http.StatusBadRequest, "只支持ZIP格式的主题文件")
+		api.RespondError(c, http.StatusBadRequest, "只支持ZIP格式的主题文件")
 		return
 	}
 
 	// 解压ZIP文件并验证
 	themeInfo, err := extractAndValidateTheme(tempFile)
 	if err != nil {
-		resp.RespondError(c, http.StatusBadRequest, err.Error())
+		api.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
-	resp.RespondSuccessMessage(c, "主题上传成功", themeInfo)
+	api.RespondSuccessMessage(c, "主题上传成功", themeInfo)
 }
 
 // ListThemes 列出所有主题
@@ -58,17 +60,26 @@ func ListThemes(c *gin.Context) {
 
 	// 确保主题目录存在
 	if _, err := os.Stat(dataDir); os.IsNotExist(err) {
-		resp.RespondSuccess(c, []models.Theme{})
+		api.RespondSuccess(c, []models.Theme{})
 		return
 	}
 
 	entries, err := os.ReadDir(dataDir)
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "读取主题目录失败: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "读取主题目录失败: "+err.Error())
 		return
 	}
 
 	var themes []models.Theme
+	defaultTheme, err := public.PublicFS.ReadFile("defaultTheme/komari-theme.json")
+	if err == nil {
+		dt := models.Theme{}
+		err := json.Unmarshal(defaultTheme, &dt)
+		if err == nil {
+			themes = append(themes, dt)
+		}
+
+	}
 	for _, entry := range entries {
 		if entry.IsDir() {
 			themeConfigPath := filepath.Join(dataDir, entry.Name(), "komari-theme.json")
@@ -78,7 +89,7 @@ func ListThemes(c *gin.Context) {
 		}
 	}
 
-	resp.RespondSuccess(c, themes)
+	api.RespondSuccess(c, themes)
 }
 
 // DeleteTheme 删除主题
@@ -88,12 +99,12 @@ func DeleteTheme(c *gin.Context) {
 	}
 
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, http.StatusBadRequest, "参数错误: "+err.Error())
+		api.RespondError(c, http.StatusBadRequest, "参数错误: "+err.Error())
 		return
 	}
 
 	if req.Short == "default" {
-		resp.RespondError(c, http.StatusBadRequest, "默认主题不能删除")
+		api.RespondError(c, http.StatusBadRequest, "默认主题不能删除")
 		return
 	}
 
@@ -101,24 +112,24 @@ func DeleteTheme(c *gin.Context) {
 
 	// 检查主题是否存在
 	if _, err := os.Stat(themeDir); os.IsNotExist(err) {
-		resp.RespondError(c, http.StatusNotFound, "主题不存在")
+		api.RespondError(c, http.StatusNotFound, "主题不存在")
 		return
 	}
 
 	// 删除主题目录
 	if err := os.RemoveAll(themeDir); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "删除主题失败: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "删除主题失败: "+err.Error())
 		return
 	}
 
-	resp.RespondSuccessMessage(c, "主题删除成功", nil)
+	api.RespondSuccessMessage(c, "主题删除成功", nil)
 }
 
 // SetTheme 设置主题
 func SetTheme(c *gin.Context) {
 	themeName := c.Query("theme")
 	if themeName == "" {
-		resp.RespondError(c, http.StatusBadRequest, "主题名称不能为空")
+		api.RespondError(c, http.StatusBadRequest, "主题名称不能为空")
 		return
 	}
 
@@ -128,22 +139,17 @@ func SetTheme(c *gin.Context) {
 		themeConfigPath := filepath.Join(themeDir, "komari-theme.json")
 
 		if _, err := os.Stat(themeConfigPath); os.IsNotExist(err) {
-			resp.RespondError(c, http.StatusNotFound, "主题不存在")
+			api.RespondError(c, http.StatusNotFound, "主题不存在")
 			return
 		}
 	}
 
-	// 更新配置
-	updateData := map[string]interface{}{
-		"theme": themeName,
-	}
-
-	if err := conf.Update(updateData); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "更新主题设置失败: "+err.Error())
+	if err := config.Set("theme", themeName); err != nil {
+		api.RespondError(c, http.StatusInternalServerError, "更新主题设置失败: "+err.Error())
 		return
 	}
 
-	resp.RespondSuccessMessage(c, "主题设置成功", gin.H{"theme": themeName})
+	api.RespondSuccessMessage(c, "主题设置成功", gin.H{"theme": themeName})
 }
 
 // extractAndValidateTheme 解压并验证主题
@@ -286,9 +292,39 @@ func isValidThemeShort(short string) bool {
 }
 
 // downloadThemeFromURL 从URL下载主题文件
-func downloadThemeFromURL(url string) ([]byte, error) {
+// isPrivateIP checks if the resolved IP addresses are private/internal
+func isPrivateIP(host string) bool {
+	ips, err := net.LookupHost(host)
+	if err != nil {
+		return true // fail closed
+	}
+	for _, ipStr := range ips {
+		ip := net.ParseIP(ipStr)
+		if ip == nil {
+			continue
+		}
+		if ip.IsLoopback() || ip.IsPrivate() || ip.IsLinkLocalUnicast() || ip.IsLinkLocalMulticast() {
+			return true
+		}
+	}
+	return false
+}
+
+func downloadThemeFromURL(rawURL string) ([]byte, error) {
+	// SSRF protection: block requests to private/internal IPs
+	parsedURL, err := url.Parse(rawURL)
+	if err != nil {
+		return nil, fmt.Errorf("invalid URL: %v", err)
+	}
+	if parsedURL.Scheme != "http" && parsedURL.Scheme != "https" {
+		return nil, fmt.Errorf("only http and https schemes are allowed")
+	}
+	if isPrivateIP(parsedURL.Hostname()) {
+		return nil, fmt.Errorf("requests to private/internal addresses are not allowed")
+	}
+
 	// 发送HTTP GET请求
-	resp, err := http.Get(url)
+	resp, err := http.Get(rawURL)
 	if err != nil {
 		return nil, fmt.Errorf("下载主题文件失败: %v", err)
 	}
@@ -431,7 +467,7 @@ func UpdateTheme(c *gin.Context) {
 	}
 
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, http.StatusBadRequest, "参数错误: "+err.Error())
+		api.RespondError(c, http.StatusBadRequest, "参数错误: "+err.Error())
 		return
 	}
 
@@ -440,14 +476,14 @@ func UpdateTheme(c *gin.Context) {
 	themeConfigPath := filepath.Join(themeDir, "komari-theme.json")
 
 	if _, err := os.Stat(themeConfigPath); os.IsNotExist(err) {
-		resp.RespondError(c, http.StatusNotFound, "主题不存在")
+		api.RespondError(c, http.StatusNotFound, "主题不存在")
 		return
 	}
 
 	// 加载现有主题配置
 	themeInfo, err := loadThemeConfig(themeConfigPath)
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "读取主题配置失败: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "读取主题配置失败: "+err.Error())
 		return
 	}
 
@@ -494,14 +530,14 @@ func UpdateTheme(c *gin.Context) {
 			// 相当于: DOWNLOAD_URL=$(curl -s https://api.github.com/repos/owner/repo/releases/latest | jq -r ".assets[0].browser_download_url")
 			gitHubURL, err := getGitHubReleaseDownloadURL(req.GitOwner, req.GitRepo)
 			if err != nil {
-				resp.RespondError(c, http.StatusBadRequest, "从GitHub获取下载链接失败: "+err.Error())
+				api.RespondError(c, http.StatusBadRequest, "从GitHub获取下载链接失败: "+err.Error())
 				return
 			}
 
 			// 使用获取到的链接下载主题
 			themeData, err = downloadThemeFromURL(gitHubURL)
 			if err != nil {
-				resp.RespondError(c, http.StatusBadRequest, "从GitHub下载主题失败: "+err.Error())
+				api.RespondError(c, http.StatusBadRequest, "从GitHub下载主题失败: "+err.Error())
 				return
 			}
 			// 保存下载链接，稍后更新到主题配置中
@@ -515,14 +551,14 @@ func UpdateTheme(c *gin.Context) {
 				// 这里也应用了自动检测GitHub仓库并下载最新release的功能
 				gitHubURL, err := getGitHubReleaseDownloadURL(owner, repo)
 				if err != nil {
-					resp.RespondError(c, http.StatusBadRequest, "从GitHub获取下载链接失败: "+err.Error())
+					api.RespondError(c, http.StatusBadRequest, "从GitHub获取下载链接失败: "+err.Error())
 					return
 				}
 
 				// 使用获取到的链接下载主题
 				themeData, err = downloadThemeFromURL(gitHubURL)
 				if err != nil {
-					resp.RespondError(c, http.StatusBadRequest, "从GitHub下载主题失败: "+err.Error())
+					api.RespondError(c, http.StatusBadRequest, "从GitHub下载主题失败: "+err.Error())
 					return
 				}
 				// 保存GitHub仓库URL，而不是release下载链接，以便将来可以获取最新版本
@@ -533,7 +569,7 @@ func UpdateTheme(c *gin.Context) {
 				// 新URL不是GitHub仓库地址，直接尝试下载
 				themeData, err = downloadThemeFromURL(req.URL)
 				if err != nil {
-					resp.RespondError(c, http.StatusBadRequest, "从新URL下载主题失败: "+err.Error())
+					api.RespondError(c, http.StatusBadRequest, "从新URL下载主题失败: "+err.Error())
 					return
 				}
 				// downloadURL = req.URL
@@ -543,7 +579,7 @@ func UpdateTheme(c *gin.Context) {
 
 	// 如果没有成功下载主题数据
 	if themeData == nil || len(themeData) == 0 {
-		resp.RespondError(c, http.StatusBadRequest, "无法下载主题，请提供有效的URL或GitHub仓库信息")
+		api.RespondError(c, http.StatusBadRequest, "无法下载主题，请提供有效的URL或GitHub仓库信息")
 		return
 	}
 
@@ -556,7 +592,7 @@ func UpdateTheme(c *gin.Context) {
 	// 临时文件名
 	tempFile := filepath.Join(os.TempDir(), "downloaded_theme.zip")
 	if err := os.WriteFile(tempFile, themeData, 0644); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "保存文件失败: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "保存文件失败: "+err.Error())
 		return
 	}
 	defer os.Remove(tempFile)
@@ -564,7 +600,7 @@ func UpdateTheme(c *gin.Context) {
 	// 解压ZIP文件并验证
 	updatedThemeInfo, err := extractAndValidateTheme(tempFile)
 	if err != nil {
-		resp.RespondError(c, http.StatusBadRequest, err.Error())
+		api.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
@@ -576,23 +612,165 @@ func UpdateTheme(c *gin.Context) {
 	// 	updatedConfigPath := filepath.Join("./data/theme", updatedThemeInfo.Short, "komari-theme.json")
 	// 	updatedConfigData, err := json.MarshalIndent(updatedThemeInfo, "", "  ")
 	// 	if err != nil {
-	// 		resp.RespondError(c, http.StatusInternalServerError, "生成主题配置失败: "+err.Error())
+	// 		api.RespondError(c, http.StatusInternalServerError, "生成主题配置失败: "+err.Error())
 	// 		return
 	// 	}
 
 	// 	if err := os.WriteFile(updatedConfigPath, updatedConfigData, 0644); err != nil {
-	// 		resp.RespondError(c, http.StatusInternalServerError, "更新主题配置文件失败: "+err.Error())
+	// 		api.RespondError(c, http.StatusInternalServerError, "更新主题配置文件失败: "+err.Error())
 	// 		return
 	// 	}
 	// }
 
-	resp.RespondSuccessMessage(c, "主题更新成功", updatedThemeInfo)
+	api.RespondSuccessMessage(c, "主题更新成功", updatedThemeInfo)
+}
+
+// peekThemeFromZip 仅从ZIP文件中读取komari-theme.json并解析主题信息
+// 不执行解压安装，用于preview模式
+func peekThemeFromZip(zipPath string) (models.Theme, error) {
+	var themeInfo models.Theme
+
+	r, err := zip.OpenReader(zipPath)
+	if err != nil {
+		return themeInfo, fmt.Errorf("无法打开ZIP文件: %v", err)
+	}
+	defer r.Close()
+
+	var themeConfigFile *zip.File
+	for _, f := range r.File {
+		if f.Name == "komari-theme.json" {
+			themeConfigFile = f
+			break
+		}
+	}
+
+	if themeConfigFile == nil {
+		return themeInfo, fmt.Errorf("主题配置文件 komari-theme.json 不存在，不是合法的主题包")
+	}
+
+	rc, err := themeConfigFile.Open()
+	if err != nil {
+		return themeInfo, fmt.Errorf("无法读取主题配置文件: %v", err)
+	}
+	defer rc.Close()
+
+	configData, err := io.ReadAll(rc)
+	if err != nil {
+		return themeInfo, fmt.Errorf("读取主题配置失败: %v", err)
+	}
+
+	if err := json.Unmarshal(configData, &themeInfo); err != nil {
+		return themeInfo, fmt.Errorf("主题配置格式错误: %v", err)
+	}
+
+	if themeInfo.Name == "" || themeInfo.Short == "" {
+		return themeInfo, fmt.Errorf("主题配置缺少必填字段（name、short）")
+	}
+
+	if !isValidThemeShort(themeInfo.Short) {
+		return themeInfo, fmt.Errorf("主题short字段格式无效，只允许字母、数字、下划线和连字符")
+	}
+
+	return themeInfo, nil
+}
+
+// ImportTheme 导入远程主题
+// 支持preview查询参数：preview=true时仅返回主题信息，否则下载安装
+// 请求body: {"url": "https://..."}
+// URL支持GitHub仓库地址（自动取latest release）和直接ZIP下载链接
+func ImportTheme(c *gin.Context) {
+	var req struct {
+		URL string `json:"url" binding:"required"`
+	}
+
+	if err := c.ShouldBindJSON(&req); err != nil {
+		api.RespondError(c, http.StatusBadRequest, "参数错误: "+err.Error())
+		return
+	}
+
+	// 解析下载链接
+	downloadURL := req.URL
+	isGitHub, owner, repo := isGitHubRepoURL(req.URL)
+	if isGitHub {
+		gitHubURL, err := getGitHubReleaseDownloadURL(owner, repo)
+		if err != nil {
+			api.RespondError(c, http.StatusBadRequest, "从GitHub获取下载链接失败: "+err.Error())
+			return
+		}
+		downloadURL = gitHubURL
+	}
+
+	// 下载主题ZIP
+	themeData, err := downloadThemeFromURL(downloadURL)
+	if err != nil {
+		api.RespondError(c, http.StatusBadRequest, "下载主题失败: "+err.Error())
+		return
+	}
+
+	// 保存到临时文件
+	tempFile := filepath.Join(os.TempDir(), "import_theme.zip")
+	if err := os.WriteFile(tempFile, themeData, 0644); err != nil {
+		api.RespondError(c, http.StatusInternalServerError, "保存文件失败: "+err.Error())
+		return
+	}
+	defer os.Remove(tempFile)
+
+	// preview模式：仅解析并返回主题信息
+	preview := c.Query("preview")
+	if preview == "true" {
+		themeInfo, err := peekThemeFromZip(tempFile)
+		if err != nil {
+			api.RespondError(c, http.StatusBadRequest, err.Error())
+			return
+		}
+
+		// 检查是否已存在同名主题
+		exists := false
+		themeDir := filepath.Join("./data/theme", themeInfo.Short)
+		if _, err := os.Stat(themeDir); err == nil {
+			exists = true
+		}
+
+		api.RespondSuccess(c, gin.H{
+			"theme":  themeInfo,
+			"exists": exists,
+		})
+		return
+	}
+
+	// 安装模式：检查是否存在同名主题
+	// 先peek一下获取short名称用于检测冲突
+	themeInfo, err := peekThemeFromZip(tempFile)
+	if err != nil {
+		api.RespondError(c, http.StatusBadRequest, err.Error())
+		return
+	}
+
+	overwritten := false
+	themeDir := filepath.Join("./data/theme", themeInfo.Short)
+	if _, err := os.Stat(themeDir); err == nil {
+		overwritten = true
+	}
+
+	// 解压安装
+	installedTheme, err := extractAndValidateTheme(tempFile)
+	if err != nil {
+		api.RespondError(c, http.StatusBadRequest, err.Error())
+		return
+	}
+
+	msg := "主题导入成功"
+	if overwritten {
+		msg = "主题导入成功（已覆盖同名主题）"
+	}
+
+	api.RespondSuccessMessage(c, msg, installedTheme)
 }
 
 func UpdateThemeSettings(c *gin.Context) {
 	theme := c.Query("theme")
-	if theme == "" || theme == "default" {
-		resp.RespondError(c, http.StatusBadRequest, "主题名称不能为空或不能是默认主题")
+	if theme == "" {
+		api.RespondError(c, http.StatusBadRequest, "主题名称不能为空")
 		return
 	}
 
@@ -600,14 +778,14 @@ func UpdateThemeSettings(c *gin.Context) {
 
 	err := c.ShouldBindJSON(&req)
 	if err != nil {
-		resp.RespondError(c, http.StatusBadRequest, "参数错误: "+err.Error())
+		api.RespondError(c, http.StatusBadRequest, "参数错误: "+err.Error())
 		return
 	}
 	db := dbcore.GetDBInstance()
 
 	data, err := json.Marshal(&req)
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "生成主题配置失败: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "生成主题配置失败: "+err.Error())
 		return
 	}
 
@@ -615,5 +793,5 @@ func UpdateThemeSettings(c *gin.Context) {
 	db.Where("short = ?", theme).
 		Assign(models.ThemeConfiguration{Short: theme, Data: string(data)}).
 		FirstOrCreate(&themeCfg)
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }

api/admin/update/favicon.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/database/auditlog"
 )
 
 func UploadFavicon(c *gin.Context) {
@@ -16,31 +16,31 @@ func UploadFavicon(c *gin.Context) {
 	data, err := io.ReadAll(c.Request.Body)
 	if err != nil {
 		if strings.Contains(err.Error(), "request body too large") {
-			resp.RespondError(c, http.StatusRequestEntityTooLarge, "File too large. Maximum size is 5MB")
+			api.RespondError(c, http.StatusRequestEntityTooLarge, "File too large. Maximum size is 5MB")
 		} else {
-			resp.RespondError(c, http.StatusBadRequest, err.Error())
+			api.RespondError(c, http.StatusBadRequest, err.Error())
 		}
 		return
 	}
 	if err := os.WriteFile("./data/favicon.ico", data, 0644); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, "Failed to save favicon: "+err.Error())
+		api.RespondError(c, http.StatusInternalServerError, "Failed to save favicon: "+err.Error())
 		return
 	}
 	uuid, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), uuid.(string), "Favicon uploaded", "info")
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }
 
 func DeleteFavicon(c *gin.Context) {
 	if err := os.Remove("./data/favicon.ico"); err != nil {
 		if os.IsNotExist(err) {
-			resp.RespondError(c, http.StatusNotFound, "Favicon not found")
+			api.RespondError(c, http.StatusNotFound, "Favicon not found")
 		} else {
-			resp.RespondError(c, http.StatusInternalServerError, "Failed to delete favicon: "+err.Error())
+			api.RespondError(c, http.StatusInternalServerError, "Failed to delete favicon: "+err.Error())
 		}
 		return
 	}
 	uuid, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), uuid.(string), "Favicon deleted", "info")
-	resp.RespondSuccess(c, nil)
+	api.RespondSuccess(c, nil)
 }

api/admin/update/geoip.go

@@ -0,0 +1,18 @@
+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"
+)
+
+func UpdateMmdbGeoIP(c *gin.Context) {
+	if err := geoip.UpdateDatabase(); err != nil {
+		api.RespondError(c, 500, "Failed to update GeoIP database "+err.Error())
+		return
+	}
+	uuid, _ := c.Get("uuid")
+	auditlog.Log(c.ClientIP(), uuid.(string), "GeoIP database updated", "info")
+	api.RespondSuccess(c, nil)
+}

api/admin/update/user.go

@@ -2,9 +2,9 @@ package update
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/accounts"
-	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/database/auditlog"
 )
 
 func UpdateUser(c *gin.Context) {
@@ -15,26 +15,26 @@ func UpdateUser(c *gin.Context) {
 		SsoType  *string `json:"sso_type"`
 	}
 	if err := c.ShouldBindJSON(&req); err != nil {
-		resp.RespondError(c, 400, "Invalid or missing request body: "+err.Error())
+		api.RespondError(c, 400, "Invalid or missing request body: "+err.Error())
 		return
 	}
 	if req.Password == nil && req.Name == nil {
-		resp.RespondError(c, 400, "At least one field (username or password) must be provided")
+		api.RespondError(c, 400, "At least one field (username or password) must be provided")
 		return
 	}
 	if req.Name != nil && len(*req.Name) < 3 {
-		resp.RespondError(c, 400, "Username must be at least 3 characters long")
+		api.RespondError(c, 400, "Username must be at least 3 characters long")
 		return
 	}
 	if req.Password != nil && len(*req.Password) < 6 {
-		resp.RespondError(c, 400, "Password must be at least 6 characters long")
+		api.RespondError(c, 400, "Password must be at least 6 characters long")
 		return
 	}
 	if err := accounts.UpdateUser(req.Uuid, req.Name, req.Password, req.SsoType); err != nil {
-		resp.RespondError(c, 500, "Failed to update user: "+err.Error())
+		api.RespondError(c, 500, "Failed to update user: "+err.Error())
 		return
 	}
 	uuid, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), uuid.(string), "User updated", "warn")
-	resp.RespondSuccess(c, gin.H{"uuid": req.Uuid})
+	api.RespondSuccess(c, gin.H{"uuid": req.Uuid})
 }

api/admin/upload.go

@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
+	"github.com/komari-monitor/komari/api"
 )
 
 // 只有一个备份恢复操作在进行
@@ -23,7 +23,7 @@ var restoreMutex sync.Mutex
 func UploadBackup(c *gin.Context) {
 	// 尝试获取锁，如果已有恢复操作在进行，则立即返回错误
 	if !restoreMutex.TryLock() {
-		resp.RespondError(c, http.StatusConflict, "Another restore operation is already in progress")
+		api.RespondError(c, http.StatusConflict, "Another restore operation is already in progress")
 		return
 	}
 	defer restoreMutex.Unlock()
@@ -31,27 +31,27 @@ func UploadBackup(c *gin.Context) {
 	// 获取上传的文件
 	file, header, err := c.Request.FormFile("backup")
 	if err != nil {
-		resp.RespondError(c, http.StatusBadRequest, fmt.Sprintf("Error getting uploaded file: %v", err))
+		api.RespondError(c, http.StatusBadRequest, fmt.Sprintf("Error getting uploaded file: %v", err))
 		return
 	}
 	defer file.Close()
 
 	// 检查文件是否为zip格式
 	if !strings.HasSuffix(strings.ToLower(header.Filename), ".zip") {
-		resp.RespondError(c, http.StatusBadRequest, "Uploaded file must be a ZIP archive")
+		api.RespondError(c, http.StatusBadRequest, "Uploaded file must be a ZIP archive")
 		return
 	}
 
 	// 确保data目录存在
 	if err := os.MkdirAll("./data", 0755); err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating data directory: %v", err))
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating data directory: %v", err))
 		return
 	}
 
 	// 创建临时文件保存上传的zip（先校验，再落地到固定位置）
 	tempFile, err := os.CreateTemp("", "backup-upload-*.zip")
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating temporary file: %v", err))
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating temporary file: %v", err))
 		return
 	}
 	tempFilePath := tempFile.Name()
@@ -61,7 +61,7 @@ func UploadBackup(c *gin.Context) {
 	_, err = io.Copy(tempFile, file)
 	if err != nil {
 		tempFile.Close()
-		resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error saving uploaded file: %v", err))
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error saving uploaded file: %v", err))
 		return
 	}
 	tempFile.Close() // 关闭文件以便后续操作
@@ -77,11 +77,11 @@ func UploadBackup(c *gin.Context) {
 		}
 		zr.Close()
 		if !hasMarkup {
-			resp.RespondError(c, http.StatusBadRequest, "Invalid backup file: missing komari-backup-markup file")
+			api.RespondError(c, http.StatusBadRequest, "Invalid backup file: missing komari-backup-markup file")
 			return
 		}
 	} else {
-		resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error opening zip file: %v", err))
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error opening zip file: %v", err))
 		return
 	}
 
@@ -93,18 +93,18 @@ func UploadBackup(c *gin.Context) {
 		// fallback：拷贝
 		in, err2 := os.Open(tempFilePath)
 		if err2 != nil {
-			resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error preparing backup file: %v", err))
+			api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error preparing backup file: %v", err))
 			return
 		}
 		defer in.Close()
 		out, err2 := os.Create(finalPath)
 		if err2 != nil {
-			resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating target backup file: %v", err2))
+			api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating target backup file: %v", err2))
 			return
 		}
 		if _, err2 = io.Copy(out, in); err2 != nil {
 			out.Close()
-			resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error writing target backup file: %v", err2))
+			api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error writing target backup file: %v", err2))
 			return
 		}
 		out.Close()

api/client/autoDiscovery.go

@@ -0,0 +1,40 @@
+package client
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/clients"
+	"github.com/komari-monitor/komari/utils"
+)
+
+func RegisterClient(c *gin.Context) {
+	auth := c.GetHeader("Authorization")
+	if auth == "" {
+		api.RespondError(c, 403, "Invalid AutoDiscovery Key")
+		return
+	}
+	AutoDiscoveryKey, err := config.GetAs[string](config.AutoDiscoveryKeyKey, "")
+	if err != nil {
+		api.RespondError(c, 500, "Failed to get AutoDiscovery Key: "+err.Error())
+		return
+	}
+	if AutoDiscoveryKey == "" ||
+		len(AutoDiscoveryKey) < 12 ||
+		"Bearer "+AutoDiscoveryKey != auth {
+
+		api.RespondError(c, 403, "Invalid AutoDiscovery Key")
+		return
+	}
+	name := c.Query("name")
+	if name == "" {
+		name = utils.GenerateRandomString(8)
+	}
+	name = "Auto-" + name
+	uuid, token, err := clients.CreateClientWithName(name)
+	if err != nil {
+		api.RespondError(c, 500, "Failed to create client: "+err.Error())
+		return
+	}
+	api.RespondSuccess(c, gin.H{"uuid": uuid, "token": token})
+}

api/client/ping.go

@@ -0,0 +1,55 @@
+package client
+
+import (
+	"net/http"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/database/tasks"
+)
+
+func GetPingTasks(c *gin.Context) {
+	uuid, _ := c.Get("client_uuid")
+	clientUUID, _ := uuid.(string)
+	if clientUUID == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "client_uuid not found"})
+		return
+	}
+
+	result := tasks.GetPingTasksByClient(clientUUID)
+	c.JSON(http.StatusOK, result)
+}
+
+func UploadPingResult(c *gin.Context) {
+	uuid, _ := c.Get("client_uuid")
+	clientUUID, _ := uuid.(string)
+	if clientUUID == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "client_uuid not found"})
+		return
+	}
+
+	var req struct {
+		TaskID     uint      `json:"task_id" binding:"required"`
+		Value      int       `json:"value"`
+		PingType   string    `json:"ping_type"`
+		FinishedAt time.Time `json:"finished_at" binding:"required"`
+	}
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
+		return
+	}
+
+	record := models.PingRecord{
+		Client: clientUUID,
+		TaskId: req.TaskID,
+		Value:  req.Value,
+		Time:   models.FromTime(req.FinishedAt),
+	}
+	if err := tasks.SavePingRecord(record); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to save ping result: " + err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{"status": "success"})
+}

api/client/report.go

@@ -5,22 +5,21 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"sync"
 	"time"
 
 	"log"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/gookit/event"
 	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/internal/api_v1/vars"
-	clients "github.com/komari-monitor/komari/internal/client"
-	"github.com/komari-monitor/komari/internal/common"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/database/tasks"
-	"github.com/komari-monitor/komari/internal/eventType"
-	"github.com/komari-monitor/komari/internal/notifier"
-	"github.com/komari-monitor/komari/internal/ws"
+	"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"
 	"github.com/patrickmn/go-cache"
 )
 
@@ -30,6 +29,73 @@ const (
 	readWait = 11 * time.Second
 )
 
+// postPresenceEntry 保存单个客户端的 POST 上报会话状态
+type postPresenceEntry struct {
+	connID     int64
+	timer      *time.Timer
+	generation uint64 // 每次 Reset 递增，用于回调中判断是否为过期的旧回调
+}
+
+var (
+	postPresenceMu     sync.Mutex
+	postPresenceStates = make(map[string]*postPresenceEntry)
+)
+
+// refreshPostPresence 管理 HTTP POST 上报者的在线/离线状态。
+// 每次 POST 刷新 TTL 定时器；定时器到期后触发离线通知。
+func refreshPostPresence(uuid string) {
+	postPresenceMu.Lock()
+	defer postPresenceMu.Unlock()
+
+	if entry, exists := postPresenceStates[uuid]; exists {
+		// 已在线：递增 generation 使可能正在执行的旧回调失效
+		entry.generation++
+		entry.timer.Stop()
+		// 重新创建 AfterFunc 以在闭包中捕获新的 generation
+		gen := entry.generation
+		entry.timer = time.AfterFunc(readWait, func() {
+			postPresenceExpired(uuid, entry.connID, gen)
+		})
+		ws.KeepAlivePresence(uuid, entry.connID, readWait)
+		return
+	}
+
+	// 新 POST 会话：生成 connID，标记在线，启动超时定时器
+	connID := time.Now().UnixNano()
+	ws.KeepAlivePresence(uuid, connID, readWait)
+	go notifier.OnlineNotification(uuid, connID)
+
+	defaultGeneration := uint64(0)
+
+	entry := &postPresenceEntry{
+		connID:     connID,
+		generation: defaultGeneration,
+	}
+
+	entry.timer = time.AfterFunc(readWait, func() {
+		postPresenceExpired(uuid, connID, defaultGeneration)
+	})
+
+	postPresenceStates[uuid] = entry
+}
+
+// postPresenceExpired 是定时器到期的回调。
+// 只有当 connID 和 generation 都与当前 entry 匹配时才执行离线清理，
+// 避免 timer.Reset 竞态导致过期回调错误地清除仍活跃的会话。
+func postPresenceExpired(uuid string, connID int64, gen uint64) {
+	postPresenceMu.Lock()
+	e, ok := postPresenceStates[uuid]
+	if !ok || e.connID != connID || e.generation != gen {
+		postPresenceMu.Unlock()
+		return
+	}
+	delete(postPresenceStates, uuid)
+	postPresenceMu.Unlock()
+
+	ws.SetPresence(uuid, connID, false)
+	notifier.OfflineNotification(uuid, connID)
+}
+
 func UploadReport(c *gin.Context) {
 	bodyBytes, err := io.ReadAll(c.Request.Body)
 	if err != nil {
@@ -52,14 +118,31 @@ func UploadReport(c *gin.Context) {
 		return
 	}
 	report.UpdatedAt = time.Now()
-	err = SaveClientReport(report.UUID, report)
+
+	// 优先使用 body 中的 UUID，若为空则从中间件注入的上下文中获取
+	uuid := report.UUID
+	if uuid == "" {
+		if v, ok := c.Get("client_uuid"); ok {
+			uuid, _ = v.(string)
+		}
+	}
+	if uuid == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "UUID is required"})
+		return
+	}
+	report.UUID = uuid
+
+	err = SaveClientReport(uuid, report)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("%v", err)})
 		return
 	}
 	// Update report with method and token
 
-	ws.SetLatestReport(report.UUID, &report)
+	ws.SetLatestReport(uuid, &report)
+
+	// POST 上报后标记节点在线，超时未收到新 POST 则触发离线
+	refreshPostPresence(uuid)
 
 	c.Request.Body = io.NopCloser(bytes.NewBuffer(bodyBytes)) // Restore the body for further use
 	c.JSON(200, gin.H{"status": "success"})
@@ -79,7 +162,7 @@ func WebSocketReport(c *gin.Context) {
 	// Upgrade the HTTP connection to a WebSocket connection
 	unsafeConn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"status": "error", "error": "Failed to upgrade to WebSocket"})
+		c.JSON(http.StatusBadRequest, gin.H{"status": "error", "error": "Failed to upgrade to WebSocket." + err.Error()})
 		return
 	}
 	conn := ws.NewSafeConn(unsafeConn)
@@ -125,18 +208,13 @@ func WebSocketReport(c *gin.Context) {
 		go oldConn.Close()
 	}
 	ws.SetConnectedClients(uuid, conn)
-	//log.Printf("Client %s is reconnect success, connID: %d", uuid, conn.ID)
+	log.Printf("Client %s is reconnect success, connID: %d", uuid, conn.ID)
 	go notifier.OnlineNotification(uuid, conn.ID)
 	defer func() {
 		ws.DeleteClientConditionally(uuid, conn)
 		notifier.OfflineNotification(uuid, conn.ID)
 	}()
 
-	event.Trigger(eventType.ClientWebsocketConnected, event.M{
-		"client": uuid,
-		"online": len(ws.GetConnectedClients()),
-		"connID": conn.ID,
-	})
 	// 首先处理第一次ws conn收到的消息
 	processMessage(conn, message, uuid)
 
@@ -150,18 +228,8 @@ func WebSocketReport(c *gin.Context) {
 			}
 			break // 任何读错误（包括超时）都意味着连接已断开，退出循环
 		}
-		event.Trigger(eventType.ClientMessageReceived, event.M{
-			"client":  uuid,
-			"type":    "websocket",
-			"message": string(message),
-		})
 		processMessage(conn, message, uuid)
 	}
-	event.Trigger(eventType.ClientWebsocketDisconnected, event.M{
-		"client": uuid,
-		"online": len(ws.GetConnectedClients()),
-		"connID": conn.ID,
-	})
 }
 
 // 将消息处理逻辑提取到一个函数中，方便复用
@@ -217,7 +285,7 @@ func processMessage(conn *ws.SafeConn, message []byte, uuid string) {
 }
 
 func SaveClientReport(uuid string, report common.Report) error {
-	reports, _ := vars.Records.Get(uuid)
+	reports, _ := api.Records.Get(uuid)
 	if reports == nil {
 		reports = []common.Report{}
 	}
@@ -225,7 +293,7 @@ func SaveClientReport(uuid string, report common.Report) error {
 		report.CPU.Usage = 0.01
 	}
 	reports = append(reports.([]common.Report), report)
-	vars.Records.Set(uuid, reports, cache.DefaultExpiration)
+	api.Records.Set(uuid, reports, cache.DefaultExpiration)
 
 	return nil
 }

api/client/task.go

@@ -4,11 +4,9 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/gookit/event"
-	clients "github.com/komari-monitor/komari/internal/client"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/database/tasks"
-	"github.com/komari-monitor/komari/internal/eventType"
+	"github.com/komari-monitor/komari/database/clients"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/database/tasks"
 )
 
 func TaskResult(c *gin.Context) {
@@ -35,9 +33,4 @@ func TaskResult(c *gin.Context) {
 	}
 
 	c.JSON(200, gin.H{"status": "success", "message": "Task result updated successfully"})
-	event.Trigger(eventType.TaskUpdated, event.M{
-		"task":   req.TaskId,
-		"client": clientId,
-		"data":   req,
-	})
 }

api/client/uploadBasicInfo.go

@@ -3,11 +3,9 @@ package client
 import (
 	"net"
 
-	"github.com/gookit/event"
-	clients "github.com/komari-monitor/komari/internal/client"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/eventType"
-	"github.com/komari-monitor/komari/internal/geoip"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/clients"
+	"github.com/komari-monitor/komari/utils/geoip"
 
 	"github.com/gin-gonic/gin"
 )
@@ -39,7 +37,7 @@ func UploadBasicInfo(c *gin.Context) {
 	}
 
 	cbi["uuid"] = uuid
-
+	// 如果没有传入 IP 信息，尝试从请求中获取
 	if (func() bool {
 		if v4, ok := cbi["ipv4"].(string); !ok || v4 == "" {
 			if v6, ok := cbi["ipv6"].(string); !ok || v6 == "" {
@@ -54,15 +52,15 @@ func UploadBasicInfo(c *gin.Context) {
 
 		switch ipType {
 		case 0:
-			cbi["ipv4"] = ip
+			cbi["ipv4"] = ipStr
 		case 1:
-			cbi["ipv6"] = ip
+			cbi["ipv6"] = ipStr
 		default:
 			break
 		}
 	}
 
-	if cfg, err := conf.GetWithV1Format(); err == nil && cfg.GeoIpEnabled {
+	if cfg, err := config.GetAs[bool](config.GeoIpEnabledKey); err == nil && cfg {
 		if ipv4, ok := cbi["ipv4"].(string); ok && ipv4 != "" {
 			ip4 := net.ParseIP(ipv4)
 			ip4_record, _ := geoip.GetGeoInfo(ip4)
@@ -78,15 +76,10 @@ func UploadBasicInfo(c *gin.Context) {
 		}
 	}
 
-	if err := clients.PartialUpdate(cbi); err != nil {
+	if err := clients.SaveClientInfo(cbi); err != nil {
 		c.JSON(500, gin.H{"status": "error", "error": err})
 		return
 	}
-	event.Trigger(eventType.ClientMessageReceived, event.M{
-		"client": cbi["uuid"],
-		"type":   "basic_info",
-		"data":   cbi,
-	})
-	c.JSON(200, gin.H{"status": "success"})
 
+	c.JSON(200, gin.H{"status": "success"})
 }

api/jsonRpc/JsonRpc.go

@@ -1,4 +1,4 @@
-package api_rpc
+package jsonRpc
 
 import (
 	"context"
@@ -11,32 +11,71 @@ import (
 	"sync"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/client"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/database/accounts"
-	"github.com/komari-monitor/komari/internal/ws"
-	"github.com/komari-monitor/komari/pkg/rpc"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/database/clients"
+	"github.com/komari-monitor/komari/utils/rpc"
+	"github.com/komari-monitor/komari/ws"
 )
 
-func RegisterRouters(path string, r *gin.Engine) {
-	r.GET(path, OnRpcRequest)
-	r.POST(path, OnRpcRequest)
+// OnInternalRequest 内部调用 RPC 方法，支持权限控制
+// group: 调用者的权限分组 (guest/client/admin)
+// method: RPC 方法名 (如 "common:getNodes")
+// params: 方法参数
+func OnInternalRequest(ctx context.Context, group string, method string, params interface{}) *rpc.JsonRpcResponse {
+	// 检查私有站点
+	PrivateSite, _ := config.GetAs[bool](config.PrivateSiteKey)
+
+	if PrivateSite && group == "guest" {
+		return rpc.ErrorResponse(nil, rpc.PermissionDenied, "Private site enabled, please login first", nil)
+	}
+
+	// 解析方法命名空间
+	fc := strings.Split(method, ":")
+	namespace := "common"
+	if len(fc) >= 2 {
+		namespace = fc[0]
+	}
+
+	// 权限检查
+	allowed := false
+	switch namespace {
+	case "guest", "", "rpc", "common":
+		allowed = true
+	case "client":
+		if group == "client" || group == "admin" {
+			allowed = true
+		}
+	case "admin":
+		if group == "admin" {
+			allowed = true
+		}
+	}
+
+	if !allowed {
+		return rpc.ErrorResponse(nil, rpc.PermissionDenied, "Permission denied", nil)
+	}
+
+	// 构建 context meta
+	meta := &rpc.ContextMeta{Permission: group}
+	return rpc.CallWithContext(rpc.NewContextWithMeta(ctx, meta), nil, method, params)
 }
 
 // Json Rpc2 over websocket, /api/rpc2
 func OnRpcRequest(c *gin.Context) {
+	AllowCors, _ := config.GetAs[bool](config.AllowCorsKey)
 
 	// GET -> WebSocket
 	if c.Request.Method == http.MethodGet {
 		_conn, err := ws.UpgradeRequest(c, func(r *http.Request) bool {
-			if conf.Conf.Site.AllowCors {
+			if AllowCors {
 				return true
 			}
 			return ws.CheckOrigin(r)
 		})
 		conn := ws.NewSafeConn(_conn)
 		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{"status": "error", "error": "Failed to upgrade to WebSocket"})
+			c.JSON(http.StatusBadRequest, gin.H{"status": "error", "error": "Failed to upgrade to WebSocket." + err.Error()})
 			return
 		}
 		permissionGroup := detectPermissionGroup(c)
@@ -94,8 +133,8 @@ func OnRpcRequest(c *gin.Context) {
 		switch fc[0] {
 		case "guest", "", "rpc", "common":
 			allowed = true
-		case GroupClient:
-			if permissionGroup == GroupClient || permissionGroup == "admin" {
+		case "client":
+			if permissionGroup == "client" || permissionGroup == "admin" {
 				allowed = true
 			}
 		case "admin":
@@ -103,11 +142,11 @@ func OnRpcRequest(c *gin.Context) {
 				allowed = true
 			}
 		default:
-			responses = append(responses, rpc.ErrorResponse(rreq.ID, rpc.Unauthenticated, "Unauthorized", nil))
+			responses = append(responses, rpc.ErrorResponse(rreq.ID, 401, "Unauthorized", nil))
 			continue
 		}
 		if !allowed {
-			responses = append(responses, rpc.ErrorResponse(rreq.ID, rpc.PermissionDenied, "Permission denied", nil))
+			responses = append(responses, rpc.ErrorResponse(rreq.ID, 401, "Unauthorized", nil))
 			continue
 		}
 		responses = append(responses, rpc.CallWithContext(rpc.NewContextWithMeta(context.TODO(), meta), rreq.ID, rreq.Method, rreq.Params))
@@ -123,9 +162,9 @@ func OnRpcRequest(c *gin.Context) {
 // detectPermissionGroup 提取权限分组，与原逻辑保持一致
 func detectPermissionGroup(c *gin.Context) string {
 	permissionGroup := "guest"
-	token := c.Query("token")
-	if _, err := client.GetClientUUIDByToken(token); err == nil {
-		permissionGroup = GroupClient
+	token := c.Query("Authorization")
+	if _, err := clients.GetClientUUIDByToken(token); err == nil {
+		permissionGroup = "client"
 	}
 	if session_token, _ := c.Cookie("session_token"); session_token != "" {
 		if _, err := accounts.GetUserBySession(session_token); err == nil {
@@ -133,7 +172,11 @@ func detectPermissionGroup(c *gin.Context) string {
 		}
 	}
 	apiKey := c.GetHeader("Authorization")
-	if apiKey == "Bearer "+conf.Conf.Login.ApiKey {
+	if len(apiKey) <= len("Bearer ") {
+		return permissionGroup
+	}
+	cfg, _ := config.GetAs[string](config.ApiKeyKey, "")
+	if len(cfg) > 8 && apiKey == "Bearer "+cfg {
 		permissionGroup = "admin"
 	}
 	return permissionGroup
@@ -142,8 +185,8 @@ func detectPermissionGroup(c *gin.Context) string {
 // buildContextMeta 从 gin.Context 构建 *rpc.ContextMeta
 func buildContextMeta(c *gin.Context, permissionGroup string) *rpc.ContextMeta {
 	meta := &rpc.ContextMeta{Permission: permissionGroup}
-	// 提取客户端 token (query token / Header Authorization Bearer token)
-	token := c.Query("token")
+	// 提取客户端 token (query Authorization / Header Authorization Bearer token)
+	token := c.Query("Authorization")
 	if token == "" {
 		// 兼容 header Bearer <token>
 		hAuth := c.GetHeader("Authorization")
@@ -152,7 +195,7 @@ func buildContextMeta(c *gin.Context, permissionGroup string) *rpc.ContextMeta {
 		}
 	}
 	if token != "" {
-		if uuid, err := client.GetClientUUIDByToken(token); err == nil {
+		if uuid, err := clients.GetClientUUIDByToken(token); err == nil {
 			meta.ClientToken = token
 			meta.ClientUUID = uuid
 		}
@@ -175,69 +218,27 @@ func dispatchByPermissionWithMeta(conn *ws.SafeConn, permissionGroup string, met
 	if len(fc) == 1 {
 		fc[0] = "common"
 	}
-	ctx := rpc.NewContextWithMeta(context.Background(), meta)
-
+	ctx := rpc.NewContextWithMeta(context.TODO(), meta)
 	switch fc[0] {
 	case "guest", "", "rpc", "common":
 		go conn.WriteJSON(rpc.CallWithContext(ctx, req.ID, req.Method, req.Params))
-	case GroupClient:
-		if permissionGroup == GroupClient || permissionGroup == "admin" {
+	case "client":
+		if permissionGroup == "client" || permissionGroup == "admin" {
 			go conn.WriteJSON(rpc.CallWithContext(ctx, req.ID, req.Method, req.Params))
 		} else {
-			conn.WriteJSON(rpc.ErrorResponse(req.ID, rpc.PermissionDenied, "Permission Denied", nil))
+			conn.WriteJSON(rpc.ErrorResponse(req.ID, 401, "Unauthorized", nil))
 		}
 	case "admin":
 		if permissionGroup == "admin" {
 			go conn.WriteJSON(rpc.CallWithContext(ctx, req.ID, req.Method, req.Params))
 		} else {
-			conn.WriteJSON(rpc.ErrorResponse(req.ID, rpc.PermissionDenied, "Permission Denied", nil))
+			conn.WriteJSON(rpc.ErrorResponse(req.ID, 401, "Unauthorized", nil))
 		}
 	default:
-		conn.WriteJSON(rpc.ErrorResponse(req.ID, rpc.Unauthenticated, "Unauthenticated", nil))
+		conn.WriteJSON(rpc.ErrorResponse(req.ID, 401, "Unauthorized", nil))
 	}
 }
 
-// OnInternalRequest 内部调用 RPC 方法，支持权限控制
-// group: 调用者的权限分组 (guest/client/admin)
-// method: RPC 方法名 (如 "common:getNodes")
-// params: 方法参数
-func OnInternalRequest(ctx context.Context, group string, method string, params interface{}) *rpc.JsonRpcResponse {
-	// 检查私有站点
-	if conf.Conf.Site.PrivateSite && group == "guest" {
-		return rpc.ErrorResponse(nil, rpc.PermissionDenied, "Private site enabled, please login first", nil)
-	}
-
-	// 解析方法命名空间
-	fc := strings.Split(method, ":")
-	namespace := "common"
-	if len(fc) >= 2 {
-		namespace = fc[0]
-	}
-
-	// 权限检查
-	allowed := false
-	switch namespace {
-	case "guest", "", "rpc", "common":
-		allowed = true
-	case GroupClient:
-		if group == GroupClient || group == "admin" {
-			allowed = true
-		}
-	case "admin":
-		if group == "admin" {
-			allowed = true
-		}
-	}
-
-	if !allowed {
-		return rpc.ErrorResponse(nil, rpc.PermissionDenied, "Permission denied", nil)
-	}
-
-	// 构建 context meta
-	meta := &rpc.ContextMeta{Permission: group}
-	return rpc.CallWithContext(rpc.NewContextWithMeta(ctx, meta), nil, method, params)
-}
-
 // registry holds method handlers keyed by "namespace:MethodName"
 var (
 	registryMu sync.RWMutex

api/jsonRpc/common.go

@@ -1,4 +1,4 @@
-package api_rpc
+package jsonRpc
 
 import (
 	"context"
@@ -8,16 +8,17 @@ import (
 	"strings"
 	"time"
 
-	"github.com/komari-monitor/komari/internal/api_v1/vars"
-	"github.com/komari-monitor/komari/internal/client"
-	"github.com/komari-monitor/komari/internal/common"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/database"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/database/tasks"
-	"github.com/komari-monitor/komari/internal/dbcore"
-	"github.com/komari-monitor/komari/internal/ws"
-	"github.com/komari-monitor/komari/pkg/rpc"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/common"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database"
+	"github.com/komari-monitor/komari/database/clients"
+	"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"
 
 	cache "github.com/patrickmn/go-cache"
 )
@@ -222,13 +223,13 @@ func getNodes(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rpc.JsonRpcEr
 		UUID string `json:"uuid"`
 	}
 	req.BindParams(&params)
-	cinfo, err := client.GetAllClientBasicInfo()
+	cinfo, err := clients.GetAllClientBasicInfo()
 	if err != nil {
 		return nil, rpc.MakeError(rpc.InternalError, "Failed to get client info", cinfo)
 	}
 	meta := rpc.MetaFromContext(ctx)
 
-	cfg, _ := conf.GetWithV1Format()
+	SendIpAddrToGuest, _ := config.GetAs[bool](config.SendIpAddrToGuestKey)
 	if meta.Permission != "admin" {
 		// 过滤 Hidden 节点并隐藏敏感字段
 		filtered := make([]models.Client, 0, len(cinfo))
@@ -236,7 +237,7 @@ func getNodes(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rpc.JsonRpcEr
 			if node.Hidden { // 非 admin 不显示隐藏节点
 				continue
 			}
-			if cfg.SendIpAddrToGuest {
+			if SendIpAddrToGuest {
 				if node.IPv4 != "" {
 					node.IPv4 = strings.Split(node.IPv4, ".")[0] + ".*.*.*"
 				}
@@ -288,15 +289,15 @@ func getNodesLatestStatus(ctx context.Context, req *rpc.JsonRpcRequest) (any, *r
 
 	meta := rpc.MetaFromContext(ctx)
 	latest := ws.GetLatestReport() // map[string]*common.Report (copy)
-	connected := ws.GetConnectedClients()
-	onlineSet := make(map[string]bool, len(connected))
-	for uuid := range connected {
+	onlineUUIDs := ws.GetAllOnlineUUIDs()
+	onlineSet := make(map[string]bool, len(onlineUUIDs))
+	for _, uuid := range onlineUUIDs {
 		onlineSet[uuid] = true
 	}
 
 	// Hidden 过滤
 	if meta.Permission != "admin" {
-		cinfo, err := client.GetAllClientBasicInfo()
+		cinfo, err := clients.GetAllClientBasicInfo()
 		if err != nil {
 			return nil, rpc.MakeError(rpc.InternalError, "Failed to get client info", err.Error())
 		}
@@ -439,7 +440,7 @@ func getMe(ctx context.Context, _ *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError)
 		resp.SSOType = "client"
 		resp.Username = "client"
 		resp.UUID = meta.ClientToken
-		client, err := client.GetClientUUIDByToken(meta.ClientToken)
+		client, err := clients.GetClientUUIDByToken(meta.ClientToken)
 		if err != nil {
 			resp.UUID = client
 		}
@@ -454,8 +455,8 @@ func getVersion(_ context.Context, _ *rpc.JsonRpcRequest) (any, *rpc.JsonRpcErro
 		Version string `json:"version"`
 		Hash    string `json:"hash"`
 	}{
-		Version: conf.Version,
-		Hash:    conf.CommitHash,
+		Version: utils.CurrentVersion,
+		Hash:    utils.VersionHash,
 	}, nil
 }
 
@@ -489,7 +490,7 @@ func getNodeRecentStatus(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rp
 		}
 	}
 
-	raw, _ := vars.Records.Get(params.UUID)
+	raw, _ := api.Records.Get(params.UUID)
 	reports, _ := raw.([]common.Report)
 
 	// 扁平化为 { count, records: [] }

api/jsonRpc/common.record.go

@@ -1,4 +1,4 @@
-package api_rpc
+package jsonRpc
 
 import (
 	"context"
@@ -7,12 +7,12 @@ import (
 	"sort"
 	"time"
 
-	"github.com/komari-monitor/komari/internal/client"
-	"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/internal/dbcore"
-	"github.com/komari-monitor/komari/pkg/rpc"
+	"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"
 )
 
 func init() {
@@ -73,7 +73,7 @@ func getRecords(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rpc.JsonRpc
 	isAdmin := meta.Permission == "admin"
 	hidden := map[string]bool{}
 	if !isAdmin {
-		cinfo, err := client.GetAllClientBasicInfo()
+		cinfo, err := clients.GetAllClientBasicInfo()
 		if err != nil {
 			return nil, rpc.MakeError(rpc.InternalError, "Failed to get client info", err.Error())
 		}

api/public/latestRecord.go

@@ -1,19 +1,18 @@
-package api_v1
+package public
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/api_v1/vars"
-	"github.com/komari-monitor/komari/internal/database/accounts"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"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"
 )
 
 func GetClientRecentRecords(c *gin.Context) {
 	uuid := c.Param("uuid")
 
 	if uuid == "" {
-		resp.RespondError(c, 400, "UUID is required")
+		api.RespondError(c, 400, "UUID is required")
 		return
 	}
 
@@ -36,11 +35,11 @@ func GetClientRecentRecords(c *gin.Context) {
 		}
 
 		if hiddenMap[uuid] {
-			resp.RespondError(c, 400, "UUID is required") //防止未登录用户获取隐藏客户端数据
+			api.RespondError(c, 400, "UUID is required") //防止未登录用户获取隐藏客户端数据
 			return
 		}
 	}
 
-	records, _ := vars.Records.Get(uuid)
-	resp.RespondSuccess(c, records)
+	records, _ := api.Records.Get(uuid)
+	api.RespondSuccess(c, records)
 }

api/public/login.go

@@ -0,0 +1,78 @@
+package public
+
+import (
+	"encoding/json"
+	"io"
+	"net/http"
+
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/database/auditlog"
+
+	"github.com/gin-gonic/gin"
+)
+
+type LoginRequest struct {
+	Username string `json:"username"`
+	Password string `json:"password"`
+	TwoFa    string `json:"2fa_code"`
+}
+
+func Login(c *gin.Context) {
+	DisablePasswordLogin, _ := config.GetAs[bool](config.DisablePasswordLoginKey, false)
+	if DisablePasswordLogin {
+		api.RespondError(c, http.StatusForbidden, "Password login is disabled")
+		return
+	}
+
+	bodyBytes, err := io.ReadAll(c.Request.Body)
+	if err != nil {
+		api.RespondError(c, http.StatusBadRequest, "Invalid request body: "+err.Error())
+		return
+	}
+	var data LoginRequest
+	err = json.Unmarshal(bodyBytes, &data)
+	if err != nil {
+		api.RespondError(c, http.StatusBadRequest, "Invalid request body: "+err.Error())
+		return
+	}
+	if data.Username == "" || data.Password == "" {
+		api.RespondError(c, http.StatusBadRequest, "Invalid request body: Username and password are required")
+		return
+	}
+
+	uuid, success := accounts.CheckPassword(data.Username, data.Password)
+	if !success {
+		api.RespondError(c, http.StatusUnauthorized, "Invalid credentials")
+		return
+	}
+	// 2FA
+	user, _ := accounts.GetUserByUUID(uuid)
+	if user.TwoFactor != "" { // 开启了2FA
+		if data.TwoFa == "" {
+			api.RespondError(c, http.StatusUnauthorized, "2FA code is required")
+			return
+		}
+		if ok, err := accounts.Verify2Fa(uuid, data.TwoFa); err != nil || !ok {
+			api.RespondError(c, http.StatusUnauthorized, "Invalid 2FA code")
+			return
+		}
+	}
+	// Create session
+	session, err := accounts.CreateSession(uuid, 2592000, c.Request.UserAgent(), c.ClientIP(), "password")
+	if err != nil {
+		api.RespondError(c, http.StatusInternalServerError, "Failed to create session: "+err.Error())
+		return
+	}
+	c.SetCookie("session_token", session, 2592000, "/", "", false, true)
+	auditlog.Log(c.ClientIP(), uuid, "logged in (password)", "login")
+	api.RespondSuccess(c, gin.H{"set-cookie": gin.H{"session_token": session}})
+}
+func Logout(c *gin.Context) {
+	session, _ := c.Cookie("session_token")
+	accounts.DeleteSession(session)
+	c.SetCookie("session_token", "", -1, "/", "", false, true)
+	auditlog.Log(c.ClientIP(), "", "logged out", "logout")
+	c.Redirect(302, "/")
+}

api/public/login_test.go

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

api/public/me.go

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

api/public/me_test.go

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

api/public/mjpeg.go

@@ -1,4 +1,4 @@
-package mjpeg
+package public
 
 import (
 	"archive/zip"
@@ -21,9 +21,9 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_rpc"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/api/jsonRpc"
+	conf "github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/models"
 	"golang.org/x/image/font"
 	"golang.org/x/image/font/basicfont"
 	"golang.org/x/image/font/opentype"
@@ -665,10 +665,7 @@ func renderStatusTable(ctx context.Context, lang string, tzOffset *int, fontErr
 	y := padding
 
 	// 标题
-	siteName := conf.Conf.Site.Sitename
-	if siteName == "" {
-		siteName = "Komari Monitor"
-	}
+	siteName, _ := conf.GetAs[string](conf.SitenameKey, "Komari Monitor")
 	fontMutex.RLock()
 	boldFace := fontFaceBold
 	normalFace := fontFace
@@ -836,10 +833,7 @@ func renderStatusTableWithBasicFont(ctx context.Context, lang string, tzOffset *
 	y := padding
 
 	// 标题
-	siteName := conf.Conf.Site.Sitename
-	if siteName == "" {
-		siteName = "Komari Monitor"
-	}
+	siteName, _ := conf.GetAs[string](conf.SitenameKey, "Komari Monitor")
 
 	drawStringBasic(img, siteName, padding+5, y+titleFontSize, color.Black)
 	y += headerHeight
@@ -970,7 +964,7 @@ func fetchNodeData(ctx context.Context) ([]NodeInfo, map[string]NodeStatus, erro
 	statuses := make(map[string]NodeStatus)
 
 	// 调用 common:getNodes (通过 api_rpc 进行权限控制)
-	nodesResp := api_rpc.OnInternalRequest(ctx, "guest", "common:getNodes", nil)
+	nodesResp := jsonRpc.OnInternalRequest(ctx, "guest", "common:getNodes", nil)
 	if nodesResp != nil && nodesResp.Error != nil {
 		// RPC 错误（包括私有站点拒绝访问）
 		return nodes, statuses, fmt.Errorf("%v", nodesResp.Error.Message)
@@ -1007,7 +1001,7 @@ func fetchNodeData(ctx context.Context) ([]NodeInfo, map[string]NodeStatus, erro
 	}
 
 	// 调用 common:getNodesLatestStatus (通过 api_rpc 进行权限控制)
-	statusResp := api_rpc.OnInternalRequest(ctx, "guest", "common:getNodesLatestStatus", nil)
+	statusResp := jsonRpc.OnInternalRequest(ctx, "guest", "common:getNodesLatestStatus", nil)
 	if statusResp != nil && statusResp.Error != nil {
 		// RPC 错误，返回错误以便在图片中显示
 		return nodes, statuses, fmt.Errorf("%v", statusResp.Error.Message)

api/public/nodes.go

@@ -1,16 +1,16 @@
-package api_v1
+package public
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	clients "github.com/komari-monitor/komari/internal/client"
-	"github.com/komari-monitor/komari/internal/database/accounts"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/database/clients"
 )
 
 func GetNodesInformation(c *gin.Context) {
 	clientList, err := clients.GetAllClientBasicInfo()
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to retrieve client information: "+err.Error())
+		api.RespondError(c, 500, "Failed to retrieve client information: "+err.Error())
 		return
 	}
 	isLogin := false
@@ -36,5 +36,5 @@ func GetNodesInformation(c *gin.Context) {
 	}
 	clientList = clientList[:j]
 
-	resp.RespondSuccess(c, clientList)
+	api.RespondSuccess(c, clientList)
 }

api/public/oauth.go

@@ -1,23 +1,21 @@
-package api_v1
+package public
 
 import (
 	"fmt"
 	"slices"
 
 	"github.com/gin-gonic/gin"
-	"github.com/gookit/event"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/database/accounts"
-	"github.com/komari-monitor/komari/internal/database/auditlog"
-	"github.com/komari-monitor/komari/internal/eventType"
-	"github.com/komari-monitor/komari/internal/oauth"
-	"github.com/komari-monitor/komari/pkg/utils"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/database/auditlog"
+	"github.com/komari-monitor/komari/utils"
+	"github.com/komari-monitor/komari/utils/oauth"
 )
 
 // /api/oauth
 func OAuth(c *gin.Context) {
-	cfg, _ := conf.GetWithV1Format()
-	if !cfg.OAuthEnabled {
+	OAuthEnabled, _ := config.GetAs[bool](config.OAuthEnabledKey, false)
+	if !OAuthEnabled {
 		c.JSON(403, gin.H{"status": "error", "error": "OAuth is not enabled"})
 		return
 	}
@@ -88,12 +86,7 @@ func OAuthCallback(c *gin.Context) {
 			return
 		}
 		auditlog.Log(c.ClientIP(), user.UUID, "bound external account (OAuth)"+fmt.Sprintf(",sso_id: %s", sso_id), "login")
-		event.Trigger(eventType.UserOidcBound, event.M{
-			"user":   user.UUID,
-			"sso_id": sso_id,
-		})
 		c.Redirect(302, "/admin")
-
 		return
 	}
 
@@ -104,17 +97,6 @@ func OAuthCallback(c *gin.Context) {
 			"status":  "error",
 			"message": "please log in and bind your external account first.",
 		})
-		event.Trigger(eventType.UserLogin, event.M{
-			"username": user.Username,
-			"method":   "oauth",
-			"ip":       c.ClientIP(),
-			"ua":       c.Request.UserAgent(),
-			"header":   c.Request.Header,
-			"referrer": c.Request.Referer(),
-			"host":     c.Request.Host,
-			"error":    "no linked account",
-			"sso_id":   sso_id,
-		})
 		return
 	}
 
@@ -122,32 +104,11 @@ func OAuthCallback(c *gin.Context) {
 	session, err := accounts.CreateSession(user.UUID, 2592000, c.Request.UserAgent(), c.ClientIP(), "oauth")
 	if err != nil {
 		c.JSON(500, gin.H{"status": "error", "message": err.Error()})
-		event.Trigger(eventType.LoginFailed, event.M{
-			"username": user.Username,
-			"method":   "oauth",
-			"ip":       c.ClientIP(),
-			"ua":       c.Request.UserAgent(),
-			"header":   c.Request.Header,
-			"referrer": c.Request.Referer(),
-			"host":     c.Request.Host,
-			"error":    err.Error(),
-			"sso_id":   sso_id,
-		})
 		return
 	}
 
 	// 设置cookie并返回
 	c.SetCookie("session_token", session, 2592000, "/", "", false, true)
 	auditlog.Log(c.ClientIP(), user.UUID, "logged in (OAuth)", "login")
-	event.Trigger(eventType.UserLogin, event.M{
-		"username": user.Username,
-		"method":   "oauth",
-		"ip":       c.ClientIP(),
-		"ua":       c.Request.UserAgent(),
-		"header":   c.Request.Header,
-		"referrer": c.Request.Referer(),
-		"host":     c.Request.Host,
-	})
 	c.Redirect(302, "/admin")
-
 }

api/public/ping_task.go

@@ -1,11 +1,11 @@
-package task
+package public
 
 import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/tasks"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/database/tasks"
 )
 
 type PublicPingTask struct {
@@ -19,7 +19,7 @@ type PublicPingTask struct {
 func GetPublicPingTasks(c *gin.Context) {
 	tasks, err := tasks.GetAllPingTasks()
 	if err != nil {
-		resp.RespondError(c, http.StatusInternalServerError, err.Error())
+		api.RespondError(c, http.StatusInternalServerError, err.Error())
 		return
 	}
 
@@ -34,5 +34,5 @@ func GetPublicPingTasks(c *gin.Context) {
 		}
 	}
 
-	resp.RespondSuccess(c, publicTasks)
+	api.RespondSuccess(c, publicTasks)
 }

api/public/public.go

@@ -0,0 +1,47 @@
+package public
+
+import (
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database"
+)
+
+func GetPublicSettings(c *gin.Context) {
+	p, e := database.GetPublicInfo()
+	if e != nil {
+		api.RespondError(c, 500, e.Error())
+		return
+	}
+	// 临时访问许可
+	if func() bool {
+		tempKey, err := c.Cookie("temp_key")
+		if err != nil {
+			return false
+		}
+
+		tempKeyExpireTime, err := config.GetAs[int64]("tempory_share_token_expire_at", 0)
+		if err != nil {
+			return false
+		}
+		allowTempKey, err := config.GetAs[string]("tempory_share_token", "")
+		if err != nil {
+			return false
+		}
+
+		if allowTempKey == "" || tempKey != allowTempKey {
+			return false
+		}
+		now := time.Now().Unix()
+		if tempKeyExpireTime < now {
+			return false
+		}
+
+		return true
+	}() {
+		p["private_site"] = false
+	}
+	api.RespondSuccess(c, p)
+}

api/public/record.go

@@ -1,4 +1,4 @@
-package record
+package public
 
 import (
 	"slices"
@@ -6,12 +6,12 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/api_v1/resp"
-	"github.com/komari-monitor/komari/internal/database/accounts"
-	"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"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"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"
 )
 
 func GetRecordsByUUID(c *gin.Context) {
@@ -37,14 +37,14 @@ func GetRecordsByUUID(c *gin.Context) {
 		}
 
 		if hiddenMap[uuid] {
-			resp.RespondError(c, 400, "UUID is required") //防止未登录用户获取隐藏客户端数据
+			api.RespondError(c, 400, "UUID is required") //防止未登录用户获取隐藏客户端数据
 			return
 		}
 	}
 
 	hours := c.Query("hours")
 	if uuid == "" {
-		resp.RespondError(c, 400, "UUID is required")
+		api.RespondError(c, 400, "UUID is required")
 		return
 	}
 	if hours == "" {
@@ -53,7 +53,7 @@ func GetRecordsByUUID(c *gin.Context) {
 
 	hoursInt, err := strconv.Atoi(hours)
 	if err != nil {
-		resp.RespondError(c, 400, "Invalid hours parameter")
+		api.RespondError(c, 400, "Invalid hours parameter")
 		return
 	}
 
@@ -65,13 +65,13 @@ func GetRecordsByUUID(c *gin.Context) {
 	}
 
 	if !validLoadTypes[loadType] {
-		resp.RespondError(c, 400, "Invalid load_type parameter")
+		api.RespondError(c, 400, "Invalid load_type parameter")
 		return
 	}
 
 	clientRecords, err := records.GetRecordsByClientAndTime(uuid, time.Now().Add(-time.Duration(hoursInt)*time.Hour), time.Now())
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to fetch records: "+err.Error())
+		api.RespondError(c, 500, "Failed to fetch records: "+err.Error())
 		return
 	}
 
@@ -125,7 +125,7 @@ func GetRecordsByUUID(c *gin.Context) {
 		}
 	}
 
-	resp.RespondSuccess(c, response)
+	api.RespondSuccess(c, response)
 }
 
 // filterRecordsByLoadType 根据 load_type 过滤记录，只返回相关字段
@@ -195,7 +195,7 @@ func GetPingRecords(c *gin.Context) {
 
 	// 必须提供 uuid 或 task_id 其中至少一个
 	if uuid == "" && taskIdStr == "" {
-		resp.RespondError(c, 400, "UUID or task_id is required")
+		api.RespondError(c, 400, "UUID or task_id is required")
 		return
 	}
 
@@ -242,7 +242,7 @@ func GetPingRecords(c *gin.Context) {
 		}
 		if uuid != "" {
 			if hiddenMap[uuid] {
-				resp.RespondSuccess(c, response) // 对于尝试获取隐藏uuid一键哈气
+				api.RespondSuccess(c, response) // 对于尝试获取隐藏uuid一键哈气
 				return
 			}
 		}
@@ -267,7 +267,7 @@ func GetPingRecords(c *gin.Context) {
 	if taskIdStr != "" {
 		taskId, err = strconv.Atoi(taskIdStr)
 		if err != nil {
-			resp.RespondError(c, 400, "Invalid task_id parameter")
+			api.RespondError(c, 400, "Invalid task_id parameter")
 			return
 		}
 	}
@@ -275,7 +275,7 @@ func GetPingRecords(c *gin.Context) {
 	// 查询记录，现在支持 uuid + task_id 组合查询
 	records, err = tasks.GetPingRecords(uuid, taskId, startTime, endTime)
 	if err != nil {
-		resp.RespondError(c, 500, "Failed to fetch ping records: "+err.Error())
+		api.RespondError(c, 500, "Failed to fetch ping records: "+err.Error())
 		return
 	}
 
@@ -357,7 +357,7 @@ func GetPingRecords(c *gin.Context) {
 		// 获取所有 pingTasks
 		pingTasks, err := tasks.GetAllPingTasks()
 		if err != nil {
-			resp.RespondError(c, 500, "Failed to fetch ping tasks: "+err.Error())
+			api.RespondError(c, 500, "Failed to fetch ping tasks: "+err.Error())
 			return
 		}
 
@@ -443,5 +443,5 @@ func GetPingRecords(c *gin.Context) {
 	}
 
 	response.Count = len(response.Records) // 计算最后结果保持计数一致
-	resp.RespondSuccess(c, response)
+	api.RespondSuccess(c, response)
 }

api/public/version.go

@@ -0,0 +1,14 @@
+package public
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/utils"
+)
+
+func GetVersion(c *gin.Context) {
+	api.RespondSuccess(c, gin.H{
+		"version": utils.CurrentVersion,
+		"hash":    utils.VersionHash,
+	})
+}

api/terminal/establish.go

@@ -1,16 +1,15 @@
-package client
+package terminal
 
 import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/internal/api_v1/terminal"
 )
 
 func EstablishConnection(c *gin.Context) {
 	session_id := c.Query("id")
-	session, exists := terminal.TerminalSessions[session_id]
+	session, exists := TerminalSessions[session_id]
 	if !exists || session == nil || session.Browser == nil {
 		c.JSON(404, gin.H{"status": "error", "error": "Session not found"})
 		return
@@ -27,22 +26,22 @@ func EstablishConnection(c *gin.Context) {
 	}
 	conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
-		terminal.TerminalSessionsMutex.Lock()
+		TerminalSessionsMutex.Lock()
 		if session.Browser != nil {
 			session.Browser.Close()
 		}
-		delete(terminal.TerminalSessions, session_id)
-		terminal.TerminalSessionsMutex.Unlock()
+		delete(TerminalSessions, session_id)
+		TerminalSessionsMutex.Unlock()
 		return
 	}
 	session.Agent = conn
 	conn.SetCloseHandler(func(code int, text string) error {
-		delete(terminal.TerminalSessions, session_id)
+		delete(TerminalSessions, session_id)
 		// 通知 Browser 关闭终端连接
 		if session.Browser != nil {
 			session.Browser.Close()
 		}
 		return nil
 	})
-	go terminal.ForwardTerminal(session_id)
+	go ForwardTerminal(session_id)
 }

api/terminal/forward.go

@@ -0,0 +1,77 @@
+package terminal
+
+import (
+	"time"
+
+	"github.com/gorilla/websocket"
+	"github.com/komari-monitor/komari/database/auditlog"
+)
+
+func ForwardTerminal(id string) {
+	session, exists := TerminalSessions[id]
+
+	if !exists || session == nil || session.Agent == nil || session.Browser == nil {
+		return
+	}
+	auditlog.Log(session.RequesterIp, session.UserUUID, "established, terminal id:"+id, "terminal")
+	established_time := time.Now()
+	errChan := make(chan error, 1)
+
+	go func() {
+		for {
+			messageType, data, err := session.Browser.ReadMessage()
+			if err != nil {
+				errChan <- err
+				return
+			}
+
+			if messageType == websocket.TextMessage {
+				if session.Agent != nil && string(data[0:1]) == "{" {
+					err = session.Agent.WriteMessage(websocket.TextMessage, data)
+				} else if session.Agent != nil {
+					err = session.Agent.WriteMessage(websocket.BinaryMessage, data)
+				}
+			} else if session.Agent != nil {
+				// 二进制消息，原样传递
+				err = session.Agent.WriteMessage(websocket.BinaryMessage, data)
+			}
+
+			if err != nil {
+				errChan <- err
+				return
+			}
+		}
+	}()
+
+	go func() {
+		for {
+			_, data, err := session.Agent.ReadMessage()
+			if err != nil {
+				errChan <- err
+				return
+			}
+			if session.Browser != nil {
+				err = session.Browser.WriteMessage(websocket.BinaryMessage, data)
+				if err != nil {
+					errChan <- err
+					return
+				}
+			}
+		}
+	}()
+
+	// 等待错误或主动关闭
+	<-errChan
+	// 关闭连接
+	if session.Agent != nil {
+		session.Agent.Close()
+	}
+	if session.Browser != nil {
+		session.Browser.Close()
+	}
+	disconnect_time := time.Now()
+	auditlog.Log(session.RequesterIp, session.UserUUID, "disconnected, terminal id:"+id+", duration:"+disconnect_time.Sub(established_time).String(), "terminal")
+	TerminalSessionsMutex.Lock()
+	delete(TerminalSessions, id)
+	TerminalSessionsMutex.Unlock()
+}

api/terminal/request.go

@@ -1,32 +1,17 @@
 package terminal
 
 import (
-	"sync"
-
 	"log"
 	"net/http"
 	"time"
 
-	"github.com/gorilla/websocket"
-
 	"github.com/gin-gonic/gin"
-	clients "github.com/komari-monitor/komari/internal/client"
-	"github.com/komari-monitor/komari/internal/database/auditlog"
-	"github.com/komari-monitor/komari/internal/ws"
-	"github.com/komari-monitor/komari/pkg/utils"
+	"github.com/gorilla/websocket"
+	"github.com/komari-monitor/komari/database/clients"
+	"github.com/komari-monitor/komari/utils"
+	"github.com/komari-monitor/komari/ws"
 )
 
-type TerminalSession struct {
-	UUID        string
-	UserUUID    string
-	Browser     *websocket.Conn
-	Agent       *websocket.Conn
-	RequesterIp string
-}
-
-var TerminalSessionsMutex = &sync.Mutex{}
-var TerminalSessions = make(map[string]*TerminalSession)
-
 func RequestTerminal(c *gin.Context) {
 	uuid := c.Param("uuid")
 	user_uuid, _ := c.Get("uuid")
@@ -76,7 +61,7 @@ func RequestTerminal(c *gin.Context) {
 	})
 
 	if ws.GetConnectedClients()[uuid] == nil {
-		conn.WriteMessage(1, []byte("Client offline!\n被控端离线!"))
+		conn.WriteMessage(1, []byte("Client offline!\n被控端离线!\n"))
 		conn.Close()
 		TerminalSessionsMutex.Lock()
 		delete(TerminalSessions, id)
@@ -94,13 +79,13 @@ func RequestTerminal(c *gin.Context) {
 		TerminalSessionsMutex.Unlock()
 		return
 	}
-	conn.WriteMessage(1, []byte("等待被控端连接 waiting for agent..."))
+	conn.WriteMessage(1, []byte("等待被控端连接 waiting for agent...\n"))
 	// 如果没有连接上，则关闭连接
 	time.AfterFunc(30*time.Second, func() {
 		TerminalSessionsMutex.Lock()
 		if session.Agent == nil {
 			if session.Browser != nil {
-				session.Browser.WriteMessage(1, []byte("被控端连接超时 timeout"))
+				session.Browser.WriteMessage(1, []byte("被控端连接超时 timeout\n"))
 				session.Browser.Close()
 			}
 			conn.Close()
@@ -110,72 +95,3 @@ func RequestTerminal(c *gin.Context) {
 	})
 	//auditlog.Log(c.ClientIP(), user_uuid.(string), "request, terminal id:"+id+",client:"+session.UUID, "terminal")
 }
-
-func ForwardTerminal(id string) {
-	session, exists := TerminalSessions[id]
-
-	if !exists || session == nil || session.Agent == nil || session.Browser == nil {
-		return
-	}
-	auditlog.Log(session.RequesterIp, session.UserUUID, "established, terminal id:"+id, "terminal")
-	established_time := time.Now()
-	errChan := make(chan error, 1)
-
-	go func() {
-		for {
-			messageType, data, err := session.Browser.ReadMessage()
-			if err != nil {
-				errChan <- err
-				return
-			}
-
-			if messageType == websocket.TextMessage {
-				if session.Agent != nil && string(data[0:1]) == "{" {
-					err = session.Agent.WriteMessage(websocket.TextMessage, data)
-				} else if session.Agent != nil {
-					err = session.Agent.WriteMessage(websocket.BinaryMessage, data)
-				}
-			} else if session.Agent != nil {
-				// 二进制消息，原样传递
-				err = session.Agent.WriteMessage(websocket.BinaryMessage, data)
-			}
-
-			if err != nil {
-				errChan <- err
-				return
-			}
-		}
-	}()
-
-	go func() {
-		for {
-			_, data, err := session.Agent.ReadMessage()
-			if err != nil {
-				errChan <- err
-				return
-			}
-			if session.Browser != nil {
-				err = session.Browser.WriteMessage(websocket.BinaryMessage, data)
-				if err != nil {
-					errChan <- err
-					return
-				}
-			}
-		}
-	}()
-
-	// 等待错误或主动关闭
-	<-errChan
-	// 关闭连接
-	if session.Agent != nil {
-		session.Agent.Close()
-	}
-	if session.Browser != nil {
-		session.Browser.Close()
-	}
-	disconnect_time := time.Now()
-	auditlog.Log(session.RequesterIp, session.UserUUID, "disconnected, terminal id:"+id+", duration:"+disconnect_time.Sub(established_time).String(), "terminal")
-	TerminalSessionsMutex.Lock()
-	delete(TerminalSessions, id)
-	TerminalSessionsMutex.Unlock()
-}

api/terminal/terminal.go

@@ -0,0 +1,18 @@
+package terminal
+
+import (
+	"sync"
+
+	"github.com/gorilla/websocket"
+)
+
+type TerminalSession struct {
+	UUID        string
+	UserUUID    string
+	Browser     *websocket.Conn
+	Agent       *websocket.Conn
+	RequesterIp string
+}
+
+var TerminalSessionsMutex = &sync.Mutex{}
+var TerminalSessions = make(map[string]*TerminalSession)

api/ws.go

@@ -1,4 +1,4 @@
-package api_v1
+package api
 
 import (
 	"net/http"
@@ -6,12 +6,12 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/internal/common"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/database/accounts"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
-	"github.com/komari-monitor/komari/internal/ws"
+	"github.com/komari-monitor/komari/common"
+	"github.com/komari-monitor/komari/config"
+	"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/ws"
 )
 
 func GetClients(c *gin.Context) {
@@ -20,10 +20,10 @@ func GetClients(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"status": "error", "error": "Require WebSocket upgrade"})
 		return
 	}
-	cfg, _ := conf.GetWithV1Format()
+	AllowCors, _ := config.GetAs[bool](config.AllowCorsKey, false)
 	upgrader := websocket.Upgrader{
 		CheckOrigin: func(r *http.Request) bool {
-			if cfg.AllowCors {
+			if AllowCors {
 				return true
 			}
 			return ws.CheckOrigin(r)
@@ -32,7 +32,7 @@ func GetClients(c *gin.Context) {
 	// Upgrade the HTTP connection to a WebSocket connection
 	conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"status": "error", "error": "Failed to upgrade to WebSocket"})
+		c.JSON(http.StatusBadRequest, gin.H{"status": "error", "error": "Failed to upgrade to WebSocket." + err.Error()})
 		return
 	}
 	defer conn.Close()

cmd/chpasswd.go

@@ -1,14 +1,12 @@
 package cmd
 
 import (
-	"context"
 	"os"
 
-	"github.com/komari-monitor/komari/internal/app"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/database/accounts"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"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/spf13/cobra"
 )
 
@@ -27,31 +25,25 @@ var ChpasswdCmd = &cobra.Command{
 			cmd.Help()
 			return
 		}
-		a := app.New().With(dbcore.NewDBModule())
-		err := a.RunWith(context.Background(), func(ctx context.Context) error {
-			if _, err := os.Stat(conf.Conf.Database.DatabaseFile); os.IsNotExist(err) {
-				cmd.Println("Database file does not exist.")
-				return nil
-			}
-			user := &models.User{}
-			dbcore.GetDBInstance().Model(&models.User{}).First(user)
-			cmd.Println("Changing password for user:", user.Username)
-			if err := accounts.ForceResetPassword(user.Username, NewPassword); err != nil {
-				cmd.Println("Error:", err)
-				return nil
-			}
-			cmd.Println("Password changed successfully, new password:", NewPassword)
-
-			if err := accounts.DeleteAllSessions(); err != nil {
-				cmd.Println("Unable to force logout of other devices:", err)
-				return nil
-			}
-			cmd.Println("Please restart the server to apply the changes.")
-			return nil
-		})
-		if err != nil {
-			cmd.Println("Error:", err)
+		if _, err := os.Stat(flags.DatabaseFile); os.IsNotExist(err) {
+			cmd.Println("Database file does not exist.")
+			return
 		}
+		user := &models.User{}
+		dbcore.GetDBInstance().Model(&models.User{}).First(user)
+		cmd.Println("Changing password for user:", user.Username)
+		if err := accounts.ForceResetPassword(user.Username, NewPassword); err != nil {
+			cmd.Println("Error:", err)
+			return
+		}
+		cmd.Println("Password changed successfully, new password:", NewPassword)
+
+		if err := accounts.DeleteAllSessions(); err != nil {
+			cmd.Println("Unable to force logout of other devices:", err)
+			return
+		}
+
+		cmd.Println("Please restart the server to apply the changes.")
 	},
 }
 

cmd/disable2FA.go

@@ -1,12 +1,10 @@
 package cmd
 
 import (
-	"context"
 	"os"
 
-	"github.com/komari-monitor/komari/internal/app"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
 	"github.com/spf13/cobra"
 	"gorm.io/gorm"
 )
@@ -16,13 +14,10 @@ var Disable2FA = &cobra.Command{
 	Short: "Force disable 2FA",
 	Long:  `Force disable 2FA`,
 	Run: func(cmd *cobra.Command, args []string) {
-		a := app.New().With(dbcore.NewDBModule())
-		err := a.RunWith(context.Background(), func(ctx context.Context) error {
-			db := dbcore.GetDBInstance()
-			return db.Transaction(func(tx *gorm.DB) error {
-				return tx.Model(&models.User{}).Where("two_factor != ?", "").
-					Update("two_factor", "").Error
-			})
+		db := dbcore.GetDBInstance()
+		err := db.Transaction(func(tx *gorm.DB) error {
+			return tx.Model(&models.User{}).Where("two_factor != ?", "").
+				Update("two_factor", "").Error
 		})
 		if err != nil {
 			cmd.Println("Error:", err)

cmd/flags/config.go

@@ -1,6 +1,14 @@
 package flags
 
 var (
-	ConfigFile string // 配置文件路径
-	Listen     string
+	// 数据库配置
+	DatabaseType string // 数据库类型：sqlite, mysql
+	DatabaseFile string // SQLite数据库文件路径
+	DatabaseHost string // MySQL/其他数据库主机地址
+	DatabasePort string // MySQL/其他数据库端口
+	DatabaseUser string // MySQL/其他数据库用户名
+	DatabasePass string // MySQL/其他数据库密码
+	DatabaseName string // MySQL/其他数据库名称
+
+	Listen string
 )

cmd/nezha_compat.go

@@ -11,17 +11,17 @@ import (
 	"sync"
 	"time"
 
-	apiClient "github.com/komari-monitor/komari/internal/api_v1/client"
-	"github.com/komari-monitor/komari/internal/common"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/database/auditlog"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
-	"github.com/komari-monitor/komari/internal/geoip"
-	"github.com/komari-monitor/komari/internal/notifier"
-	"github.com/komari-monitor/komari/internal/ws"
+	apiClient "github.com/komari-monitor/komari/api/client"
+	"github.com/komari-monitor/komari/common"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/auditlog"
+	"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"
 
-	"github.com/komari-monitor/komari/internal/nezha/proto"
+	"github.com/komari-monitor/komari/compat/nezha/proto"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/metadata"
@@ -370,7 +370,7 @@ func (s *nezhaCompatServer) ReportGeoIP(ctx context.Context, in *proto.GeoIP) (*
 	if in != nil && in.Ip != nil {
 		if v4 := strings.TrimSpace(in.Ip.Ipv4); v4 != "" {
 			updates["ipv4"] = v4
-			if cfg, err := conf.GetWithV1Format(); err == nil && cfg.GeoIpEnabled {
+			if GeoIpEnabled, _ := config.GetAs[bool](config.GeoIpEnabledKey, false); GeoIpEnabled {
 				if ip := net.ParseIP(v4); ip != nil {
 					if gi, _ := geoip.GetGeoInfo(ip); gi != nil {
 						iso = gi.ISOCode
@@ -381,7 +381,7 @@ func (s *nezhaCompatServer) ReportGeoIP(ctx context.Context, in *proto.GeoIP) (*
 		if v6 := strings.TrimSpace(in.Ip.Ipv6); v6 != "" {
 			updates["ipv6"] = v6
 			if iso == "" { // 优先使用 v4 的国家码
-				if cfg, err := conf.GetWithV1Format(); err == nil && cfg.GeoIpEnabled {
+				if GeoIpEnabled, _ := config.GetAs[bool](config.GeoIpEnabledKey, false); GeoIpEnabled {
 					if ip := net.ParseIP(v6); ip != nil {
 						if gi, _ := geoip.GetGeoInfo(ip); gi != nil {
 							iso = gi.ISOCode

cmd/permitPasswordLogin.go

@@ -1,12 +1,10 @@
 package cmd
 
 import (
-	"context"
 	"os"
 
-	"github.com/komari-monitor/komari/internal/app"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
 	"github.com/spf13/cobra"
 	"gorm.io/gorm"
 )
@@ -16,13 +14,10 @@ var PermitPasswordLoginCmd = &cobra.Command{
 	Short: "Force permit password login",
 	Long:  `Force permit password login`,
 	Run: func(cmd *cobra.Command, args []string) {
-		a := app.New().With(dbcore.NewDBModule())
-		err := a.RunWith(context.Background(), func(ctx context.Context) error {
-			db := dbcore.GetDBInstance()
-			return db.Transaction(func(tx *gorm.DB) error {
-				return tx.Model(&conf.V1Struct{}).Where("id = ?", 1).
-					Update("disable_password_login", false).Error
-			})
+		db := dbcore.GetDBInstance()
+		err := db.Transaction(func(tx *gorm.DB) error {
+			return tx.Model(&models.Config{}).Where("id = ?", 1).
+				Update("disable_password_login", false).Error
 		})
 		if err != nil {
 			cmd.Println("Error:", err)

cmd/root.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	"log/slog"
-
 	"github.com/komari-monitor/komari/cmd/flags"
 
 	"github.com/spf13/cobra"
@@ -21,7 +19,13 @@ func GetEnv(key, defaultValue string) string {
 
 // 从环境变量获取默认值
 var (
-	configFileEnv = GetEnv("KOMARI_CONFIG_FILE", "./data/komari.json")
+	dbTypeEnv = GetEnv("KOMARI_DB_TYPE", "sqlite")
+	dbFileEnv = GetEnv("KOMARI_DB_FILE", "./data/komari.db")
+	dbHostEnv = GetEnv("KOMARI_DB_HOST", "localhost")
+	dbPortEnv = GetEnv("KOMARI_DB_PORT", "3306")
+	dbUserEnv = GetEnv("KOMARI_DB_USER", "root")
+	dbPassEnv = GetEnv("KOMARI_DB_PASS", "")
+	dbNameEnv = GetEnv("KOMARI_DB_NAME", "komari")
 )
 
 var RootCmd = &cobra.Command{
@@ -29,63 +33,26 @@ var RootCmd = &cobra.Command{
 	Short: "Komari is a simple server monitoring tool",
 	Long: `Komari is a simple server monitoring tool. 
 Made by Akizon77 with love.`,
+	Run: func(cmd *cobra.Command, args []string) {
+		cmd.SetArgs([]string{"server"})
+		cmd.Execute()
+	},
 }
 
 func Execute() {
-	detectDeprecatedFlags()
-	// Default to server when no subcommand is provided.
-	if len(os.Args) <= 1 {
-		RootCmd.SetArgs([]string{"server"})
-	}
-	// 创建目录
-	if err := os.MkdirAll("./data/theme", os.ModePerm); err != nil {
-		slog.Error("Failed to create theme directory", slog.Any("error", err))
-	}
 	if err := RootCmd.Execute(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
 }
 
-// detectDeprecatedFlags 检测过时的数据库相关命令行参数
-func detectDeprecatedFlags() {
-	deprecatedFlags := map[string]bool{
-		"db-host":  false,
-		"database": false,
-		"db-user":  false,
-		"db-pass":  false,
-		"db-port":  false,
-		"db-name":  false,
-		"db-type":  false,
-	}
-
-	// 检查命令行参数
-	for _, arg := range os.Args[1:] {
-		for flagName := range deprecatedFlags {
-			if arg == "--"+flagName || arg == "-"+string(flagName[0]) {
-				deprecatedFlags[flagName] = true
-				break
-			}
-		}
-	}
-
-	// 如果检测到过时参数，记录警告
-	hasDeprecated := false
-	for flagName, found := range deprecatedFlags {
-		if found {
-			hasDeprecated = true
-			slog.Warn("Deprecated command-line flag detected", slog.String("flag", "--"+flagName))
-		}
-	}
-
-	if hasDeprecated {
-		slog.Warn("Command-line database configuration flags are deprecated. " +
-			"Please migrate to komari.json file. ")
-	}
-}
-
 func init() {
 	// 设置命令行参数，提供环境变量作为默认值
-	RootCmd.PersistentFlags().StringVarP(&flags.ConfigFile, "config", "c", configFileEnv, "Configuration file path [env: KOMARI_CONFIG_FILE]")
-	RootCmd.PersistentFlags().StringVarP(&flags.Listen, "listen", "l", GetEnv("KOMARI_LISTEN", ":8080"), "Listen address [env: KOMARI_LISTEN]")
+	RootCmd.PersistentFlags().StringVarP(&flags.DatabaseType, "db-type", "t", dbTypeEnv, "Database type (sqlite, mysql) [env: KOMARI_DB_TYPE]")
+	RootCmd.PersistentFlags().StringVarP(&flags.DatabaseFile, "database", "d", dbFileEnv, "SQLite database file path [env: KOMARI_DB_FILE]")
+	RootCmd.PersistentFlags().StringVar(&flags.DatabaseHost, "db-host", dbHostEnv, "MySQL/Other database host address [env: KOMARI_DB_HOST]")
+	RootCmd.PersistentFlags().StringVar(&flags.DatabasePort, "db-port", dbPortEnv, "MySQL/Other database port [env: KOMARI_DB_PORT]")
+	RootCmd.PersistentFlags().StringVar(&flags.DatabaseUser, "db-user", dbUserEnv, "MySQL/Other database username [env: KOMARI_DB_USER]")
+	RootCmd.PersistentFlags().StringVar(&flags.DatabasePass, "db-pass", dbPassEnv, "MySQL/Other database password [env: KOMARI_DB_PASS]")
+	RootCmd.PersistentFlags().StringVar(&flags.DatabaseName, "db-name", dbNameEnv, "MySQL/Other database name [env: KOMARI_DB_NAME]")
 }

cmd/server.go

@@ -2,31 +2,433 @@ package cmd
 
 import (
 	"context"
+	"fmt"
+	"log"
+	"net/http"
 	"os"
+	"os/signal"
+	"strings"
+	"syscall"
 	"time"
 
-	"github.com/komari-monitor/komari/internal/app"
-	"github.com/komari-monitor/komari/internal/scheduler"
-	"github.com/komari-monitor/komari/internal/server"
+	"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"
+	public_api "github.com/komari-monitor/komari/api/public"
+	"github.com/komari-monitor/komari/api/terminal"
+	"github.com/komari-monitor/komari/cmd/flags"
+
+	"github.com/komari-monitor/komari/config"
+	"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/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"
 	"github.com/spf13/cobra"
 )
 
+var (
+	DynamicCorsEnabled bool = false
+)
+
 var ServerCmd = &cobra.Command{
 	Use:   "server",
 	Short: "Start the server",
 	Long:  `Start the server`,
 	Run: func(cmd *cobra.Command, args []string) {
-		a := app.New().
-			WithShutdownTimeout(5 * time.Second).
-			With(server.NewHTTPModule()).
-			With(scheduler.NewModule())
-		if err := a.RunUntilSignal(context.Background()); err != nil {
-			cmd.PrintErrln(err)
-			os.Exit(1)
-		}
+		RunServer()
 	},
 }
 
 func init() {
+	// 从环境变量获取监听地址
+	listenAddr := GetEnv("KOMARI_LISTEN", "0.0.0.0:25774")
+	ServerCmd.PersistentFlags().StringVarP(&flags.Listen, "listen", "l", listenAddr, "监听地址 [env: KOMARI_LISTEN]")
 	RootCmd.AddCommand(ServerCmd)
 }
+
+func RunServer() {
+	// #region 初始化
+	if err := os.MkdirAll("./data/theme", os.ModePerm); err != nil {
+		log.Fatalf("Failed to create theme directory: %v", err)
+	}
+	InitDatabase()
+	if utils.VersionHash != "unknown" {
+		gin.SetMode(gin.ReleaseMode)
+	}
+	conf, err := config.GetManyAs[config.Legacy]()
+	if err != nil {
+		log.Fatal(err)
+	}
+	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))
+			}
+		}()
+	}
+
+	config.Subscribe(func(event config.ConfigEvent) {
+		if ok, t := config.IsChangedT[string](event, config.OAuthProviderKey); ok {
+			if t == "" || t == "none" {
+				t = "github"
+			}
+			oidcProvider, err := database.GetOidcConfigByName(t)
+			if err != nil {
+				log.Printf("Failed to get OIDC provider config: %v", err)
+			} else {
+				log.Printf("Using %s as OIDC provider", oidcProvider.Name)
+			}
+			err = oauth.LoadProvider(oidcProvider.Name, oidcProvider.Addition)
+			if err != nil {
+				auditlog.EventLog("error", fmt.Sprintf("Failed to load OIDC provider: %v", err))
+			}
+		}
+
+		if ok, t := config.IsChangedT[bool](event, config.NezhaCompatEnabledKey); ok {
+			if t {
+				l, _ := config.GetAs[string](config.NezhaCompatListenKey)
+				if err := StartNezhaCompat(l); 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跑起来
+		if err != nil {
+			log.Fatalf("Failed to run cloudflared: %v", err)
+		}
+	}
+
+	r := gin.New()
+	r.Use(logutil.GinLogger())
+	r.Use(logutil.GinRecovery())
+
+	// 动态 CORS 中间件
+
+	DynamicCorsEnabled = conf.AllowCors
+	config.Subscribe(func(event config.ConfigEvent) {
+		if ok, t := config.IsChangedT[bool](event, config.AllowCorsKey); ok {
+			DynamicCorsEnabled = t
+		}
+		if event.IsChanged(config.GeoIpProviderKey) {
+			go geoip.InitGeoIp()
+		}
+
+		if event.IsChanged(config.NotificationMethodKey) {
+			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.IdentityMiddleware())
+	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", public_api.Login)
+	r.GET("/api/me", public_api.GetMe)
+	r.GET("/api/clients", api.GetClients)
+	r.GET("/api/nodes", public_api.GetNodesInformation)
+	r.GET("/api/public", public_api.GetPublicSettings)
+	r.GET("/api/oauth", public_api.OAuth)
+	r.GET("/api/oauth_callback", public_api.OAuthCallback)
+	r.GET("/api/logout", public_api.Logout)
+	r.GET("/api/version", public_api.GetVersion)
+	r.GET("/api/recent/:uuid", public_api.GetClientRecentRecords)
+
+	r.GET("/api/records/load", public_api.GetRecordsByUUID)
+	r.GET("/api/records/ping", public_api.GetPingRecords)
+	r.GET("/api/task/ping", public_api.GetPublicPingTasks)
+	r.GET("/api/rpc2", jsonRpc.OnRpcRequest)
+	r.POST("/api/rpc2", jsonRpc.OnRpcRequest)
+	r.GET("/api/mjpeg_live", public_api.MjpegLiveHandler)
+	// #region Agent
+	r.POST("/api/clients/register", client.RegisterClient)
+	tokenAuthrized := r.Group("/api/clients", api.RequireRole(api.RoleAdmin, api.RoleClient))
+	{
+		tokenAuthrized.GET("/report", client.WebSocketReport) // websocket
+		tokenAuthrized.POST("/uploadBasicInfo", client.UploadBasicInfo)
+		tokenAuthrized.POST("/report", client.UploadReport)
+		tokenAuthrized.GET("/terminal", terminal.EstablishConnection)
+		tokenAuthrized.POST("/task/result", client.TaskResult)
+		tokenAuthrized.GET("/ping/tasks", client.GetPingTasks)
+		tokenAuthrized.POST("/ping/result", client.UploadPingResult)
+	}
+	// #region 管理员
+	adminAuthrized := r.Group("/api/admin", api.RequireRole(api.RoleAdmin))
+	{
+		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("/import", admin.ImportTheme)
+			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", terminal.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)
+			pingTaskGroup.POST("/order", admin.OrderPingTask)
+
+		}
+
+	}
+
+	public.Static(r.Group("/"), func(handlers ...gin.HandlerFunc) {
+		r.NoRoute(handlers...)
+	})
+
+	srv := &http.Server{
+		Addr:    flags.Listen,
+		Handler: r,
+	}
+	log.Printf("Starting server on %s ...", flags.Listen)
+	go func() {
+		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			OnFatal(err)
+			log.Fatalf("listen: %s\n", err)
+		}
+	}()
+	quit := make(chan os.Signal, 1)
+	signal.Notify(quit, os.Interrupt, syscall.SIGTERM)
+	<-quit
+	OnShutdown()
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	if err := srv.Shutdown(ctx); err != nil {
+		log.Fatalf("Server forced to shutdown: %v", err)
+	}
+
+}
+
+func InitDatabase() {
+	// // 打印数据库类型和连接信息
+	// if flags.DatabaseType == "mysql" {
+	// 	log.Printf("使用 MySQL 数据库连接: %s@%s:%s/%s",
+	// 		flags.DatabaseUser, flags.DatabaseHost, flags.DatabasePort, flags.DatabaseName)
+	// 	log.Printf("环境变量配置: [KOMARI_DB_TYPE=%s] [KOMARI_DB_HOST=%s] [KOMARI_DB_PORT=%s] [KOMARI_DB_USER=%s] [KOMARI_DB_NAME=%s]",
+	// 		os.Getenv("KOMARI_DB_TYPE"), os.Getenv("KOMARI_DB_HOST"), os.Getenv("KOMARI_DB_PORT"),
+	// 		os.Getenv("KOMARI_DB_USER"), os.Getenv("KOMARI_DB_NAME"))
+	// } else {
+	// 	log.Printf("使用 SQLite 数据库文件: %s", flags.DatabaseFile)
+	// 	log.Printf("环境变量配置: [KOMARI_DB_TYPE=%s] [KOMARI_DB_FILE=%s]",
+	// 		os.Getenv("KOMARI_DB_TYPE"), os.Getenv("KOMARI_DB_FILE"))
+	// }
+	var count int64 = 0
+	if dbcore.GetDBInstance().Model(&models.User{}).Count(&count); count == 0 {
+		user, passwd, err := accounts.CreateDefaultAdminAccount()
+		if err != nil {
+			panic(err)
+		}
+		log.Println("Default admin account created. Username:", user, ", Password:", passwd)
+	}
+}
+
+// #region 定时任务
+func DoScheduledWork() {
+	tasks.ReloadPingSchedule()
+	d_notification.ReloadLoadNotificationSchedule()
+	ticker := time.NewTicker(time.Minute * 30)
+	minute := time.NewTicker(60 * time.Second)
+	//records.DeleteRecordBefore(time.Now().Add(-time.Hour * 24 * 30))
+	records.CompactRecord()
+	go notifier.CheckExpireScheduledWork()
+	for {
+		cfg, _ := config.GetManyAs[config.Legacy]()
+		select {
+		case <-ticker.C:
+			records.DeleteRecordBefore(time.Now().Add(-time.Hour * time.Duration(cfg.RecordPreserveTime)))
+			records.CompactRecord()
+			tasks.ClearTaskResultsByTimeBefore(time.Now().Add(-time.Hour * time.Duration(cfg.RecordPreserveTime)))
+			tasks.DeletePingRecordsBefore(time.Now().Add(-time.Hour * time.Duration(cfg.PingRecordPreserveTime)))
+			auditlog.RemoveOldLogs()
+		case <-minute.C:
+			api.SaveClientReportToDB()
+			if !cfg.RecordEnabled {
+				records.DeleteAll()
+				tasks.DeleteAllPingRecords()
+			}
+			// 每分钟检查一次流量提醒
+			go notifier.CheckTraffic()
+		}
+	}
+
+}
+
+func OnShutdown() {
+	auditlog.Log("", "", "server is shutting down", "info")
+	cloudflared.Kill()
+}
+
+func OnFatal(err error) {
+	auditlog.Log("", "", "server encountered a fatal error: "+err.Error(), "error")
+	cloudflared.Kill()
+}

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结构

compat/nezha/nezha.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 package proto;
-option go_package = "github.com/komari-monitor/komari/internal/nezha/proto";
+option go_package = "github.com/komari-monitor/komari/compat/nezha/proto";
 
 service NezhaService {
   rpc ReportSystemState(stream State) returns (stream Receipt) {}

config/config.go

@@ -0,0 +1,687 @@
+package config
+
+import (
+	"encoding/json"
+	"fmt"
+	"log/slog"
+	"reflect"
+	"strings"
+	"sync"
+
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+)
+
+type ConfigItem struct {
+	Key   string `gorm:"primaryKey;column:key;type:text"`
+	Value string `gorm:"column:value;type:text"` // 存 JSON 字符串
+}
+
+func (ConfigItem) TableName() string {
+	return "configs"
+}
+
+var (
+	db    *gorm.DB
+	SetDb = func(gdb *gorm.DB) {
+		db = gdb
+		migrateInPlace()
+	}
+)
+
+func migrateInPlace() {
+	if db.Migrator().HasTable("configs") && db.Migrator().HasColumn(&Legacy{}, "Sitename") {
+		slog.Info("[>1.1.4] Moving legacy config data...")
+
+		var oldData Legacy
+		if err := db.Order("id desc").First(&oldData).Error; err != nil {
+			db.Migrator().DropTable("configs")
+		} else {
+			var newRows []ConfigItem
+			val := reflect.ValueOf(oldData)
+			typ := reflect.TypeOf(oldData)
+
+			for i := 0; i < val.NumField(); i++ {
+				field := typ.Field(i)
+				tag := field.Tag.Get("json")
+				key := strings.Split(tag, ",")[0]
+
+				// 过滤 id 和无用字段
+				if key == "" || key == "-" || key == "id" {
+					continue
+				}
+
+				valInterface := val.Field(i).Interface()
+				jsonBytes, _ := json.Marshal(valInterface)
+
+				newRows = append(newRows, ConfigItem{
+					Key:   key,
+					Value: string(jsonBytes),
+				})
+			}
+
+			err := db.Transaction(func(tx *gorm.DB) error {
+				if err := tx.Migrator().DropTable("configs"); err != nil {
+					return err
+				}
+				if err := tx.AutoMigrate(&ConfigItem{}); err != nil {
+					return err
+				}
+				if len(newRows) > 0 {
+					return tx.Create(&newRows).Error
+				}
+				return nil
+			})
+
+			if err != nil {
+				panic("failed " + err.Error())
+			}
+			return
+		}
+	}
+
+	db.AutoMigrate(&ConfigItem{})
+}
+
+// Get 获取原始值 (反序列化为 interface{})
+func Get(key string, defaul ...any) (any, error) {
+	var item ConfigItem
+	err := db.First(&item, "key = ?", key).Error
+	if err != nil {
+		if len(defaul) > 0 {
+			v := defaul[0]
+			err = Set(key, v)
+			return v, err
+		}
+		return nil, err
+	}
+
+	var val any
+	if err := json.Unmarshal([]byte(item.Value), &val); err != nil {
+		return nil, err
+	}
+	return val, nil
+}
+
+// GetAs 获取并转换为指定类型 (泛型)，支持数值类型自动转换
+func GetAs[T any](key string, defaul ...any) (T, error) {
+	var t T
+	var item ConfigItem
+
+	err := db.First(&item, "key = ?", key).Error
+	if err != nil {
+		if len(defaul) > 0 {
+			// 尝试直接类型断言
+			if v, ok := defaul[0].(T); ok {
+				err = Set(key, v)
+				return v, err
+			}
+			// 尝试类型转换
+			val := reflect.ValueOf(&t).Elem()
+			if err := convertAndSet(defaul[0], val); err != nil {
+				return t, fmt.Errorf("default value type mismatch: expected %T, got %T", t, defaul[0])
+			}
+			err = Set(key, t)
+			return t, err
+		}
+		return t, err
+	}
+
+	// 先尝试直接反序列化
+	if err = json.Unmarshal([]byte(item.Value), &t); err != nil {
+		// 尝试通用解析后转换
+		var generic any
+		if err := json.Unmarshal([]byte(item.Value), &generic); err != nil {
+			return t, err
+		}
+		val := reflect.ValueOf(&t).Elem()
+		if err := convertAndSet(generic, val); err != nil {
+			return t, err
+		}
+	}
+	return t, nil
+}
+
+// GetMany 获取多个配置项，keys 为 map[key]defaultValue
+// 如果 defaultValue 为 nil，则数据库不存在时不写入
+// 如果 defaultValue 不为 nil，则数据库不存在时写入默认值
+func GetMany(keys map[string]any) (map[string]any, error) {
+	var items []ConfigItem
+	result := make(map[string]any)
+	keyList := make([]string, 0, len(keys))
+	for k := range keys {
+		keyList = append(keyList, k)
+	}
+	if len(keyList) == 0 {
+		return result, nil
+	}
+	if err := db.Where("key IN ?", keyList).Find(&items).Error; err != nil {
+		return nil, err
+	}
+
+	foundKeys := make(map[string]bool)
+	for _, item := range items {
+		var parsed any
+		if err := json.Unmarshal([]byte(item.Value), &parsed); err == nil {
+			result[item.Key] = parsed
+			foundKeys[item.Key] = true
+		}
+	}
+
+	// 收集需要写入数据库的默认值
+	var toInsert []ConfigItem
+	for k, def := range keys {
+		if _, found := foundKeys[k]; !found {
+			if def != nil {
+				result[k] = def
+				// 序列化后加入待写入列表
+				jsonBytes, err := json.Marshal(def)
+				if err != nil {
+					slog.Warn("marshal default value failed", "key", k, "error", err)
+					continue
+				}
+				toInsert = append(toInsert, ConfigItem{
+					Key:   k,
+					Value: string(jsonBytes),
+				})
+			}
+		}
+	}
+
+	// 批量写入默认值到数据库
+	if len(toInsert) > 0 {
+		if err := db.Clauses(clause.OnConflict{
+			Columns:   []clause.Column{{Name: "key"}},
+			DoUpdates: clause.AssignmentColumns([]string{"value"}),
+		}).Create(&toInsert).Error; err != nil {
+			slog.Warn("batch insert default config failed", "error", err)
+		}
+	}
+
+	return result, nil
+}
+
+// GetManyAs 将多个配置项映射到一个结构体中，json tag 作为 Key
+// 支持 default tag 作为默认值，如果数据库中不存在且有 default tag 则写入数据库
+// 没有 default tag 的字段使用零值，不写入数据库
+func GetManyAs[T any]() (*T, error) {
+	var t T
+	val := reflect.ValueOf(&t).Elem()
+	typ := val.Type()
+
+	type fieldInfo struct {
+		index      int
+		key        string
+		hasDefault bool
+		defaultVal string
+	}
+
+	fields := make([]fieldInfo, 0)
+	keys := make([]string, 0)
+
+	for i := 0; i < val.NumField(); i++ {
+		field := typ.Field(i)
+		jsonTag := field.Tag.Get("json")
+		if jsonTag == "" || jsonTag == "-" {
+			continue
+		}
+		// 解析 json tag，处理 "key,omitempty" 格式
+		key := strings.Split(jsonTag, ",")[0]
+		if key == "" || key == "-" {
+			continue
+		}
+
+		defaultTag := field.Tag.Get("default")
+		hasDefault := defaultTag != "" || field.Tag.Get("default") == ""
+		// 检查是否显式定义了 default tag (即使值为空)
+		_, hasDefault = field.Tag.Lookup("default")
+
+		fields = append(fields, fieldInfo{
+			index:      i,
+			key:        key,
+			hasDefault: hasDefault,
+			defaultVal: defaultTag,
+		})
+		keys = append(keys, key)
+	}
+
+	if len(keys) == 0 {
+		return &t, nil
+	}
+
+	var items []ConfigItem
+	if err := db.Where("key IN ?", keys).Find(&items).Error; err != nil {
+		return nil, err
+	}
+
+	// 建立数据库中存在的 key 映射
+	foundItems := make(map[string]string) // key -> value
+	for _, item := range items {
+		foundItems[item.Key] = item.Value
+	}
+
+	// 需要写入数据库的新配置项
+	var toInsert []ConfigItem
+
+	for _, fi := range fields {
+		fieldVal := val.Field(fi.index)
+		if !fieldVal.CanSet() {
+			continue
+		}
+
+		if dbValue, found := foundItems[fi.key]; found {
+			// 数据库中存在，使用数据库值
+			if err := unmarshalToField(dbValue, fieldVal); err != nil {
+				slog.Warn("unmarshal config failed", "key", fi.key, "error", err)
+			}
+		} else if fi.hasDefault {
+			// 数据库中不存在，但有 default tag，解析默认值并写入数据库
+			if err := parseDefaultToField(fi.defaultVal, fieldVal); err != nil {
+				slog.Warn("parse default value failed", "key", fi.key, "error", err)
+				continue
+			}
+			// 序列化后写入数据库
+			jsonBytes, err := json.Marshal(fieldVal.Interface())
+			if err != nil {
+				slog.Warn("marshal default value failed", "key", fi.key, "error", err)
+				continue
+			}
+			toInsert = append(toInsert, ConfigItem{
+				Key:   fi.key,
+				Value: string(jsonBytes),
+			})
+		}
+		// 没有 default tag 且数据库中不存在，保持零值，不写入数据库
+	}
+
+	// 批量写入默认值到数据库
+	if len(toInsert) > 0 {
+		if err := db.Clauses(clause.OnConflict{
+			Columns:   []clause.Column{{Name: "key"}},
+			DoUpdates: clause.AssignmentColumns([]string{"value"}),
+		}).Create(&toInsert).Error; err != nil {
+			slog.Warn("batch insert default config failed", "error", err)
+		}
+	}
+
+	return &t, nil
+}
+
+// unmarshalToField 将 JSON 字符串反序列化到字段，支持数值类型转换
+func unmarshalToField(jsonStr string, fieldVal reflect.Value) error {
+	target := reflect.New(fieldVal.Type()).Interface()
+	if err := json.Unmarshal([]byte(jsonStr), target); err != nil {
+		// 尝试通用解析后转换
+		var generic any
+		if err := json.Unmarshal([]byte(jsonStr), &generic); err != nil {
+			return err
+		}
+		return convertAndSet(generic, fieldVal)
+	}
+	fieldVal.Set(reflect.ValueOf(target).Elem())
+	return nil
+}
+
+// parseDefaultToField 解析 default tag 值到字段
+func parseDefaultToField(defaultVal string, fieldVal reflect.Value) error {
+	kind := fieldVal.Kind()
+
+	switch kind {
+	case reflect.String:
+		fieldVal.SetString(defaultVal)
+	case reflect.Bool:
+		fieldVal.SetBool(defaultVal == "true" || defaultVal == "1")
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		var v int64
+		if defaultVal != "" {
+			if _, err := fmt.Sscanf(defaultVal, "%d", &v); err != nil {
+				// 尝试解析浮点数后转换
+				var f float64
+				if _, err := fmt.Sscanf(defaultVal, "%f", &f); err != nil {
+					return err
+				}
+				v = int64(f)
+			}
+		}
+		fieldVal.SetInt(v)
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		var v uint64
+		if defaultVal != "" {
+			if _, err := fmt.Sscanf(defaultVal, "%d", &v); err != nil {
+				var f float64
+				if _, err := fmt.Sscanf(defaultVal, "%f", &f); err != nil {
+					return err
+				}
+				v = uint64(f)
+			}
+		}
+		fieldVal.SetUint(v)
+	case reflect.Float32, reflect.Float64:
+		var v float64
+		if defaultVal != "" {
+			if _, err := fmt.Sscanf(defaultVal, "%f", &v); err != nil {
+				return err
+			}
+		}
+		fieldVal.SetFloat(v)
+	default:
+		// 对于复杂类型，尝试 JSON 解析
+		if defaultVal == "" {
+			return nil // 保持零值
+		}
+		target := reflect.New(fieldVal.Type()).Interface()
+		if err := json.Unmarshal([]byte(defaultVal), target); err != nil {
+			return err
+		}
+		fieldVal.Set(reflect.ValueOf(target).Elem())
+	}
+	return nil
+}
+
+// convertAndSet 通用类型转换并设置字段值
+func convertAndSet(val any, fieldVal reflect.Value) error {
+	if val == nil {
+		return nil
+	}
+
+	targetType := fieldVal.Type()
+	v := reflect.ValueOf(val)
+
+	// 直接类型匹配
+	if v.Type().AssignableTo(targetType) {
+		fieldVal.Set(v)
+		return nil
+	}
+
+	// 类型可转换
+	if v.Type().ConvertibleTo(targetType) {
+		fieldVal.Set(v.Convert(targetType))
+		return nil
+	}
+
+	// 数值类型特殊处理 (JSON 数字默认解析为 float64)
+	if f, ok := val.(float64); ok {
+		switch fieldVal.Kind() {
+		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+			fieldVal.SetInt(int64(f))
+			return nil
+		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+			fieldVal.SetUint(uint64(f))
+			return nil
+		case reflect.Float32, reflect.Float64:
+			fieldVal.SetFloat(f)
+			return nil
+		}
+	}
+
+	// JSON 回环转换
+	b, err := json.Marshal(val)
+	if err != nil {
+		return err
+	}
+	target := reflect.New(targetType).Interface()
+	if err := json.Unmarshal(b, target); err != nil {
+		return err
+	}
+	fieldVal.Set(reflect.ValueOf(target).Elem())
+	return nil
+}
+
+func GetAll() (map[string]any, error) {
+	var items []ConfigItem
+	result := make(map[string]any)
+	if err := db.Find(&items).Error; err != nil {
+		return nil, err
+	}
+
+	for _, item := range items {
+		var parsed any
+		if err := json.Unmarshal([]byte(item.Value), &parsed); err == nil {
+			result[item.Key] = parsed
+		}
+	}
+	return result, nil
+}
+
+// Set 设置单个配置
+func Set(key string, value any) error {
+	oldVal := map[string]any{}
+	{
+		var oldItem ConfigItem
+		if err := db.First(&oldItem, "key = ?", key).Error; err == nil {
+			var parsed any
+			if err := json.Unmarshal([]byte(oldItem.Value), &parsed); err == nil {
+				oldVal[key] = parsed
+			}
+		}
+	}
+
+	bytes, err := json.Marshal(value)
+	if err != nil {
+		return err
+	}
+
+	item := ConfigItem{
+		Key:   key,
+		Value: string(bytes),
+	}
+
+	err = db.Clauses(clause.OnConflict{
+		Columns:   []clause.Column{{Name: "key"}},
+		DoUpdates: clause.AssignmentColumns([]string{"value"}),
+	}).Create(&item).Error
+	if err != nil {
+		return err
+	}
+
+	newVal := map[string]any{key: value}
+	publishEvent(oldVal, newVal)
+	return nil
+}
+
+// SetMany 将结构体保存为多个配置项
+func SetManyAs[T any](config T) error {
+	val := reflect.ValueOf(config)
+	if val.Kind() == reflect.Ptr {
+		val = val.Elem()
+	}
+
+	typ := val.Type()
+	var items []ConfigItem
+
+	for i := 0; i < val.NumField(); i++ {
+		fieldType := typ.Field(i)
+		tag := fieldType.Tag.Get("json")
+
+		if tag == "" || tag == "-" {
+			continue
+		}
+
+		fieldValue := val.Field(i).Interface()
+
+		bytes, err := json.Marshal(fieldValue)
+		if err != nil {
+			return fmt.Errorf("marshal field %s failed: %w", fieldType.Name, err)
+		}
+
+		items = append(items, ConfigItem{
+			Key:   tag,
+			Value: string(bytes),
+		})
+	}
+
+	if len(items) == 0 {
+		return nil
+	}
+
+	keys := make([]string, 0, len(items))
+	newVal := make(map[string]any, len(items))
+	for _, it := range items {
+		keys = append(keys, it.Key)
+		var parsed any
+		if err := json.Unmarshal([]byte(it.Value), &parsed); err == nil {
+			newVal[it.Key] = parsed
+		}
+	}
+
+	oldVal := map[string]any{}
+	if len(keys) > 0 {
+		var oldItems []ConfigItem
+		if err := db.Where("key IN ?", keys).Find(&oldItems).Error; err == nil {
+			for _, oi := range oldItems {
+				var parsed any
+				if err := json.Unmarshal([]byte(oi.Value), &parsed); err == nil {
+					oldVal[oi.Key] = parsed
+				}
+			}
+		}
+	}
+
+	err := db.Clauses(clause.OnConflict{
+		Columns:   []clause.Column{{Name: "key"}},
+		DoUpdates: clause.AssignmentColumns([]string{"value"}),
+	}).Create(&items).Error
+	if err != nil {
+		return err
+	}
+
+	publishEvent(oldVal, newVal)
+	return nil
+}
+
+func SetMany(cst map[string]any) error {
+	var items []ConfigItem
+	for k, v := range cst {
+		bytes, err := json.Marshal(v)
+		if err != nil {
+			return fmt.Errorf("marshal key %s failed: %w", k, err)
+		}
+		items = append(items, ConfigItem{
+			Key:   k,
+			Value: string(bytes),
+		})
+	}
+	if len(items) == 0 {
+		return nil
+	}
+
+	keys := make([]string, 0, len(items))
+	newVal := make(map[string]any, len(items))
+	for _, it := range items {
+		keys = append(keys, it.Key)
+		var parsed any
+		if err := json.Unmarshal([]byte(it.Value), &parsed); err == nil {
+			newVal[it.Key] = parsed
+		}
+	}
+
+	oldVal := map[string]any{}
+	if len(keys) > 0 {
+		var oldItems []ConfigItem
+		if err := db.Where("key IN ?", keys).Find(&oldItems).Error; err == nil {
+			for _, oi := range oldItems {
+				var parsed any
+				if err := json.Unmarshal([]byte(oi.Value), &parsed); err == nil {
+					oldVal[oi.Key] = parsed
+				}
+			}
+		}
+	}
+
+	err := db.Clauses(clause.OnConflict{
+		Columns:   []clause.Column{{Name: "key"}},
+		DoUpdates: clause.AssignmentColumns([]string{"value"}),
+	}).Create(&items).Error
+	if err != nil {
+		return err
+	}
+
+	publishEvent(oldVal, newVal)
+	return nil
+}
+
+type ConfigEvent struct {
+	Old map[string]any // Old models.Config
+	New map[string]any // New models.Config
+}
+
+func (e ConfigEvent) IsChanged(key string) bool {
+	oldVal, oldOk := e.Old[key]
+	newVal, newOk := e.New[key]
+	if !oldOk && !newOk {
+		return false
+	}
+	if oldOk != newOk {
+		return true
+	}
+	return !reflect.DeepEqual(oldVal, newVal)
+}
+
+func IsChangedT[T any](e ConfigEvent, key string) (bool, T) {
+	changed := e.IsChanged(key)
+	var zero T
+
+	val, ok := e.New[key]
+	if !ok {
+		val, ok = e.Old[key]
+		if !ok {
+			return changed, zero
+		}
+	}
+	if val == nil {
+		return changed, zero
+	}
+
+	// Fast path: direct assertion.
+	if cast, ok := val.(T); ok {
+		return changed, cast
+	}
+
+	// Try reflection-based conversion (covers numeric conversions, etc.).
+	targetType := reflect.TypeOf((*T)(nil)).Elem()
+	v := reflect.ValueOf(val)
+	if v.IsValid() {
+		if v.Type().AssignableTo(targetType) {
+			return changed, v.Interface().(T)
+		}
+		if v.Type().ConvertibleTo(targetType) {
+			converted := v.Convert(targetType)
+			return changed, converted.Interface().(T)
+		}
+	}
+
+	// Fallback: JSON roundtrip for map/struct and other loosely typed values.
+	if b, err := json.Marshal(val); err == nil {
+		var out T
+		if err := json.Unmarshal(b, &out); err == nil {
+			return changed, out
+		}
+	}
+
+	return changed, zero
+}
+
+// ConfigSubscriber handles config events
+type ConfigSubscriber func(event ConfigEvent)
+
+var (
+	subscribersMu sync.RWMutex
+	subscribers   []ConfigSubscriber
+)
+
+// Subscribe registers a subscriber for all config events.
+func Subscribe(subscriber ConfigSubscriber) {
+	subscribersMu.Lock()
+	defer subscribersMu.Unlock()
+	subscribers = append(subscribers, subscriber)
+}
+
+// publishEvent notifies all subscribers of a config change.
+func publishEvent(oldVal, newVal map[string]any) {
+	subscribersMu.RLock()
+	defer subscribersMu.RUnlock()
+	for _, sub := range subscribers {
+		event := ConfigEvent{Old: oldVal, New: newVal}
+		go sub(event)
+	}
+}

config/legacy.go

@@ -0,0 +1,131 @@
+package config
+
+import "time"
+
+type Legacy struct {
+	ID                uint   `json:"id,omitempty"`                                        // 1
+	Sitename          string `json:"sitename" default:"Komari"`                           // 站点名称，默认 "Komari"
+	Description       string `json:"description" default:"A simple server monitor tool."` // 站点描述
+	AllowCors         bool   `json:"allow_cors" default:"false"`                          // 是否允许跨域，默认 false
+	Theme             string `json:"theme" default:"default"`                             // 主题名称，默认 'default'
+	PrivateSite       bool   `json:"private_site" default:"false"`                        // 是否为私有站点，默认 false
+	ApiKey            string `json:"api_key" default:""`                                  // API 密钥，默认空字符串
+	AutoDiscoveryKey  string `json:"auto_discovery_key" default:""`                       // 自动发现密钥
+	ScriptDomain      string `json:"script_domain" default:""`                            // 自定义脚本域名
+	SendIpAddrToGuest bool   `json:"send_ip_addr_to_guest" default:"false"`               // 是否向访客页面发送 IP 地址，默认 false
+	EulaAccepted      bool   `json:"eula_accepted" default:"false"`
+	BaseScriptsURLKey string `json:"base_scripts_url" default:""`
+	// GeoIP 配置
+	GeoIpEnabled  bool   `json:"geo_ip_enabled" default:"true"`
+	GeoIpProvider string `json:"geo_ip_provider" default:"ipinfo"` // empty, mmdb, ip-api, geojs
+	// Nezha 兼容（Agent gRPC）
+	NezhaCompatEnabled bool   `json:"nezha_compat_enabled" default:"false"`
+	NezhaCompatListen  string `json:"nezha_compat_listen" default:""` // 例如 0.0.0.0:5555
+	// OAuth 配置
+	OAuthEnabled         bool   `json:"o_auth_enabled" default:"false"`
+	OAuthProvider        string `json:"o_auth_provider" default:"github"`
+	DisablePasswordLogin bool   `json:"disable_password_login" default:"false"`
+	// 自定义美化
+	CustomHead string `json:"custom_head" default:""`
+	CustomBody string `json:"custom_body" default:""`
+	// 通知
+	NotificationEnabled        bool    `json:"notification_enabled" default:"true"` // 通知总开关
+	NotificationMethod         string  `json:"notification_method" default:"none"`
+	NotificationTemplate       string  `json:"notification_template" default:"{{emoji}}{{emoji}}{{emoji}}\nEvent: {{event}}\nClients: {{client}}\nMessage: {{message}}\nTime: {{time}}"`
+	ExpireNotificationEnabled  bool    `json:"expire_notification_enabled" default:"true"` // 是否启用过期通知
+	ExpireNotificationLeadDays int     `json:"expire_notification_lead_days" default:"7"`  // 过期前多少天通知，默认7天
+	LoginNotification          bool    `json:"login_notification" default:"true"`          // 登录通知
+	TrafficLimitPercentage     float64 `json:"traffic_limit_percentage" default:"80.00"`   // 流量限制百分比，默认80.00%
+	// Record
+	RecordEnabled          bool `json:"record_enabled" default:"true"`          // 是否启用记录功能
+	RecordPreserveTime     int  `json:"record_preserve_time" default:"720"`     // 记录保留时间，单位小时，默认30天
+	PingRecordPreserveTime int  `json:"ping_record_preserve_time" default:"24"` // Ping 记录保留时间，单位小时，默认1天
+	UpdatedAt              time.Time
+}
+
+const (
+	SitenameKey                   = "sitename"
+	DescriptionKey                = "description"
+	AllowCorsKey                  = "allow_cors"
+	ThemeKey                      = "theme"
+	PrivateSiteKey                = "private_site"
+	ApiKeyKey                     = "api_key"
+	AutoDiscoveryKeyKey           = "auto_discovery_key"
+	ScriptDomainKey               = "script_domain"
+	SendIpAddrToGuestKey          = "send_ip_addr_to_guest"
+	EulaAcceptedKey               = "eula_accepted"
+	BaseScriptsURLKey             = "base_scripts_url"
+	GeoIpEnabledKey               = "geo_ip_enabled"
+	GeoIpProviderKey              = "geo_ip_provider"
+	NezhaCompatEnabledKey         = "nezha_compat_enabled"
+	NezhaCompatListenKey          = "nezha_compat_listen"
+	OAuthEnabledKey               = "o_auth_enabled"
+	OAuthProviderKey              = "o_auth_provider"
+	DisablePasswordLoginKey       = "disable_password_login"
+	CustomHeadKey                 = "custom_head"
+	CustomBodyKey                 = "custom_body"
+	NotificationEnabledKey        = "notification_enabled"
+	NotificationMethodKey         = "notification_method"
+	NotificationTemplateKey       = "notification_template"
+	ExpireNotificationEnabledKey  = "expire_notification_enabled"
+	ExpireNotificationLeadDaysKey = "expire_notification_lead_days"
+	LoginNotificationKey          = "login_notification"
+	TrafficLimitPercentageKey     = "traffic_limit_percentage"
+	RecordEnabledKey              = "record_enabled"
+	RecordPreserveTimeKey         = "record_preserve_time"
+	PingRecordPreserveTimeKey     = "ping_record_preserve_time"
+	UpdatedAtKey                  = "updated_at"
+)
+
+func (Legacy) TableName() string {
+	return "configs"
+}
+
+// Decrepted
+/*
+func Update(cst map[string]interface{}) error {
+	oldConfig, _ := GetManyAs[Legacy]()
+	// Proceed with update
+	cst["updated_at"] = time.Now().Unix()
+	delete(cst, "created_at")
+	delete(cst, "CreatedAt")
+
+	// 至少有一种登录方式启用
+	newDisablePasswordLogin := oldConfig.DisablePasswordLogin
+	newOAuthEnabled := oldConfig.OAuthEnabled
+	if val, exists := cst["disable_password_login"]; exists {
+		newDisablePasswordLogin = val.(bool)
+	}
+	if val, exists := cst["o_auth_enabled"]; exists {
+		newOAuthEnabled = val.(bool)
+	}
+	if newDisablePasswordLogin && !newOAuthEnabled {
+		return errors.New("at least one login method must be enabled (password/oauth)")
+	}
+	// 没绑定账号也不能禁用
+	if newDisablePasswordLogin {
+		usr := &models.User{}
+		if err := Db.Model(&models.User{}).First(usr).Error; err != nil {
+			return errors.Join(err, errors.New("failed to retrieve user"))
+		}
+		if usr.SSOID == "" {
+			return errors.New("cannot disable password login when no SSO-bound account exists")
+		}
+	}
+	err := Db.Transaction(func(tx *gorm.DB) error {
+		if err := tx.Model(&models.Config{}).Where("id = ?", oldConfig.ID).Updates(cst).Error; err != nil {
+			return errors.Join(err, errors.New("failed to update configuration"))
+		}
+		newConfig := &models.Config{}
+		if err := tx.Where("id = ?", oldConfig.ID).First(newConfig).Error; err != nil {
+			return errors.Join(err, errors.New("failed to retrieve updated configuration"))
+		}
+		//publishEvent(oldConfig, *newConfig)
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+*/

database/accounts/2fa.go

@@ -3,10 +3,8 @@ package accounts
 import (
 	"image"
 
-	"github.com/gookit/event"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
-	"github.com/komari-monitor/komari/internal/eventType"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
 	"github.com/pquerna/otp/totp"
 )
 
@@ -31,14 +29,7 @@ func Generate2Fa() (string, image.Image, error) {
 
 func Enable2Fa(uuid, secret string) error {
 	db := dbcore.GetDBInstance()
-	err := db.Model(&models.User{}).Where("uuid = ?", uuid).Update("two_factor", secret).Error
-	if err != nil {
-		event.Trigger(eventType.UserTwoFaAdded, event.M{
-			"user": uuid,
-		})
-		return err
-	}
-	return nil
+	return db.Model(&models.User{}).Where("uuid = ?", uuid).Update("two_factor", secret).Error
 }
 
 func Verify2Fa(uuid, code string) (bool, error) {
@@ -63,12 +54,5 @@ func Verify2Fa(uuid, code string) (bool, error) {
 
 func Disable2Fa(uuid string) error {
 	db := dbcore.GetDBInstance()
-	err := db.Model(&models.User{}).Where("uuid = ?", uuid).Update("two_factor", "").Error
-	if err != nil {
-		return err
-	}
-	event.Trigger(eventType.UserTwoFaRemoved, event.M{
-		"user": uuid,
-	})
-	return nil
+	return db.Model(&models.User{}).Where("uuid = ?", uuid).Update("two_factor", "").Error
 }

database/accounts/accounts.go

@@ -7,11 +7,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/gookit/event"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
-	"github.com/komari-monitor/komari/internal/eventType"
-	"github.com/komari-monitor/komari/pkg/utils"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/utils"
 
 	"github.com/google/uuid"
 )
@@ -181,18 +179,5 @@ func UpdateUser(uuid string, name, password, sso_type *string) error {
 	if password != nil {
 		DeleteAllSessions()
 	}
-	if name != nil {
-		event.Trigger(eventType.UserUpdateUsername, event.M{
-			"user": uuid,
-		})
-	} else if password != nil {
-		event.Trigger(eventType.UserUpdatePassword, event.M{
-			"user": uuid,
-		})
-	} else if sso_type != nil && *sso_type == "" {
-		event.Trigger(eventType.UserOidcUnbound, event.M{
-			"user": uuid,
-		})
-	}
 	return nil
 }

database/accounts/sessions.go

@@ -6,15 +6,13 @@ import (
 	"net"
 	"time"
 
-	"github.com/gookit/event"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/database/models"
-	messageevent "github.com/komari-monitor/komari/internal/database/models/messageEvent"
-	"github.com/komari-monitor/komari/internal/dbcore"
-	"github.com/komari-monitor/komari/internal/eventType"
-	"github.com/komari-monitor/komari/internal/geoip"
-	"github.com/komari-monitor/komari/internal/messageSender"
-	"github.com/komari-monitor/komari/pkg/utils"
+	"github.com/komari-monitor/komari/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"
 )
 
 // GetAllSessions 获取所有会话
@@ -41,21 +39,23 @@ func CreateSession(uuid string, expires int, userAgent, ip, login_method string)
 		LoginMethod:  login_method,
 		LatestOnline: models.FromTime(time.Now()),
 	}
-	cfg, _ := conf.GetWithV1Format()
-	if cfg.LoginNotification {
-		ipAddr := net.ParseIP(ip)
-		ipinfo, _ := geoip.GetGeoInfo(ipAddr)
-		loc := "unknown"
-		if ipinfo != nil {
-			loc = ipinfo.Name
+	go func() {
+		LoginNotification, _ := config.GetAs[bool](config.LoginNotificationKey, false)
+		if LoginNotification {
+			ipAddr := net.ParseIP(ip)
+			ipinfo, _ := geoip.GetGeoInfo(ipAddr)
+			loc := "unknown"
+			if ipinfo != nil && ipinfo.Name != "" {
+				loc = ipinfo.Name
+			}
+			messageSender.SendEvent(models.EventMessage{
+				Event:   messageevent.Login,
+				Time:    time.Now(),
+				Message: fmt.Sprintf("%s: %s (%s)\n%s", login_method, ip, loc, userAgent),
+				Emoji:   "🔑",
+			})
 		}
-		messageSender.SendEvent(models.EventMessage{
-			Event:   messageevent.Login,
-			Time:    time.Now(),
-			Message: fmt.Sprintf("%s: %s (%s)\n%s", login_method, ip, loc, userAgent),
-			Emoji:   "🔑",
-		})
-	}
+	}()
 
 	err := db.Create(&sessionRecord).Error
 	if err != nil {
@@ -99,9 +99,6 @@ func DeleteSession(session string) (err error) {
 	if result.Error != nil {
 		return result.Error
 	}
-	event.Trigger(eventType.UserSessionRevoked, event.M{
-		"session": session,
-	})
 	return nil
 }
 

database/auditlog/log.go

@@ -1,12 +1,11 @@
 package auditlog
 
 import (
-	"fmt"
 	"log"
 	"time"
 
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
 )
 
 func Log(ip, uuid, message, msgType string) {
@@ -26,14 +25,6 @@ func EventLog(eventType, message string) {
 	Log("", "", message, eventType)
 }
 
-func InternalInfof(message string, v ...interface{}) {
-	Log("", "", fmt.Sprintf(message, v...), "info")
-}
-
-func InternalErrorf(message string, v ...interface{}) {
-	Log("", "", fmt.Sprintf(message, v...), "error")
-}
-
 // Delete logs older than 30 days
 func RemoveOldLogs() {
 	db := dbcore.GetDBInstance()

database/clients/client.go

@@ -0,0 +1,327 @@
+package clients
+
+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"
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+
+	"fmt"
+
+	"github.com/google/uuid"
+)
+
+// Deprecated: DeleteClientConfig is deprecated and will be removed in a future release. Use DeleteClient instead.
+func DeleteClientConfig(clientUuid string) error {
+	db := dbcore.GetDBInstance()
+	err := db.Delete(&common.ClientConfig{ClientUUID: clientUuid}).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}
+func DeleteClient(clientUuid string) error {
+	db := dbcore.GetDBInstance()
+	err := db.Delete(&models.Client{}, "uuid = ?", clientUuid).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// Deprecated: UpdateOrInsertBasicInfo is deprecated and will be removed in a future release. Use SaveClientInfo instead.
+func UpdateOrInsertBasicInfo(cbi common.ClientInfo) error {
+	db := dbcore.GetDBInstance()
+	updates := make(map[string]interface{})
+
+	if cbi.Name != "" {
+		updates["name"] = cbi.Name
+	}
+	if cbi.CpuName != "" {
+		updates["cpu_name"] = cbi.CpuName
+	}
+	if cbi.Arch != "" {
+		updates["arch"] = cbi.Arch
+	}
+	if cbi.CpuCores > 0 || cbi.CpuCores < math.MaxInt-1 {
+		updates["cpu_cores"] = cbi.CpuCores
+	}
+	if cbi.OS != "" {
+		updates["os"] = cbi.OS
+	}
+	if cbi.GpuName != "" {
+		updates["gpu_name"] = cbi.GpuName
+	}
+	if cbi.IPv4 != "" {
+		updates["ipv4"] = cbi.IPv4
+	}
+	if cbi.IPv6 != "" {
+		updates["ipv6"] = cbi.IPv6
+	}
+	if cbi.Region != "" {
+		updates["region"] = cbi.Region
+	}
+	if cbi.Remark != "" {
+		updates["remark"] = cbi.Remark
+	}
+	updates["mem_total"] = cbi.MemTotal
+	updates["swap_total"] = cbi.SwapTotal
+	updates["disk_total"] = cbi.DiskTotal
+	updates["version"] = cbi.Version
+	updates["updated_at"] = time.Now()
+
+	// 转换为更新Client表
+	client := models.Client{
+		UUID: cbi.UUID,
+	}
+
+	err := db.Model(&client).Clauses(clause.OnConflict{
+		Columns:   []clause.Column{{Name: "uuid"}},
+		DoUpdates: clause.Assignments(updates),
+	}).Create(map[string]interface{}{
+		"uuid":       cbi.UUID,
+		"name":       cbi.Name,
+		"cpu_name":   cbi.CpuName,
+		"arch":       cbi.Arch,
+		"cpu_cores":  cbi.CpuCores,
+		"os":         cbi.OS,
+		"gpu_name":   cbi.GpuName,
+		"ipv4":       cbi.IPv4,
+		"ipv6":       cbi.IPv6,
+		"region":     cbi.Region,
+		"remark":     cbi.Remark,
+		"mem_total":  cbi.MemTotal,
+		"swap_total": cbi.SwapTotal,
+		"disk_total": cbi.DiskTotal,
+		"version":    cbi.Version,
+		"updated_at": time.Now(),
+	}).Error
+
+	if err != nil {
+		return err
+	}
+	return nil
+}
+func SaveClientInfo(update map[string]interface{}) error {
+	db := dbcore.GetDBInstance()
+	clientUUID, ok := update["uuid"].(string)
+	if !ok || clientUUID == "" {
+		return fmt.Errorf("invalid client UUID")
+	}
+
+	// 确保更新的字段不为空
+	if len(update) == 0 {
+		return fmt.Errorf("no fields to update")
+	}
+
+	update["updated_at"] = time.Now()
+
+	checkInt64 := func(name string, val float64) error {
+		if val < 0 {
+			return fmt.Errorf("%s must be non-negative, got %d", name, int64(val))
+		}
+		if val > math.MaxInt64-1 {
+			return fmt.Errorf("%s exceeds int64 max limit: %d", name, int64(val))
+		}
+		return nil
+	}
+
+	verify := func(update map[string]interface{}) error {
+		if update["cpu_cores"].(float64) < 0 || update["cpu_cores"].(float64) > math.MaxInt-1 {
+			return fmt.Errorf("Cpu.Cores be not a valid int64 number: %d", update["cpu_cores"])
+		}
+		if err := checkInt64("Ram.Total", update["mem_total"].(float64)); err != nil {
+			return err
+		}
+		if err := checkInt64("Swap.Total", update["swap_total"].(float64)); err != nil {
+			return err
+		}
+		if err := checkInt64("Disk.Total", update["disk_total"].(float64)); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	if err := verify(update); err != nil {
+		return err
+	}
+
+	err := db.Model(&models.Client{}).Where("uuid = ?", clientUUID).Updates(update).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// 更新客户端设置
+func UpdateClientConfig(config common.ClientConfig) error {
+	db := dbcore.GetDBInstance()
+	err := db.Save(&config).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func EditClientName(clientUUID, clientName string) error {
+	db := dbcore.GetDBInstance()
+	err := db.Model(&models.Client{}).Where("uuid = ?", clientUUID).Update("name", clientName).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+/*
+// UpdateClientByUUID 更新指定 UUID 的客户端配置
+
+	func UpdateClientByUUID(config common.ClientConfig) error {
+		db := dbcore.GetDBInstance()
+		result := db.Model(&common.ClientConfig{}).Where("client_uuid = ?", config.ClientUUID).Updates(config)
+		if result.Error != nil {
+			return result.Error
+		}
+		if result.RowsAffected == 0 {
+			return gorm.ErrRecordNotFound
+		}
+		return nil
+	}
+*/
+func EditClientToken(clientUUID, token string) error {
+	db := dbcore.GetDBInstance()
+	err := db.Model(&models.Client{}).Where("uuid = ?", clientUUID).Update("token", token).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// CreateClient 创建新客户端
+func CreateClient() (clientUUID, token string, err error) {
+	db := dbcore.GetDBInstance()
+	token = utils.GenerateToken()
+	clientUUID = uuid.New().String()
+
+	client := models.Client{
+		UUID:      clientUUID,
+		Token:     token,
+		Name:      "client_" + clientUUID[0:8],
+		CreatedAt: models.FromTime(time.Now()),
+		UpdatedAt: models.FromTime(time.Now()),
+	}
+
+	err = db.Create(&client).Error
+	if err != nil {
+		return "", "", err
+	}
+	return clientUUID, token, nil
+}
+
+func CreateClientWithName(name string) (clientUUID, token string, err error) {
+	if name == "" {
+		return CreateClient()
+	}
+	db := dbcore.GetDBInstance()
+	token = utils.GenerateToken()
+	clientUUID = uuid.New().String()
+	client := models.Client{
+		UUID:      clientUUID,
+		Token:     token,
+		Name:      name,
+		CreatedAt: models.FromTime(time.Now()),
+		UpdatedAt: models.FromTime(time.Now()),
+	}
+
+	err = db.Create(&client).Error
+	if err != nil {
+		return "", "", err
+	}
+	return clientUUID, token, nil
+}
+
+/*
+// GetAllClients 获取所有客户端配置
+
+	func getAllClients() (clients []models.Client, err error) {
+		db := dbcore.GetDBInstance()
+		err = db.Find(&clients).Error
+		if err != nil {
+			return nil, err
+		}
+		return clients, nil
+	}
+*/
+func GetClientByUUID(uuid string) (client models.Client, err error) {
+	db := dbcore.GetDBInstance()
+	err = db.Where("uuid = ?", uuid).First(&client).Error
+	if err != nil {
+		return models.Client{}, err
+	}
+	return client, nil
+}
+
+// GetClientBasicInfo 获取指定 UUID 的客户端基本信息
+func GetClientBasicInfo(uuid string) (client models.Client, err error) {
+	db := dbcore.GetDBInstance()
+	err = db.Where("uuid = ?", uuid).First(&client).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return models.Client{}, fmt.Errorf("客户端不存在: %s", uuid)
+		}
+		return models.Client{}, err
+	}
+	return client, nil
+}
+
+func GetClientTokenByUUID(uuid string) (token string, err error) {
+	db := dbcore.GetDBInstance()
+	var client models.Client
+	err = db.Where("uuid = ?", uuid).First(&client).Error
+	if err != nil {
+		return "", err
+	}
+	return client.Token, nil
+}
+
+func GetAllClientBasicInfo() (clients []models.Client, err error) {
+	db := dbcore.GetDBInstance()
+	err = db.Find(&clients).Error
+	if err != nil {
+		return nil, err
+	}
+	return clients, nil
+}
+
+func SaveClient(updates map[string]interface{}) error {
+	db := dbcore.GetDBInstance()
+	clientUUID, ok := updates["uuid"].(string)
+	if !ok || clientUUID == "" {
+		return fmt.Errorf("invalid client UUID")
+	}
+
+	// 确保更新的字段不为空
+	if len(updates) == 0 {
+		return fmt.Errorf("no fields to update")
+	}
+
+	if v, exists := updates["traffic_limit"]; exists {
+		if val, ok := v.(float64); ok {
+			if val < 0 || val > math.MaxInt64-1 {
+				return fmt.Errorf("traffic_limit must be a valid non-negative int64 value, got %v", val)
+			}
+		}
+	}
+
+	updates["updated_at"] = time.Now()
+
+	err := db.Model(&models.Client{}).Where("uuid = ?", clientUUID).Updates(updates).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}

database/clients/report.go

@@ -1,14 +1,35 @@
-package client
+package clients
 
 import (
+	"encoding/json"
 	"fmt"
 	"math"
+	"time"
 
-	"github.com/komari-monitor/komari/internal/common"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"github.com/komari-monitor/komari/common"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
+
+	"gorm.io/gorm"
 )
 
+// Report 表示客户端报告数据
+// SaveReport 保存报告数据
+func SaveReport(uuid string, data map[string]interface{}) (err error) {
+
+	report, err := ParseReport(data)
+	if err != nil {
+		return err
+	}
+	err = SaveClientReport(uuid, report)
+	if err != nil {
+
+		return err
+	}
+	return nil
+
+}
+
 func GetClientUUIDByToken(token string) (clientUUID string, err error) {
 	db := dbcore.GetDBInstance()
 	var client models.Client
@@ -19,6 +40,18 @@ func GetClientUUIDByToken(token string) (clientUUID string, err error) {
 	return client.UUID, nil
 }
 
+func ParseReport(data map[string]interface{}) (report common.Report, err error) {
+	jsonData, err := json.Marshal(data)
+	if err != nil {
+		return common.Report{}, err
+	}
+	err = json.Unmarshal(jsonData, &report)
+	if err != nil {
+		return common.Report{}, err
+	}
+	return report, nil
+}
+
 // 检查数据防止异常数据导致数据库损坏
 func ReportVerify(report common.Report) error {
 	// 防止输入不合理范围
@@ -92,7 +125,7 @@ func ReportVerify(report common.Report) error {
 	}
 	// 拒绝所有负数Int
 	if report.Process < 0 {
-		return fmt.Errorf("process must be non-negative: %d", report.Process)
+		return fmt.Errorf("Process must be non-negative: %d", report.Process)
 	}
 	if report.Connections.TCP < 0 {
 		return fmt.Errorf("Connections.TCP must be non-negative: %d", report.Connections.TCP)
@@ -103,78 +136,78 @@ func ReportVerify(report common.Report) error {
 	return nil
 }
 
-// // SaveClientReport 保存客户端报告到 Record 表
-// func SaveClientReport(clientUUID string, report common.Report) (err error) {
-// 	db := dbcore.GetDBInstance()
+// SaveClientReport 保存客户端报告到 Record 表
+func SaveClientReport(clientUUID string, report common.Report) (err error) {
+	db := dbcore.GetDBInstance()
 
-// 	if err := ReportVerify(report); err != nil {
-// 		return fmt.Errorf("failed to save Record: %v", err)
-// 	}
+	if err := ReportVerify(report); err != nil {
+		return fmt.Errorf("failed to save Record: %v", err)
+	}
 
-// 	// 保存GPU详细记录到独立表
-// 	currentTime := time.Now()
-// 	if report.GPU != nil && len(report.GPU.DetailedInfo) > 0 {
-// 		for idx, gpu := range report.GPU.DetailedInfo {
-// 			gpuRecord := models.GPURecord{
-// 				Client:      clientUUID,
-// 				Time:        models.FromTime(currentTime),
-// 				DeviceIndex: idx,
-// 				DeviceName:  gpu.Name,
-// 				MemTotal:    gpu.MemoryTotal,
-// 				MemUsed:     gpu.MemoryUsed,
-// 				Utilization: float32(gpu.Utilization),
-// 				Temperature: gpu.Temperature,
-// 			}
-// 			if err := db.Create(&gpuRecord).Error; err != nil {
-// 				return fmt.Errorf("failed to save GPU record: %v", err)
-// 			}
-// 		}
-// 	}
+	// 保存GPU详细记录到独立表
+	currentTime := time.Now()
+	if report.GPU != nil && len(report.GPU.DetailedInfo) > 0 {
+		for idx, gpu := range report.GPU.DetailedInfo {
+			gpuRecord := models.GPURecord{
+				Client:      clientUUID,
+				Time:        models.FromTime(currentTime),
+				DeviceIndex: idx,
+				DeviceName:  gpu.Name,
+				MemTotal:    gpu.MemoryTotal,
+				MemUsed:     gpu.MemoryUsed,
+				Utilization: float32(gpu.Utilization),
+				Temperature: gpu.Temperature,
+			}
+			if err := db.Create(&gpuRecord).Error; err != nil {
+				return fmt.Errorf("failed to save GPU record: %v", err)
+			}
+		}
+	}
 
-// 	// 计算平均GPU使用率，用于向后兼容
-// 	averageGPUUsage := float32(0)
-// 	if report.GPU != nil && len(report.GPU.DetailedInfo) > 0 {
-// 		averageGPUUsage = float32(report.GPU.AverageUsage)
-// 	}
+	// 计算平均GPU使用率，用于向后兼容
+	averageGPUUsage := float32(0)
+	if report.GPU != nil && len(report.GPU.DetailedInfo) > 0 {
+		averageGPUUsage = float32(report.GPU.AverageUsage)
+	}
 
-// 	Record := models.Record{
-// 		Client:         clientUUID,
-// 		Time:           models.FromTime(currentTime),
-// 		Cpu:            float32(report.CPU.Usage),
-// 		Gpu:            averageGPUUsage, // 使用平均GPU使用率
-// 		Ram:            report.Ram.Used,
-// 		RamTotal:       report.Ram.Total,
-// 		Swap:           report.Swap.Used,
-// 		SwapTotal:      report.Swap.Total,
-// 		Load:           float32(report.Load.Load1), // 使用 Load1 作为主要负载指标
-// 		Temp:           0,                          // Report 未提供 TEMP，设为 0（与原 nil 行为类似）
-// 		Disk:           report.Disk.Used,
-// 		DiskTotal:      report.Disk.Total,
-// 		NetIn:          report.Network.Down,
-// 		NetOut:         report.Network.Up,
-// 		NetTotalUp:     report.Network.TotalUp,
-// 		NetTotalDown:   report.Network.TotalDown,
-// 		Process:        report.Process,
-// 		Connections:    report.Connections.TCP,
-// 		ConnectionsUdp: report.Connections.UDP,
-// 		//Uptime:         report.Uptime,
-// 	}
+	Record := models.Record{
+		Client:         clientUUID,
+		Time:           models.FromTime(currentTime),
+		Cpu:            float32(report.CPU.Usage),
+		Gpu:            averageGPUUsage, // 使用平均GPU使用率
+		Ram:            report.Ram.Used,
+		RamTotal:       report.Ram.Total,
+		Swap:           report.Swap.Used,
+		SwapTotal:      report.Swap.Total,
+		Load:           float32(report.Load.Load1), // 使用 Load1 作为主要负载指标
+		Temp:           0,                          // Report 未提供 TEMP，设为 0（与原 nil 行为类似）
+		Disk:           report.Disk.Used,
+		DiskTotal:      report.Disk.Total,
+		NetIn:          report.Network.Down,
+		NetOut:         report.Network.Up,
+		NetTotalUp:     report.Network.TotalUp,
+		NetTotalDown:   report.Network.TotalDown,
+		Process:        report.Process,
+		Connections:    report.Connections.TCP,
+		ConnectionsUdp: report.Connections.UDP,
+		//Uptime:         report.Uptime,
+	}
 
-// 	// 使用事务确保 Record 和 ClientsInfo 一致性
-// 	err = db.Transaction(func(tx *gorm.DB) error {
-// 		// 保存 Record
-// 		if err := tx.Create(&Record).Error; err != nil {
-// 			return fmt.Errorf("failed to save Record: %v", err)
-// 		}
-// 		return nil
-// 	})
+	// 使用事务确保 Record 和 ClientsInfo 一致性
+	err = db.Transaction(func(tx *gorm.DB) error {
+		// 保存 Record
+		if err := tx.Create(&Record).Error; err != nil {
+			return fmt.Errorf("failed to save Record: %v", err)
+		}
+		return nil
+	})
 
-// 	if err != nil {
-// 		return err
-// 	}
+	if err != nil {
+		return err
+	}
 
-// 	return nil
-// }
+	return nil
+}
 
 /*
 // getString 从 map 中获取字符串

database/clipboard/clipboard.go

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

database/dbcore/dbcore.go

@@ -0,0 +1,496 @@
+package dbcore
+
+import (
+	"archive/zip"
+	"encoding/json"
+	"fmt"
+	"io"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/komari-monitor/komari/cmd/flags"
+	"github.com/komari-monitor/komari/common"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/models"
+	logutil "github.com/komari-monitor/komari/utils/log"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+)
+
+// zipDirectoryExcluding 将 srcDir 打包为 dstZip，exclude 是绝对路径集合需要排除
+func zipDirectoryExcluding(srcDir, dstZip string, exclude map[string]struct{}) error {
+	// 规范化排除路径为绝对路径
+	normExclude := make(map[string]struct{}, len(exclude))
+	for p := range exclude {
+		abs, _ := filepath.Abs(p)
+		normExclude[abs] = struct{}{}
+	}
+
+	out, err := os.Create(dstZip)
+	if err != nil {
+		return err
+	}
+	defer out.Close()
+
+	zw := zip.NewWriter(out)
+	defer zw.Close()
+
+	absSrc, _ := filepath.Abs(srcDir)
+	walkErr := filepath.Walk(absSrc, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		// 排除 backup.zip 本身
+		if _, ok := normExclude[path]; ok {
+			if info.IsDir() {
+				return filepath.SkipDir
+			}
+			return nil
+		}
+		// 计算 zip 内相对路径
+		rel, err := filepath.Rel(absSrc, path)
+		if err != nil {
+			return err
+		}
+		// 根目录跳过
+		if rel == "." {
+			return nil
+		}
+		// 替换为正斜杠
+		zipName := filepath.ToSlash(rel)
+
+		if info.IsDir() {
+			_, err := zw.Create(zipName + "/")
+			return err
+		}
+		// 普通文件
+		fh, err := os.Open(path)
+		if err != nil {
+			return err
+		}
+		w, err := zw.Create(zipName)
+		if err != nil {
+			fh.Close()
+			return err
+		}
+		if _, err := io.Copy(w, fh); err != nil {
+			fh.Close()
+			return err
+		}
+		fh.Close()
+		return nil
+	})
+	if walkErr != nil {
+		return walkErr
+	}
+	return zw.Close()
+}
+
+// removeAllInDirExcept 删除 dir 下除 exclude 指定绝对路径外的所有文件和文件夹
+func removeAllInDirExcept(dir string, exclude map[string]struct{}) error {
+	absDir, err := filepath.Abs(dir)
+	if err != nil {
+		return err
+	}
+	normExclude := make(map[string]struct{}, len(exclude))
+	for p := range exclude {
+		abs, _ := filepath.Abs(p)
+		normExclude[abs] = struct{}{}
+	}
+	entries, err := os.ReadDir(absDir)
+	if err != nil {
+		return err
+	}
+	for _, e := range entries {
+		full := filepath.Join(absDir, e.Name())
+		if _, ok := normExclude[full]; ok {
+			continue
+		}
+		if err := os.RemoveAll(full); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// unzipToDir 将 zipPath 解压到 dstDir，包含路径遍历保护
+func unzipToDir(zipPath, dstDir string) error {
+	zr, err := zip.OpenReader(zipPath)
+	if err != nil {
+		return err
+	}
+	defer zr.Close()
+
+	if err := os.MkdirAll(dstDir, 0755); err != nil {
+		return err
+	}
+	absDst, _ := filepath.Abs(dstDir)
+
+	for _, f := range zr.File {
+		// 构造目标路径并做路径遍历保护
+		cleanName := filepath.Clean(f.Name)
+		targetPath := filepath.Join(absDst, cleanName)
+		if !strings.HasPrefix(targetPath, absDst+string(os.PathSeparator)) && targetPath != absDst {
+			return fmt.Errorf("illegal file path in zip: %s", f.Name)
+		}
+		if f.FileInfo().IsDir() {
+			if err := os.MkdirAll(targetPath, 0755); err != nil {
+				return err
+			}
+			continue
+		}
+		if err := os.MkdirAll(filepath.Dir(targetPath), 0755); err != nil {
+			return err
+		}
+		rc, err := f.Open()
+		if err != nil {
+			return err
+		}
+		out, err := os.Create(targetPath)
+		if err != nil {
+			rc.Close()
+			return err
+		}
+		if _, err := io.Copy(out, rc); err != nil {
+			out.Close()
+			rc.Close()
+			return err
+		}
+		out.Close()
+		rc.Close()
+	}
+	return nil
+}
+
+// mergeClientInfo 将旧版ClientInfo数据迁移到新版Client表
+func mergeClientInfo(db *gorm.DB) {
+	var clientInfos []common.ClientInfo
+	if err := db.Find(&clientInfos).Error; err != nil {
+		log.Printf("Failed to read ClientInfo table: %v", err)
+		return
+	}
+
+	for _, info := range clientInfos {
+		var client models.Client
+		if err := db.Where("uuid = ?", info.UUID).First(&client).Error; err != nil {
+			log.Printf("Could not find Client record with UUID %s: %v", info.UUID, err)
+			continue
+		}
+
+		// 更新Client记录
+		client.Name = info.Name
+		client.CpuName = info.CpuName
+		client.Virtualization = info.Virtualization
+		client.Arch = info.Arch
+		client.CpuCores = info.CpuCores
+		client.OS = info.OS
+		client.GpuName = info.GpuName
+		client.IPv4 = info.IPv4
+		client.IPv6 = info.IPv6
+		client.Region = info.Region
+		client.Remark = info.Remark
+		client.PublicRemark = info.PublicRemark
+		client.MemTotal = info.MemTotal
+		client.SwapTotal = info.SwapTotal
+		client.DiskTotal = info.DiskTotal
+		client.Version = info.Version
+		client.Weight = info.Weight
+		client.Price = info.Price
+		client.BillingCycle = info.BillingCycle
+		client.ExpiredAt = models.FromTime(info.ExpiredAt)
+		// Save updated Client record
+		if err := db.Save(&client).Error; err != nil {
+			log.Printf("Failed to update Client record: %v", err)
+			continue
+		}
+	}
+
+	// Backup and rename old table after migration
+	if err := db.Migrator().RenameTable("client_infos", "client_infos_backup"); err != nil {
+		log.Printf("Failed to backup ClientInfo table: %v", err)
+		return
+	}
+	log.Println("Data migration completed, old table has been backed up as client_infos_backup")
+}
+
+func MergeDatabase(db *gorm.DB) {
+	if db.Migrator().HasTable("client_infos") {
+		log.Println("[>0.0.5] Legacy ClientInfo table detected, starting data migration...")
+		mergeClientInfo(db)
+	}
+	if db.Migrator().HasColumn(&models.Config{}, "allow_cros") {
+		log.Println("[>0.0.5a] Renaming column 'allow_cros' to 'allow_cors' in config table...")
+		db.Migrator().RenameColumn(&models.Config{}, "allow_cros", "allow_cors")
+	}
+	if db.Migrator().HasColumn(&models.LoadNotification{}, "client") {
+		log.Println("[>0.1.4] Rebuilding LoadNotification table....")
+		db.Migrator().DropTable(&models.LoadNotification{})
+	}
+	if !db.Migrator().HasTable(&models.OidcProvider{}) && db.Migrator().HasTable(&models.Config{}) {
+		log.Println("[>1.0.2] Merge OidcProvider table....")
+		var config struct {
+			OAuthClientID     string `json:"o_auth_client_id" gorm:"type:varchar(255)"`
+			OAuthClientSecret string `json:"o_auth_client_secret" gorm:"type:varchar(255)"`
+		}
+		if err := db.Raw("SELECT * FROM configs LIMIT 1").Scan(&config).Error; err != nil {
+			log.Println("Failed to get config for OIDC provider migration:", err)
+		}
+		db.AutoMigrate(&models.OidcProvider{})
+		j, err := json.Marshal(&map[string]string{
+			"client_id":     config.OAuthClientID,
+			"client_secret": config.OAuthClientSecret,
+		})
+		if err != nil {
+			log.Println("Failed to marshal OIDC provider config:", err)
+			return
+		}
+		db.Save(&models.OidcProvider{
+			Name:     "github",
+			Addition: string(j),
+		})
+		db.AutoMigrate(&models.Config{})
+		db.Model(&models.Config{}).Where("id = 1").Update("o_auth_provider", "github")
+	}
+	if !db.Migrator().HasTable(&models.MessageSenderProvider{}) && db.Migrator().HasTable(&models.Config{}) {
+		log.Println("[>1.0.2] Migrate MessageSender configuration....")
+		var config struct {
+			TelegramBotToken   string `json:"telegram_bot_token" gorm:"type:varchar(255)"`
+			TelegramChatID     string `json:"telegram_chat_id" gorm:"type:varchar(255)"`
+			TelegramEndpoint   string `json:"telegram_endpoint" gorm:"type:varchar(255)"`
+			EmailHost          string `json:"email_host" gorm:"type:varchar(255)"`
+			EmailPort          int    `json:"email_port" gorm:"type:int"`
+			EmailUsername      string `json:"email_username" gorm:"type:varchar(255)"`
+			EmailPassword      string `json:"email_password" gorm:"type:varchar(255)"`
+			EmailSender        string `json:"email_sender" gorm:"type:varchar(255)"`
+			EmailReceiver      string `json:"email_receiver" gorm:"type:varchar(255)"`
+			EmailUseSSL        bool   `json:"email_use_ssl" gorm:"type:boolean"`
+			NotificationMethod string `json:"notification_method" gorm:"type:varchar(50)"`
+		}
+		if err := db.Raw("SELECT * FROM configs LIMIT 1").Scan(&config).Error; err != nil {
+			log.Println("Failed to get config for MessageSender migration:", err)
+		}
+
+		db.AutoMigrate(&models.MessageSenderProvider{})
+
+		// 迁移Telegram配置
+		if config.NotificationMethod == "telegram" && config.TelegramBotToken != "" {
+			telegramConfig := map[string]interface{}{
+				"bot_token": config.TelegramBotToken,
+				"chat_id":   config.TelegramChatID,
+				"endpoint":  config.TelegramEndpoint,
+			}
+			if telegramConfig["endpoint"] == "" {
+				telegramConfig["endpoint"] = "https://api.telegram.org/bot"
+			}
+			telegramConfigJSON, err := json.Marshal(telegramConfig)
+			if err != nil {
+				log.Println("Failed to marshal Telegram config:", err)
+			} else {
+				db.Save(&models.MessageSenderProvider{
+					Name:     "telegram",
+					Addition: string(telegramConfigJSON),
+				})
+			}
+		}
+
+		// 迁移Email配置
+		if config.NotificationMethod == "email" && config.EmailHost != "" {
+			emailConfig := map[string]interface{}{
+				"host":     config.EmailHost,
+				"port":     config.EmailPort,
+				"username": config.EmailUsername,
+				"password": config.EmailPassword,
+				"sender":   config.EmailSender,
+				"receiver": config.EmailReceiver,
+				"use_ssl":  config.EmailUseSSL,
+			}
+			emailConfigJSON, err := json.Marshal(emailConfig)
+			if err != nil {
+				log.Println("Failed to marshal Email config:", err)
+			} else {
+				db.Save(&models.MessageSenderProvider{
+					Name:     "email",
+					Addition: string(emailConfigJSON),
+				})
+			}
+		}
+
+		// 删除旧的配置字段
+		if db.Migrator().HasColumn(&models.Config{}, "telegram_bot_token") {
+			db.Migrator().DropColumn(&models.Config{}, "telegram_bot_token")
+		}
+		if db.Migrator().HasColumn(&models.Config{}, "telegram_chat_id") {
+			db.Migrator().DropColumn(&models.Config{}, "telegram_chat_id")
+		}
+		if db.Migrator().HasColumn(&models.Config{}, "telegram_endpoint") {
+			db.Migrator().DropColumn(&models.Config{}, "telegram_endpoint")
+		}
+		if db.Migrator().HasColumn(&models.Config{}, "email_host") {
+			db.Migrator().DropColumn(&models.Config{}, "email_host")
+		}
+		if db.Migrator().HasColumn(&models.Config{}, "email_port") {
+			db.Migrator().DropColumn(&models.Config{}, "email_port")
+		}
+		if db.Migrator().HasColumn(&models.Config{}, "email_username") {
+			db.Migrator().DropColumn(&models.Config{}, "email_username")
+		}
+		if db.Migrator().HasColumn(&models.Config{}, "email_password") {
+			db.Migrator().DropColumn(&models.Config{}, "email_password")
+		}
+		if db.Migrator().HasColumn(&models.Config{}, "email_sender") {
+			db.Migrator().DropColumn(&models.Config{}, "email_sender")
+		}
+		if db.Migrator().HasColumn(&models.Config{}, "email_receiver") {
+			db.Migrator().DropColumn(&models.Config{}, "email_receiver")
+		}
+		if db.Migrator().HasColumn(&models.Config{}, "email_use_ssl") {
+			db.Migrator().DropColumn(&models.Config{}, "email_use_ssl")
+		}
+	}
+}
+
+var (
+	instance *gorm.DB
+	once     sync.Once
+)
+
+func GetDBInstance() *gorm.DB {
+	once.Do(func() {
+
+		var err error
+
+		// 在数据库初始化前执行：如果存在 ./data/backup.zip，则进行恢复逻辑
+		func() {
+			backupZipPath := filepath.Join(".", "data", "backup.zip")
+			if _, statErr := os.Stat(backupZipPath); statErr == nil {
+				// 4. 把除了 ./data/backup.zip 之外的所有文件压缩到 ./backup/{time}.zip
+				if err := os.MkdirAll("./backup", 0755); err != nil {
+					log.Printf("[restore] failed to create backup dir: %v", err)
+				} else {
+					tsName := time.Now().Format("20060102-150405")
+					bakPath := filepath.Join("./backup", fmt.Sprintf("%s.zip", tsName))
+					if zipErr := zipDirectoryExcluding("./data", bakPath, map[string]struct{}{backupZipPath: {}}); zipErr != nil {
+						log.Printf("[restore] failed to zip current data: %v", zipErr)
+					} else {
+						log.Printf("[restore] current data zipped to %s", bakPath)
+					}
+				}
+
+				// 5. 删除除了 ./data/backup.zip 之外的所有文件
+				if delErr := removeAllInDirExcept("./data", map[string]struct{}{backupZipPath: {}}); delErr != nil {
+					log.Printf("[restore] failed to cleanup data dir: %v", delErr)
+				}
+
+				// 6. 解压 ./data/backup.zip 到 ./data
+				if unzipErr := unzipToDir(backupZipPath, "./data"); unzipErr != nil {
+					log.Printf("[restore] failed to unzip backup into data: %v", unzipErr)
+				} else {
+					log.Printf("[restore] backup.zip extracted to ./data")
+				}
+
+				// 7. 删除 ./data/backup.zip
+				if rmErr := os.Remove(backupZipPath); rmErr != nil {
+					log.Printf("[restore] failed to remove backup.zip: %v", rmErr)
+				} else {
+					log.Printf("[restore] backup.zip removed")
+				}
+				// 8. 删除标记
+				if rmErr := os.Remove("./data/komari-backup-markup"); rmErr != nil {
+					log.Printf("[restore] failed to remove komari-backup-markup: %v", rmErr)
+				} else {
+					log.Printf("[restore] komari-backup-markup removed")
+				}
+			}
+		}()
+
+		logConfig := &gorm.Config{
+			Logger: logutil.NewGormLogger(),
+		}
+
+		// 根据数据库类型选择不同的连接方式
+		switch flags.DatabaseType {
+		case "sqlite", "":
+			// SQLite 连接
+			instance, err = gorm.Open(sqlite.Open(flags.DatabaseFile), logConfig)
+			if err != nil {
+				log.Fatalf("Failed to connect to SQLite3 database: %v", err)
+			}
+			log.Printf("Using SQLite database file: %s", flags.DatabaseFile)
+			instance.Exec("PRAGMA wal = ON;")
+			if err := instance.Exec("PRAGMA journal_mode = WAL;").Error; err != nil {
+				log.Printf("Failed to enable WAL mode for SQLite: %v", err)
+			}
+			instance.Exec("VACUUM;")
+			instance.Exec("PRAGMA wal_checkpoint(TRUNCATE);")
+		// case "mysql":
+		// 	// MySQL 连接
+		// 	dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_unicode_ci&parseTime=True&loc=Local",
+		// 		flags.DatabaseUser,
+		// 		flags.DatabasePass,
+		// 		flags.DatabaseHost,
+		// 		flags.DatabasePort,
+		// 		flags.DatabaseName)
+		// 	instance, err = gorm.Open(mysql.Open(dsn), logConfig)
+		// 	if err != nil {
+		// 		log.Fatalf("Failed to connect to MySQL database: %v", err)
+		// 	}
+		// 	log.Printf("Using MySQL database: %s@%s:%s/%s", flags.DatabaseUser, flags.DatabaseHost, flags.DatabasePort, flags.DatabaseName)
+		default:
+			log.Fatalf("Unsupported database type: %s", flags.DatabaseType)
+		}
+		config.SetDb(instance)
+		MergeDatabase(instance)
+		// 自动迁移模型
+		err = instance.AutoMigrate(
+			&models.User{},
+			&models.Client{},
+			&models.Record{},
+			&models.GPURecord{},
+			// &models.Config{},
+			&models.Log{},
+			&models.Clipboard{},
+			&models.LoadNotification{},
+			&models.OfflineNotification{},
+			&models.PingRecord{},
+			&models.PingTask{},
+			&models.OidcProvider{},
+			&models.MessageSenderProvider{},
+			&models.ThemeConfiguration{},
+		)
+		if err != nil {
+			log.Fatalf("Failed to create tables: %v", err)
+		}
+		err = instance.Table("records_long_term").AutoMigrate(
+			&models.Record{},
+		)
+		if err != nil {
+			log.Printf("Failed to create records_long_term table, it may already exist: %v", err)
+		}
+		err = instance.Table("gpu_records_long_term").AutoMigrate(
+			&models.GPURecord{},
+		)
+		if err != nil {
+			log.Printf("Failed to create gpu_records_long_term table, it may already exist: %v", err)
+		}
+		err = instance.AutoMigrate(
+			&models.Session{},
+		)
+		if err != nil {
+			log.Printf("Failed to create Session table, it may already exist: %v", err)
+		}
+		err = instance.AutoMigrate(
+			&models.Task{},
+			&models.TaskResult{},
+		)
+		if err != nil {
+			log.Printf("Failed to create Task and TaskResult table, it may already exist: %v", err)
+		}
+
+	})
+
+	return instance
+}

database/messageSender.go

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

database/models/UTCTime.go

@@ -0,0 +1,121 @@
+package models
+
+import (
+	"database/sql/driver"
+	"fmt"
+	"log"
+	"os"
+	"strings"
+	"sync"
+	"time"
+)
+
+// LocalTime is a custom time type for GORM to handle time.Time correctly.
+// It ensures that all times are stored and retrieved based on the application's configured timezone.
+type LocalTime time.Time
+
+// Value implements the driver.Valuer interface.
+// It converts UTCTime to a TEXT format that the database understands.
+// The time is formatted as a string in the application's local timezone, without timezone information.
+func (t LocalTime) Value() (driver.Value, error) {
+	if time.Time(t).IsZero() {
+		return nil, nil
+	}
+	return time.Time(t).In(GetAppLocation()).Format("2006-01-02 15:04:05.0000000"), nil
+}
+
+// Scan implements the sql.Scanner interface.
+// It scans a value from the database into a UTCTime object.
+func (t *LocalTime) Scan(v interface{}) error {
+	if v == nil {
+		*t = LocalTime(time.Time{})
+		return nil
+	}
+
+	loc := GetAppLocation()
+
+	switch val := v.(type) {
+	case time.Time:
+		// CRITICAL FIX: When the driver reads a timezone-less string (e.g., "16:00:00"),
+		// it often incorrectly assumes it's UTC. We must correct this by re-interpreting
+		// the date and clock values in the application's actual timezone.
+		year, month, day := val.Date()
+		hour, min, sec := val.Clock()
+		nanosec := val.Nanosecond()
+		*t = LocalTime(time.Date(year, month, day, hour, min, sec, nanosec, loc))
+		return nil
+	case []byte:
+		return t.parseTime(string(val), loc)
+	case string:
+		return t.parseTime(val, loc)
+	default:
+		return fmt.Errorf("UTCTime scan source was not string, []byte or time.Time: %T (%v)", v, v)
+	}
+}
+
+// parseTime handles parsing a string into UTCTime.
+func (t *LocalTime) parseTime(timeStr string, loc *time.Location) error {
+	timeStr = strings.TrimSpace(timeStr)
+	if timeStr == "" {
+		*t = LocalTime(time.Time{})
+		return nil
+	}
+
+	layouts := []string{
+		time.RFC3339Nano, time.RFC3339,
+		"2006-01-02 15:04:05.0000000-07:00", "2006-01-02 15:04:05-07:00",
+		"2006-01-02 15:04:05.0000000", "2006-01-02 15:04:05", "2006-01-02",
+	}
+
+	for _, layout := range layouts {
+		if parsedTime, err := time.ParseInLocation(layout, timeStr, loc); err == nil {
+			*t = LocalTime(parsedTime)
+			return nil
+		}
+	}
+	return fmt.Errorf("unable to parse time string '%s' into UTCTime", timeStr)
+}
+
+// MarshalJSON implements the json.Marshaler interface.
+// Serializes UTCTime to JSON in RFC3339 format with the correct timezone offset.
+func (t LocalTime) MarshalJSON() ([]byte, error) {
+	if time.Time(t).IsZero() {
+		return []byte("null"), nil
+	}
+	formattedTime := time.Time(t).In(GetAppLocation()).Format(time.RFC3339)
+	return []byte(fmt.Sprintf(`"%s"`, formattedTime)), nil
+}
+
+// ToTime converts UTCTime to Go's native time.Time type.
+func (t LocalTime) ToTime() time.Time { return time.Time(t) }
+
+// FromTime converts Go's native time.Time type to UTCTime.
+func FromTime(t time.Time) LocalTime { return LocalTime(t) }
+
+// Now returns the current time in the application's configured location.
+func Now() LocalTime { return LocalTime(time.Now().In(GetAppLocation())) }
+
+var (
+	appLocation  *time.Location
+	locationOnce sync.Once
+)
+
+// GetAppLocation retrieves the application's global timezone from the "TZ" environment variable.
+func GetAppLocation() *time.Location {
+	locationOnce.Do(func() {
+		tz := os.Getenv("TZ")
+		if tz == "" {
+			tz = "UTC"
+		}
+		loc, err := time.LoadLocation(tz)
+		if err != nil {
+			log.Printf("Warning: Failed to load timezone '%s', falling back to UTC. Error: %v", tz, err)
+			appLocation = time.UTC
+		} else {
+			appLocation = loc
+		}
+		time.Local = appLocation
+		log.Printf("Application timezone is set to '%s'.", appLocation.String())
+	})
+	return appLocation
+}

database/models/clipboard.go

@@ -1,7 +1,7 @@
 package models
 
 type Clipboard struct {
-	Id        int       `json:"id" gorm:"primaryKey;autoIncrement"`
+	Id        int       `json:"id" gorm:"primaryKey;autoIncrement;unique"`
 	Text      string    `json:"text" gorm:"type:longtext"`
 	Name      string    `json:"name" gorm:"type:varchar(255)"`
 	Weight    int       `json:"weight" gorm:"type:int"`

database/models/config.go

@@ -0,0 +1,42 @@
+package models
+
+type Config struct {
+	ID                uint   `json:"id,omitempty" gorm:"primaryKey;autoIncrement"` // 1
+	Sitename          string `json:"sitename" gorm:"type:varchar(100);not null"`
+	Description       string `json:"description" gorm:"type:text"`
+	AllowCors         bool   `json:"allow_cors" gorm:"column:allow_cors;default:false"`
+	Theme             string `json:"theme" gorm:"type:varchar(100);default:'default'"` // 主题名称，默认 'default'
+	PrivateSite       bool   `json:"private_site" gorm:"default:false"`                // 是否为私有站点，默认 false
+	ApiKey            string `json:"api_key" gorm:"type:varchar(255);default:''"`
+	AutoDiscoveryKey  string `json:"auto_discovery_key" gorm:"type:varchar(255);default:''"` // 自动发现密钥
+	ScriptDomain      string `json:"script_domain" gorm:"type:varchar(255);default:''"`      // 自定义脚本域名
+	SendIpAddrToGuest bool   `json:"send_ip_addr_to_guest" gorm:"default:false"`             // 是否向访客页面发送 IP 地址，默认 false
+	EulaAccepted      bool   `json:"eula_accepted" gorm:"default:false"`
+	// GeoIP 配置
+	GeoIpEnabled  bool   `json:"geo_ip_enabled" gorm:"default:true"`
+	GeoIpProvider string `json:"geo_ip_provider" gorm:"type:varchar(20);default:'ip-api'"` // empty, mmdb, ip-api, geojs
+	// Nezha 兼容（Agent gRPC）
+	NezhaCompatEnabled bool   `json:"nezha_compat_enabled" gorm:"default:false"`
+	NezhaCompatListen  string `json:"nezha_compat_listen" gorm:"type:varchar(100);default:''"` // 例如 0.0.0.0:5555
+	// OAuth 配置
+	OAuthEnabled         bool   `json:"o_auth_enabled" gorm:"default:false"`
+	OAuthProvider        string `json:"o_auth_provider" gorm:"type:varchar(50);default:'github'"`
+	DisablePasswordLogin bool   `json:"disable_password_login" gorm:"default:false"`
+	// 自定义美化
+	CustomHead string `json:"custom_head" gorm:"type:longtext"`
+	CustomBody string `json:"custom_body" gorm:"type:longtext"`
+	// 通知
+	NotificationEnabled        bool    `json:"notification_enabled" gorm:"default:false"` // 通知总开关
+	NotificationMethod         string  `json:"notification_method" gorm:"type:varchar(64);default:'none'"`
+	NotificationTemplate       string  `json:"notification_template" gorm:"type:longtext;default:'{{emoji}}{{emoji}}{{emoji}}\nEvent: {{event}}\nClients: {{client}}\nMessage: {{message}}\nTime: {{time}}'"`
+	ExpireNotificationEnabled  bool    `json:"expire_notification_enabled" gorm:"default:false"` // 是否启用过期通知
+	ExpireNotificationLeadDays int     `json:"expire_notification_lead_days" gorm:"default:7"`   // 过期前多少天通知，默认7天
+	LoginNotification          bool    `json:"login_notification" gorm:"default:false"`          // 登录通知
+	TrafficLimitPercentage     float64 `json:"traffic_limit_percentage" gorm:"default:80.00"`    // 流量限制百分比，默认80.00%
+	// Record
+	RecordEnabled          bool `json:"record_enabled" gorm:"default:true"`          // 是否启用记录功能
+	RecordPreserveTime     int  `json:"record_preserve_time" gorm:"default:720"`     // 记录保留时间，单位小时，默认30天
+	PingRecordPreserveTime int  `json:"ping_record_preserve_time" gorm:"default:24"` // Ping 记录保留时间，单位小时，默认1天
+	CreatedAt              LocalTime
+	UpdatedAt              LocalTime
+}

database/models/messageSender.go

@@ -3,7 +3,7 @@ package models
 import "time"
 
 type MessageSenderProvider struct {
-	Name     string `json:"name" gorm:"primaryKey;type:varchar(100);not null"`
+	Name     string `json:"name" gorm:"primaryKey;unique;not null"`
 	Addition string `json:"addition" gorm:"type:longtext" default:"{}"`
 }
 

database/models/models.go

@@ -57,8 +57,8 @@ type User struct {
 
 // Session manages user sessions
 type Session struct {
-	UUID            string    `json:"uuid" gorm:"type:varchar(36);index"`
-	Session         string    `json:"session" gorm:"type:varchar(255);primaryKey;not null"`
+	UUID            string    `json:"uuid" gorm:"type:varchar(36)"`
+	Session         string    `json:"session" gorm:"type:varchar(255);primaryKey;uniqueIndex:idx_sessions_session;not null"`
 	UserAgent       string    `json:"user_agent" gorm:"type:text"`
 	Ip              string    `json:"ip" gorm:"type:varchar(100)"`
 	LoginMethod     string    `json:"login_method" gorm:"type:varchar(50)"`
@@ -95,14 +95,14 @@ type Record struct {
 
 // GPURecord logs individual GPU metrics over time
 type GPURecord struct {
-	Client      string    `json:"client" gorm:"type:varchar(36);index"` // 客户端UUID
-	Time        LocalTime `json:"time" gorm:"index"`                    // 记录时间
-	DeviceIndex int       `json:"device_index" gorm:"index"`            // GPU设备索引 (0,1,2...)
-	DeviceName  string    `json:"device_name" gorm:"type:varchar(100)"` // GPU型号
-	MemTotal    int64     `json:"mem_total" gorm:"type:bigint"`         // 显存总量(字节)
-	MemUsed     int64     `json:"mem_used" gorm:"type:bigint"`          // 显存使用(字节)
-	Utilization float32   `json:"utilization" gorm:"type:decimal(5,2)"` // GPU使用率(%)
-	Temperature int       `json:"temperature"`                          // GPU温度(°C)
+	Client      string    `json:"client" gorm:"type:varchar(36);index"`           // 客户端UUID
+	Time        LocalTime `json:"time" gorm:"index"`                              // 记录时间
+	DeviceIndex int       `json:"device_index" gorm:"index"`                      // GPU设备索引 (0,1,2...)
+	DeviceName  string    `json:"device_name" gorm:"type:varchar(100)"`           // GPU型号
+	MemTotal    int64     `json:"mem_total" gorm:"type:bigint"`                   // 显存总量(字节)
+	MemUsed     int64     `json:"mem_used" gorm:"type:bigint"`                    // 显存使用(字节)
+	Utilization float32   `json:"utilization" gorm:"type:decimal(5,2)"`           // GPU使用率(%)
+	Temperature int       `json:"temperature"`                                    // GPU温度(°C)
 }
 
 // StringArray represents a slice of strings stored as JSON in the database

database/models/oauth.go

@@ -1,6 +1,6 @@
 package models
 
 type OidcProvider struct {
-	Name     string `json:"name" gorm:"primaryKey;type:varchar(100);not null"`
+	Name     string `json:"name" gorm:"primaryKey;unique;not null"`
 	Addition string `json:"addition" gorm:"type:longtext" default:"{}"`
 }

database/models/pingTask.go

@@ -11,6 +11,7 @@ type PingRecord struct {
 
 type PingTask struct {
 	Id       uint        `json:"id,omitempty" gorm:"primaryKey;autoIncrement"`
+	Weight   int         `json:"weight" gorm:"type:int;not null;default:0;index"`
 	Name     string      `json:"name" gorm:"type:varchar(255);not null;index"`
 	Clients  StringArray `json:"clients" gorm:"type:longtext"`
 	Type     string      `json:"type" gorm:"type:varchar(12);not null;default:'icmp'"` // icmp tcp http

database/models/task.go

@@ -1,7 +1,7 @@
 package models
 
 type Task struct {
-	TaskId  string       `json:"task_id" gorm:"type:varchar(36);primaryKey"`
+	TaskId  string       `json:"task_id" gorm:"type:varchar(36);primaryKey;unique"`
 	Clients StringArray  `json:"clients" gorm:"type:longtext"`
 	Command string       `json:"command" gorm:"type:text"`
 	Results []TaskResult `gorm:"foreignKey:TaskId;references:TaskId;constraint:OnDelete:CASCADE,OnUpdate:CASCADE"`

database/models/theme.go

@@ -15,21 +15,21 @@ type Theme struct {
 type Configuration struct {
 	Type string `json:"type"` // managed
 	Icon string `json:"icon"` // 图标
-	Name string `json:"name"`
+	Name any    `json:"name"`
 	Data any    `json:"data"` // 配置数据
 }
 
 type ManagedThemeConfigurationItem struct {
 	Key      string `json:"key"`
-	Name     string `json:"name"`
+	Name     any    `json:"name"`
 	Required bool   `json:"required"`
 	Type     string `json:"type"` // string number select switch title
 	Options  string `json:"options"`
 	Default  any    `json:"default"`
-	Help     string `json:"help"`
+	Help     any    `json:"help"`
 }
 
 type ThemeConfiguration struct {
-	Short string `json:"short" gorm:"primaryKey;type:varchar(100);not null"`
+	Short string `json:"short" gorm:"primaryKey;unique;not null"`
 	Data  string `json:"data" gorm:"type:longtext" default:"{}"`
 }

database/notification/load.go

@@ -1,9 +1,9 @@
 package notification
 
 import (
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
-	"github.com/komari-monitor/komari/internal/notifier"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/utils/notifier"
 	"gorm.io/gorm"
 )
 
@@ -59,5 +59,10 @@ func SaveLoadNotification(record models.LoadNotification) error {
 }
 
 func ReloadLoadNotificationSchedule() error {
-	return notifier.ReloadLoadNotification()
+	db := dbcore.GetDBInstance()
+	var loadNotifications []models.LoadNotification
+	if err := db.Find(&loadNotifications).Error; err != nil {
+		return err
+	}
+	return notifier.ReloadLoadNotificationSchedule(loadNotifications)
 }

database/oauth.go

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

database/records/records.go

@@ -8,8 +8,9 @@ import (
 
 	"gorm.io/gorm"
 
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"github.com/komari-monitor/komari/cmd/flags"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
 )
 
 func RecordOne(rec models.Record) error {
@@ -170,6 +171,14 @@ func CompactRecord() error {
 		log.Printf("Error migrating GPU records: %v", err)
 		return err
 	}
+
+	if flags.DatabaseType == "sqlite" {
+		if err := db.Exec("VACUUM").Error; err != nil {
+			log.Printf("Error vacuuming database: %v", err)
+		}
+		db.Exec("PRAGMA wal_checkpoint(TRUNCATE);")
+	}
+	//log.Printf("Record compaction completed")
 	return nil
 }
 

database/records/records_test.go

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

database/tasks/ping.go

@@ -3,9 +3,9 @@ package tasks
 import (
 	"time"
 
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
-	"github.com/komari-monitor/komari/internal/pingSchedule"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/utils"
 	"gorm.io/gorm"
 )
 
@@ -18,7 +18,23 @@ func AddPingTask(clients []string, name string, target, task_type string, interv
 		Target:   target,
 		Interval: interval,
 	}
-	if err := db.Create(&task).Error; err != nil {
+	err := db.Transaction(func(tx *gorm.DB) error {
+		if err := tx.Create(&task).Error; err != nil {
+			return err
+		}
+
+		// Append by id to avoid races between concurrent create requests.
+		result := tx.Model(&models.PingTask{}).Where("id = ?", task.Id).Update("weight", int(task.Id))
+		if result.Error != nil {
+			return result.Error
+		}
+		if result.RowsAffected == 0 {
+			return gorm.ErrRecordNotFound
+		}
+
+		return nil
+	})
+	if err != nil {
 		return 0, err
 	}
 	ReloadPingSchedule()
@@ -50,12 +66,42 @@ func EditPingTask(tasks []*models.PingTask) error {
 func GetAllPingTasks() ([]models.PingTask, error) {
 	db := dbcore.GetDBInstance()
 	var tasks []models.PingTask
-	if err := db.Find(&tasks).Error; err != nil {
+	if err := db.Order("weight ASC").Order("id ASC").Find(&tasks).Error; err != nil {
 		return nil, err
 	}
 	return tasks, nil
 }
 
+func GetPingTasksByClient(uuid string) []models.PingTask {
+	db := dbcore.GetDBInstance()
+	var tasks []models.PingTask
+	if err := db.Where("clients LIKE ?", `%"`+uuid+`"%`).Find(&tasks).Error; err != nil {
+		return nil
+	}
+	return tasks
+}
+
+func UpdatePingTaskOrder(order map[uint]int) error {
+	db := dbcore.GetDBInstance()
+	err := db.Transaction(func(tx *gorm.DB) error {
+		for id, weight := range order {
+			result := tx.Model(&models.PingTask{}).Where("id = ?", id).Update("weight", weight)
+			if result.Error != nil {
+				return result.Error
+			}
+			if result.RowsAffected == 0 {
+				return gorm.ErrRecordNotFound
+			}
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+	ReloadPingSchedule()
+	return nil
+}
+
 func SavePingRecord(record models.PingRecord) error {
 	db := dbcore.GetDBInstance()
 	return db.Create(&record).Error
@@ -84,9 +130,13 @@ func DeleteAllPingRecords() error {
 	}
 	return result.Error
 }
-
 func ReloadPingSchedule() error {
-	return pingSchedule.ReloadPingSchedule()
+	db := dbcore.GetDBInstance()
+	var pingTasks []models.PingTask
+	if err := db.Find(&pingTasks).Error; err != nil {
+		return err
+	}
+	return utils.ReloadPingSchedule(pingTasks)
 }
 
 func GetPingRecords(uuid string, taskId int, start, end time.Time) ([]models.PingRecord, error) {

database/tasks/tasks.go

@@ -3,10 +3,8 @@ package tasks
 import (
 	"time"
 
-	"github.com/gookit/event"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
-	"github.com/komari-monitor/komari/internal/eventType"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
 )
 
 func CreateTask(taskId string, clients []string, command string) error {
@@ -34,11 +32,6 @@ func CreateTask(taskId string, clients []string, command string) error {
 	if len(taskResults) > 0 {
 		return db.Create(&taskResults).Error
 	}
-	event.Trigger(eventType.TaskCreated, event.M{
-		"task":    taskId,
-		"clients": clients,
-		"command": command,
-	})
 	return nil
 }
 func GetTaskByTaskId(taskId string) (*models.Task, error) {

database/utils.go

@@ -8,16 +8,60 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/internal/conf"
-	"github.com/komari-monitor/komari/internal/database/models"
-	"github.com/komari-monitor/komari/internal/dbcore"
+	"github.com/komari-monitor/komari/config"
+	"github.com/komari-monitor/komari/database/dbcore"
+	"github.com/komari-monitor/komari/database/models"
 )
 
-func GetPublicInfo() (any, error) {
-	cst, err := conf.GetWithV1Format()
+func GetPublicInfo() (map[string]interface{}, error) {
+	cstPtr, err := config.GetManyAs[config.Legacy]()
 	if err != nil {
 		return nil, err
 	}
+	cst := *cstPtr
+
+	all, allErr := config.GetAll()
+	hasKey := func(k string) bool {
+		if allErr != nil {
+			return false
+		}
+		_, ok := all[k]
+		return ok
+	}
+
+	// Apply defaults only when a key is missing.
+	if !hasKey("sitename") {
+		cst.Sitename = "Komari"
+	}
+	if !hasKey("description") {
+		cst.Description = "Komari Monitor, a simple server monitoring tool."
+	}
+	if !hasKey("theme") {
+		cst.Theme = "default"
+	}
+	if !hasKey("o_auth_provider") {
+		cst.OAuthProvider = "github"
+	}
+	if !hasKey("record_enabled") {
+		cst.RecordEnabled = true
+	}
+	if !hasKey("record_preserve_time") {
+		cst.RecordPreserveTime = 720
+	}
+	if !hasKey("ping_record_preserve_time") {
+		cst.PingRecordPreserveTime = 24
+	}
+
+	// Fallback defaults if we couldn't enumerate keys.
+	if allErr != nil {
+		if cst.Sitename == "" {
+			cst.Sitename = "Komari"
+		}
+		if cst.Description == "" {
+			cst.Description = "Komari Monitor, a simple server monitoring tool."
+		}
+	}
+
 	db := dbcore.GetDBInstance()
 	tc := models.ThemeConfiguration{}
 	err = db.Model(&models.ThemeConfiguration{}).Where("short = ?", cst.Theme).First(&tc).Error

docs/README_ja.md

@@ -4,15 +4,15 @@
 
 ![komari](https://socialify.git.ci/komari-monitor/komari/image?description=1&font=Inter&forks=1&issues=1&language=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2Fkomari-monitor%2Fkomari-web%2Fd54ce1288df41ead08aa19f8700186e68028a889%2Fpublic%2Ffavicon.png&name=1&owner=1&pattern=Plus&pulls=1&stargazers=1&theme=Auto)
 
-Komari は、サーバーのパフォーマンスを監視するためのシンプルで効率的なソリューションを提供することを目的とした、軽量の自己ホスト型サーバー監視ツールです。Web インターフェースを介してサーバーのステータスを表示し、軽量エージェントを介してデータを収集します。
+Komariは、サーバーのパフォーマンスを監視するためのシンプルで効率的なソリューションを提供することを目的とした、軽量の自己ホスト型サーバー監視ツールです。Webインターフェースを介してサーバーのステータスを表示し、軽量エージェントを介してデータを収集します。
 
-[ドキュメント](https://komari-document.pages.dev/) | [Telegram グループ](https://t.me/komari_monitor)
+[ドキュメント](https://komari-document.pages.dev/) | [Telegramグループ](https://t.me/komari_monitor)
 
 ## 特徴
 
 - **軽量で効率的**: リソース消費が少なく、あらゆる規模のサーバーに適しています。
 - **自己ホスト型**: データプライバシーを完全に制御でき、展開も簡単です。
-- **Web インターフェース**: 直感的な監視ダッシュボードで、使いやすいです。
+- **Webインターフェース**: 直感的な監視ダッシュボードで、使いやすいです。
 
 ## クイックスタート
 
@@ -22,9 +22,13 @@ Komari は、サーバーのパフォーマンスを監視するためのシン
 
 [![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_)
 
+- 1Panel アプリストア
+
+1Panel アプリストアで利用可能です。「アプリストア」>「ユーティリティ」>「Komari」からインストールしてください。
+
 ### 1. ワンクリックインストールスクリプトを使用する
 
-systemd を使用するディストリビューション（Ubuntu、Debian など）に適しています。
+systemdを使用するディストリビューション（Ubuntu、Debianなど）に適しています。
 
 ```bash
 curl -fsSL https://raw.githubusercontent.com/komari-monitor/komari/main/install-komari.sh -o install-komari.sh
@@ -32,13 +36,13 @@ chmod +x install-komari.sh
 sudo ./install-komari.sh
 ```
 
-### 2. Docker 展開
+### 2. Docker展開
 
 1. データディレクトリを作成します:
    ```bash
    mkdir -p ./data
    ```
-2. Docker コンテナを実行します:
+2. Dockerコンテナを実行します:
    ```bash
    docker run -d \
      -p 25774:25774 \
@@ -57,8 +61,8 @@ sudo ./install-komari.sh
 
 ### 3. バイナリファイル展開
 
-1. Komari の[GitHub リリース](https://github.com/komari-monitor/komari/releases)ページにアクセスして、お使いのオペレーティングシステム用の最新のバイナリをダウンロードします。
-2. Komari を実行します:
+1. Komariの[GitHubリリース](https://github.com/komari-monitor/komari/releases)ページにアクセスして、お使いのオペレーティングシステム用の最新のバイナリをダウンロードします。
+2. Komariを実行します:
    ```bash
    ./komari server -l 0.0.0.0:25774
    ```
@@ -72,7 +76,7 @@ sudo ./install-komari.sh
 
 #### 依存関係
 
-- Go 1.24+ および Node.js 20+（手動ビルド用）
+- Go 1.18+ および Node.js 20+（手動ビルド用）
 
 1. フロントエンドの静的ファイルをビルドします:
    ```bash
@@ -86,7 +90,7 @@ sudo ./install-komari.sh
    git clone https://github.com/komari-monitor/komari
    cd komari
    ```
-   ステップ 1 で生成された静的ファイルを `komari` プロジェクトのルートにある `/public/dist` フォルダにコピーします。
+   ステップ1で生成された静的ファイルを `komari` プロジェクトのルートにある `/public/defaultTheme/dist` フォルダにコピーし、`komari-theme.json` と `preview.png`/`perview.png` を `/public/defaultTheme` にコピーします。
    ```bash
    go build -o komari
    ```
@@ -98,20 +102,24 @@ sudo ./install-komari.sh
 
 ## フロントエンド開発ガイド
 
-[Komari テーマ開発ガイド | Komari](https://komari-document.pages.dev/dev/theme.html)
+[Komariテーマ開発ガイド | Komari](https://komari-document.pages.dev/dev/theme.html)
 
-[Crowdin で Komari を翻訳する](https://crowdin.com/project/komari/invite?h=cd051bf172c9a9f7f1360e87ffb521692507706)
+[CrowdinでKomariを翻訳する](https://crowdin.com/project/komari/invite?h=cd051bf172c9a9f7f1360e87ffb521692507706)
 
 ## クライアントエージェント開発ガイド
 
-[Komari エージェント情報レポートおよびイベント処理ドキュメント](https://komari-document.pages.dev/dev/agent.html)
+[Komariエージェント情報レポートおよびイベント処理ドキュメント](https://komari-document.pages.dev/dev/agent.html)
 
 ## 貢献
 
-Issue や Pull Request を歓迎します！
+IssueやPull Requestを歓迎します！
 
 ## 謝辞
 
+### 破碎工坊云 (Crash Work)
+
+[破碎工坊云 - 効率的で安定した、安全な高防御サーバーとCDNソリューションを提供する専門的なクラウドコンピューティングプラットフォーム](https://www.crash.work/)
+
 ### DreamCloud
 
 [DreamCloud - コストパフォーマンスに優れたアジア太平洋向け高防御直通](https://as211392.com/)
@@ -130,6 +138,6 @@ PR を送ってくれた方、テーマを作成してくれた全ての開発
 
 —— そして：こんなに暇でいられる自分に感謝
 
-## Star 履歴
+## Star履歴
 
 [![Star History Chart](https://api.star-history.com/svg?repos=komari-monitor/komari&type=Date)](https://www.star-history.com/#komari-monitor/komari&Date)

docs/README_zh-TW.md

@@ -22,6 +22,10 @@ Komari 是一款輕量級的自託管伺服器監控工具，旨在提供簡單
 
 [![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_)
 
+- 1Panel 應用商店
+
+已上架 1Panel 應用商店，應用商店-實用工具-Komari 即可安裝
+
 ### 1. 使用一鍵安裝腳本
 
 適用於使用了 systemd 的發行版（Ubuntu、Debian...）。
@@ -72,7 +76,7 @@ sudo ./install-komari.sh
 
 #### 依賴
 
-- Go 1.24+ 和 Node.js 20+（手工建置）
+- Go 1.18+ 和 Node.js 20+（手工建置）
 
 1. 建置前端靜態檔案：
    ```bash
@@ -86,7 +90,7 @@ sudo ./install-komari.sh
    git clone https://github.com/komari-monitor/komari
    cd komari
    ```
-   將步驟 1 中產生的靜態檔案複製到 `komari` 專案根目錄下的 `/public/dist` 資料夾。
+   將步驟1中產生的靜態檔案複製到 `komari` 專案根目錄下的 `/public/defaultTheme/dist` 資料夾，並將 `komari-theme.json` 與 `preview.png`/`perview.png` 複製到 `/public/defaultTheme`。
    ```bash
    go build -o komari
    ```
@@ -112,6 +116,10 @@ sudo ./install-komari.sh
 
 ## 鳴謝
 
+### 破碎工坊雲
+
+[破碎工坊雲 - 專業雲計算服務平台，提供高效、穩定、安全的高防伺服器與CDN解決方案](https://www.crash.work/)
+
 ### DreamCloud
 
 [DreamCloud - 極高性價比解鎖直連亞太高防](https://as211392.com/)

docs/README_zh.md

@@ -22,6 +22,10 @@ Komari 是一款轻量级的自托管服务器监控工具，旨在提供简单
 
 [![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_)
 
+- 1Panel 应用商店
+
+已上架1Panel应用商店，应用商店-实用工具-Komari 即可安装
+
 ### 1. 使用一键安装脚本
 
 适用于使用了 systemd 的发行版（Ubuntu、Debian...）。
@@ -72,7 +76,7 @@ sudo ./install-komari.sh
 
 #### 依赖
 
-- Go 1.24+ 和 Node.js 20+（手工构建）
+- Go 1.18+ 和 Node.js 20+（手工构建）
 
 1. 构建前端静态文件：
    ```bash
@@ -86,7 +90,7 @@ sudo ./install-komari.sh
    git clone https://github.com/komari-monitor/komari
    cd komari
    ```
-   将步骤 1 中生成的静态文件复制到 `komari` 项目根目录下的 `/public/dist` 文件夹。
+   将步骤1中生成的静态文件复制到 `komari` 项目根目录下的 `/public/defaultTheme/dist` 文件夹，并将 `komari-theme.json` 与 `preview.png`/`perview.png` 复制到 `/public/defaultTheme`。
    ```bash
    go build -o komari
    ```
@@ -112,6 +116,10 @@ sudo ./install-komari.sh
 
 ## 鸣谢
 
+### 破碎工坊云
+
+[破碎工坊云 - 专业云计算服务平台，提供高效、稳定、安全的高防服务器与CDN解决方案](https://www.crash.work/)
+
 ### DreamCloud
 
 [DreamCloud - 极高性价比解锁直连亚太高防](https://as211392.com/)

go.mod

@@ -10,19 +10,19 @@ require (
 	github.com/dop251/goja_nodejs v0.0.0-20251015164255-5e94316bedaf
 	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.6.0
-	github.com/gookit/event v1.2.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/oschwald/maxminddb-golang v1.13.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pquerna/otp v1.5.0
 	github.com/spf13/cobra v1.9.1
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/image v0.33.0
+	golang.org/x/image v0.35.0
 	google.golang.org/grpc v1.75.0
 	google.golang.org/protobuf v1.36.6
 	gorm.io/driver/mysql v1.5.7
 	gorm.io/driver/sqlite v1.5.7
 	gorm.io/gorm v1.26.1
+
 )
 
 // Misuse of ServerConfig.PublicKeyCallback may cause authorization bypass in golang.org/x/crypto #1
@@ -51,7 +51,6 @@ require (
 	github.com/go-sql-driver/mysql v1.9.2 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
-	github.com/gookit/goutil v0.7.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
@@ -72,7 +71,7 @@ require (
 	golang.org/x/arch v0.15.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -61,10 +61,6 @@ github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQu
 github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gookit/event v1.2.0 h1:aa8ouNVlo4E/NRhHVXNU/JbWvlr91Gjh423WtCDYQ4Q=
-github.com/gookit/event v1.2.0/go.mod h1:gGYybJL0HEEo/+UmBN+MgLqUBIxcCGOP8FrLPk+J8w4=
-github.com/gookit/goutil v0.7.1 h1:AaFJPN9mrdeYBv8HOybri26EHGCC34WJVT7jUStGJsI=
-github.com/gookit/goutil v0.7.1/go.mod h1:vJS9HXctYTCLtCsZot5L5xF+O1oR17cDYO9R0HxBmnU=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -148,8 +144,8 @@ golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw=
 golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
 golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
 golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
-golang.org/x/image v0.33.0 h1:LXRZRnv1+zGd5XBUVRFmYEphyyKJjQjCRiOuAP3sZfQ=
-golang.org/x/image v0.33.0/go.mod h1:DD3OsTYT9chzuzTQt+zMcOlBHgfoKQb1gry8p76Y1sc=
+golang.org/x/image v0.35.0 h1:LKjiHdgMtO8z7Fh18nGY6KDcoEtVfsgLDPeLyguqb7I=
+golang.org/x/image v0.35.0/go.mod h1:MwPLTVgvxSASsxdLzKrl8BRFuyqMyGhLwmC+TO1Sybk=
 golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
 golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
@@ -157,10 +153,8 @@ golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKl
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
+golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 h1:pFyd6EwwL2TqFf8emdthzeX+gZE1ElRq3iM8pui4KBY=