Merge pull request #431 from komari-monitor/dev

refactor: 生命周期管理

.github/workflows/build.yml

@@ -1,9 +1,13 @@
-name: Build Binaries on Main Push
+name: Build Binaries on Main Push and PR
 
 on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build-binaries:
@@ -97,10 +101,10 @@ jobs:
           fi
           VERSION="${{ github.sha }}"
           VERSION_HASH="${{ github.sha }}"
-          go build -trimpath -ldflags="-s -w -X github.com/komari-monitor/komari/utils.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/utils.VersionHash=${VERSION_HASH}" -o $BINARY_NAME
+          go build -trimpath -ldflags="-s -w -X github.com/komari-monitor/komari/internal/conf.Version=${VERSION} -X github.com/komari-monitor/komari/internal/conf.CommitHash=${VERSION_HASH}" -o $BINARY_NAME
 
       - name: Upload binary as artifact
         uses: actions/upload-artifact@v4
         with:
           name: komari-${{ matrix.goos }}-${{ matrix.goarch }}
-          path: komari-${{ matrix.goos }}-${{ matrix.goarch }}*
+          path: komari-${{ matrix.goos }}-${{ matrix.goarch }}*

.github/workflows/cleanup-packages.yml

@@ -1,8 +1,9 @@
 name: Cleanup Old Packages
 
 on:
-  schedule:
-    - cron: '0 0 * * 0'  # Run every Sunday at midnight
+  #schedule:
+  #  - cron: '0 0 * * 0'  # Run every Sunday at midnight
+  # 会清理掉正常的镜像
   workflow_dispatch:      # Allow manual trigger
 
 jobs:
@@ -57,4 +58,4 @@ jobs:
                 package_version_id: version.id
               });
               console.log(`Deleted package version ${version.id} with tags: ${version.metadata.container.tags.join(', ') || 'none'}`);
-            }
+            }

.github/workflows/development.yml

@@ -1,9 +1,9 @@
 name: Development Environment
 
 on:
-  push:
-    branches:
-      - dev
+  # push:
+  #   branches:
+  #     - dev
   workflow_dispatch:
 
 jobs:
@@ -12,13 +12,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4      
-      
+        uses: actions/checkout@v4
+
       #- 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
-      
+
       - name: Clone and build frontend
         run: |
           git clone https://github.com/komari-monitor/komari-web web
@@ -40,7 +40,7 @@ jobs:
           GOARCH: amd64
         run: |
           VERSION_SHA="${{ github.sha }}"
-          go build -ldflags "-X github.com/komari-monitor/komari/utils.CurrentVersion=dev -X github.com/komari-monitor/komari/utils.VersionHash=${VERSION_SHA}" -o komari .
+          go build -ldflags "-X github.com/komari-monitor/komari/internal/conf.Version=dev -X github.com/komari-monitor/komari/internal/conf.CommitHash=${VERSION_SHA}" -o komari .
 
       - name: Upload binary as artifact
         uses: actions/upload-artifact@v4

.github/workflows/docker-publish.yml

@@ -1,9 +1,9 @@
 name: Publish Docker Image on Main
 
 on:
-  push:
-    branches:
-      - main
+  #push:
+  #  branches:
+  #    - main
   workflow_dispatch:
 
 env:
@@ -55,7 +55,7 @@ jobs:
         run: |
           VERSION="${{ github.ref_name }}"
           VERSION_HASH="${{ github.sha }}"
-          LDFLAGS="-s -w -X github.com/komari-monitor/komari/utils.CurrentVersion=${VERSION} -X github.com/komari-monitor/komari/utils.VersionHash=${VERSION_HASH}"
+          LDFLAGS="-s -w -X github.com/komari-monitor/komari/internal/conf.Version=${VERSION} -X github.com/komari-monitor/komari/internal/conf.CommitHash=${VERSION_HASH}"
 
           echo "Building for linux/amd64..."
           GOARCH=amd64 CC="zig cc -target x86_64-linux-musl" go build -trimpath -ldflags="$LDFLAGS" -o komari-linux-amd64

.github/workflows/release-docker.yml

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

.github/workflows/release.yml

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

.gitignore

@@ -14,6 +14,7 @@ komari.db
 /data
 /utils/geoip/data
 .vscode/
+/backup
 
 # Test binary, built with `go test -c`
 *.test
@@ -30,3 +31,6 @@ go.work.sum
 
 # env file
 .env
+
+# build
+komari

NOTICE

@@ -0,0 +1,27 @@
+CoreOS Project
+Copyright 2014 CoreOS, Inc
+
+This product includes software developed at CoreOS, Inc.
+(http://www.coreos.com/).
+
+
+otp
+Copyright (c) 2014, Paul Querna
+
+This product includes software developed by 
+Paul Querna (http://paul.querna.org/).
+
+
+Copyright 2014 gRPC authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README.md

@@ -1,6 +1,7 @@
+# Komari
 
-# Komari 
 ![Badge](https://hitscounter.dev/api/hit?url=https%3A%2F%2Fgithub.com%2Fkomari-monitor%2Fkomari&label=&icon=github&color=%23a370f7&message=&style=flat&tz=UTC)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/komari-monitor/komari)
 
 ![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)
 
@@ -8,9 +9,10 @@
 
 Komari is a lightweight, self-hosted server monitoring tool designed to provide a simple and efficient solution for monitoring server performance. It supports viewing server status through a web interface and collects data through a lightweight agent.
 
-[Documentation](https://komari-document.pages.dev/) | [Telegram Group](https://t.me/komari_monitor)
+[Documentation](https://komari-document.pages.dev/) | [文档(镜像站 By Geekertao)](https://www.komari.wiki) | [Telegram Group](https://t.me/komari_monitor)
 
 ## Features
+
 - **Lightweight and Efficient**: Low resource consumption, suitable for servers of all sizes.
 - **Self-hosted**: Complete control over data privacy, easy to deploy.
 - **Web Interface**: Intuitive monitoring dashboard, easy to use.
@@ -18,16 +20,15 @@ Komari is a lightweight, self-hosted server monitoring tool designed to provide
 ## Quick Start
 
 ### 0. One-click Deployment with Cloud Hosting
-- Rainyun - CNY 4.5/month 
 
-[![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_) 
+- Rainyun - CNY 4.5/month
 
-- Claw Run - USD 1.5/month
-
-[![](https://raw.githubusercontent.com/ClawCloud/Run-Template/refs/heads/main/Run-on-ClawCloud.svg)](https://template.run.claw.cloud/?openapp=system-fastdeploy%3FtemplateName%3Dkomari)
+[![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_)
 
 ### 1. Use the One-click Install Script
+
 Suitable for distributions using systemd (Ubuntu, Debian...).
+
 ```bash
 curl -fsSL https://raw.githubusercontent.com/komari-monitor/komari/main/install-komari.sh -o install-komari.sh
 chmod +x install-komari.sh
@@ -35,6 +36,7 @@ sudo ./install-komari.sh
 ```
 
 ### 2. Docker Deployment
+
 1. Create a data directory:
    ```bash
    mkdir -p ./data
@@ -57,6 +59,7 @@ sudo ./install-komari.sh
 > You can also customize the initial username and password through the environment variables `ADMIN_USERNAME` and `ADMIN_PASSWORD`.
 
 ### 3. Binary File Deployment
+
 1. Visit Komari's [GitHub Release page](https://github.com/komari-monitor/komari/releases) to download the latest binary for your operating system.
 2. Run Komari:
    ```bash
@@ -68,12 +71,11 @@ sudo ./install-komari.sh
 > [!NOTE]
 > Ensure the binary has execute permissions (`chmod +x komari`). Data will be saved in the `data` folder in the running directory.
 
-
 ### Manual Build
 
 #### Dependencies
 
-- Go 1.18+ and Node.js 20+ (for manual build)
+- Go 1.24+ and Node.js 20+ (for manual build)
 
 1. Build the frontend static files:
    ```bash
@@ -88,32 +90,45 @@ sudo ./install-komari.sh
    cd komari
    ```
    Copy the static files generated in step 1 to the `/public/dist` folder in the root of the `komari` project.
-   ```bash 
+   ```bash
    go build -o komari
    ```
-4. Run:
+3. Run:
    ```bash
    ./komari server -l 0.0.0.0:25774
    ```
    The default listening port is `25774`. Access `http://localhost:25774`.
 
 ## Frontend Development Guide
+
 [Komari Theme Development Guide | Komari](https://komari-document.pages.dev/dev/theme.html)
 
-[Translate Komari on Crowdin](https://crowdin.com/project/komari/invite?h=cd051bf172c9a9f7f1360e87ffb521692507706)
-
 ## Client Agent Development Guide
+
 [Komari Agent Information Reporting and Event Handling Documentation](https://komari-document.pages.dev/dev/agent.html)
 
 ## Contributing
+
 Issues and Pull Requests are welcome!
 
 ## Acknowledgements
- - [DreamCloud - 极高性价比解锁直连亚太高防](https://as211392.com/)
- - Thanks to myself for being so idle
- - All the developers who submitted PRs and created themes
+
+### DreamCloud
+
+[DreamCloud - 极高性价比解锁直连亚太高防](https://as211392.com/)
+
+### 🚀 Sponsored by SharonNetworks
+
+[![Sharon Networks](https://raw.githubusercontent.com/komari-monitor/public/refs/heads/main/images/sharon-networks.webp)](https://sharon.io)
+
+SharonNetworks 为您的业务起飞保驾护航！
+
+亚太数据中心提供顶级的中国优化网络接入 · 低延时&高带宽&提供 Tbps 级本地清洗高防服务, 为您的业务保驾护航, 为您的客户提供极致体验. 加入社区 [Telegram 群组](https://t.me/SharonNetwork) 可参与公益募捐或群内抽奖免费使用
+
+### The open source software community
+
+All the developers who submitted PRs and created themes
 
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=komari-monitor/komari&type=Date)](https://www.star-history.com/#komari-monitor/komari&Date)
-

api/Common.go

@@ -1,133 +0,0 @@
-package api
-
-import (
-	"log"
-	"net/http"
-	"sync"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/common"
-	"github.com/patrickmn/go-cache"
-
-	"strconv"
-
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils"
-)
-
-var (
-	Records = cache.New(1*time.Minute, 1*time.Minute)
-)
-
-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 SaveClientReportToDB() error {
-	lastMinute := time.Now().Add(-time.Minute).Unix()
-	var records []models.Record
-
-	// 遍历所有客户端记录
-	for uuid, x := range Records.Items() {
-		if uuid == "" {
-			continue
-		}
-
-		reports, ok := x.Object.([]common.Report)
-		if !ok {
-			log.Printf("Invalid report type for UUID %s", uuid)
-			continue
-		}
-
-		// 过滤一分钟前的记录
-		var filtered []common.Report
-		for _, r := range reports {
-			if r.UpdatedAt.Unix() >= lastMinute {
-				filtered = append(filtered, r)
-			}
-		}
-
-		// 更新缓存
-		Records.Set(uuid, filtered, cache.DefaultExpiration)
-
-		// 计算平均报告并添加到记录列表
-		if len(filtered) > 0 {
-			r := utils.AverageReport(uuid, time.Now(), filtered, 0.3)
-			records = append(records, r)
-		}
-	}
-
-	// 批量插入数据库前去重（client与time共同构成唯一键）
-	if len(records) > 0 {
-		unique := make(map[string]models.Record)
-		for _, rec := range records {
-			key := rec.Client + "_" + strconv.FormatInt(rec.Time.ToTime().Unix(), 10)
-			unique[key] = rec
-		}
-		var deduped []models.Record
-		for _, rec := range unique {
-			deduped = append(deduped, rec)
-		}
-		db := dbcore.GetDBInstance()
-		if err := db.Model(&models.Record{}).Create(&deduped).Error; err != nil {
-			log.Printf("Failed to save records to database: %v", err)
-			return err
-		}
-	}
-
-	return nil
-}
-
-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)
-}
-func GetVersion(c *gin.Context) {
-	RespondSuccess(c, gin.H{
-		"version": utils.CurrentVersion,
-		"hash":    utils.VersionHash,
-	})
-}
-
-func isApiKeyValid(apiKey string) bool {
-	cfg, err := config.Get()
-	if err != nil {
-		return false
-	}
-	if cfg.ApiKey == "" || len(cfg.ApiKey) < 12 {
-		return false
-	}
-	return apiKey == "Bearer "+cfg.ApiKey
-}

api/PrivateSiteMiddleware.go

@@ -1,74 +0,0 @@
-package api
-
-import (
-	"net/http"
-
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/config"
-
-	"github.com/gin-gonic/gin"
-)
-
-var (
-	publicPaths = []string{
-		"/ping",
-		"/api/public",
-		"/api/login",
-		"/api/me",
-		"/api/oauth",
-		"/api/oauth_callback",
-		"/api/version",
-		"/api/admin",    // 由AdminAuthMiddleware处理
-		"/api/clients/", // 由TokenAuthMiddleware处理
-	}
-)
-
-func PrivateSiteMiddleware() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		// API key authentication
-		apiKey := c.GetHeader("Authorization")
-		if isApiKeyValid(apiKey) {
-			c.Set("api_key", apiKey)
-			c.Next()
-			return
-		}
-		// 如果是公开的路径，直接放行
-		for _, path := range publicPaths {
-			if len(c.Request.URL.Path) >= len(path) && c.Request.URL.Path[:len(path)] == path {
-				c.Next()
-				return
-			}
-		}
-		// 如果不是 /api，直接放行
-		if len(c.Request.URL.Path) < 4 || c.Request.URL.Path[:4] != "/api" {
-			c.Next()
-			return
-		}
-		conf, err := config.Get()
-		if err != nil {
-			RespondError(c, http.StatusInternalServerError, "Failed to get configuration.")
-			c.Abort()
-			return
-		}
-		// 验证私有, 如果不是私有站点，直接放行
-		if !conf.PrivateSite {
-			c.Next()
-			return
-		}
-		// 如果是私有站点，检查是否有 session
-		session, err := c.Cookie("session_token")
-		if err != nil {
-			RespondError(c, http.StatusUnauthorized, "Private site is enabled, please login first.")
-			c.Abort()
-			return
-		}
-		_, err = accounts.GetSession(session)
-		if err != nil {
-			RespondError(c, http.StatusUnauthorized, "Unauthorized.")
-			c.Abort()
-			return
-		}
-
-		c.Next()
-	}
-}

api/admin/download.go

@@ -1,236 +0,0 @@
-package admin
-
-import (
-	"archive/zip"
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/cmd/flags"
-	"github.com/komari-monitor/komari/database/dbcore"
-)
-
-// copyDatabaseToTemp 安全地复制数据库文件到临时目录
-// 对于SQLite数据库，会使用BACKUP命令确保数据一致性
-func copyDatabaseToTemp(dbFilePath, tempDir string) (string, error) {
-	if dbFilePath == "" {
-		return "", fmt.Errorf("database file path is empty")
-	}
-
-	// 检查数据库文件是否存在
-	if _, err := os.Stat(dbFilePath); os.IsNotExist(err) {
-		return "", fmt.Errorf("database file does not exist: %s", dbFilePath)
-	}
-
-	dbFileName := filepath.Base(dbFilePath)
-	tempDbPath := filepath.Join(tempDir, dbFileName)
-
-	// 如果是SQLite数据库，使用SQLite的BACKUP命令来确保一致性
-	if flags.DatabaseType == "sqlite" || flags.DatabaseType == "" {
-		db := dbcore.GetDBInstance()
-
-		// 获取底层的SQLite连接
-		sqlDB, err := db.DB()
-		if err != nil {
-			return "", fmt.Errorf("failed to get underlying database connection: %v", err)
-		}
-
-		// 使用SQLite的BACKUP API来创建一致的备份
-		backupSQL := fmt.Sprintf("BACKUP DATABASE main TO '%s'", tempDbPath)
-		_, err = sqlDB.Exec(backupSQL)
-		if err != nil {
-			// 如果BACKUP命令失败，回退到文件复制方法
-			log.Printf("SQLite BACKUP command failed, falling back to file copy: %v", err)
-			return copyFileToTemp(dbFilePath, tempDbPath)
-		}
-
-		log.Printf("Database backed up using SQLite BACKUP to: %s", tempDbPath)
-		return tempDbPath, nil
-	} else {
-		// 对于非SQLite数据库，直接复制文件
-		return copyFileToTemp(dbFilePath, tempDbPath)
-	}
-}
-
-// copyFileToTemp 简单的文件复制到临时目录
-func copyFileToTemp(srcPath, destPath string) (string, error) {
-	src, err := os.Open(srcPath)
-	if err != nil {
-		return "", fmt.Errorf("failed to open source file: %v", err)
-	}
-	defer src.Close()
-
-	dest, err := os.Create(destPath)
-	if err != nil {
-		return "", fmt.Errorf("failed to create destination file: %v", err)
-	}
-	defer dest.Close()
-
-	_, err = io.Copy(dest, src)
-	if err != nil {
-		return "", fmt.Errorf("failed to copy file: %v", err)
-	}
-
-	log.Printf("Database file copied to: %s", destPath)
-	return destPath, nil
-}
-
-// DownloadBackup 用于打包 ./data 目录及数据库文件为 zip 并通过 HTTP 下载
-func DownloadBackup(c *gin.Context) {
-	backupFileName := fmt.Sprintf("backup-%d.zip", time.Now().UnixMicro())
-	c.Writer.Header().Set("Content-Type", "application/zip")
-	c.Writer.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", backupFileName))
-
-	zipWriter := zip.NewWriter(c.Writer)
-	defer zipWriter.Close()
-
-	// 创建临时目录用于存放数据库备份
-	tempDir, err := os.MkdirTemp("", "komari-backup-*")
-	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating temporary directory: %v", err))
-		return
-	}
-	defer os.RemoveAll(tempDir) // 清理临时目录
-
-	err = filepath.Walk("./data", func(filePath string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		// 获取在 zip 包内的相对路径
-		relPath, err := filepath.Rel("./data", filePath)
-		if err != nil {
-			return err
-		}
-
-		// 跳过根目录本身，只打包内容
-		if relPath == "." {
-			return nil
-		}
-
-		// zip 内路径统一用正斜杠
-		zipPath := filepath.ToSlash(relPath)
-
-		if info.IsDir() {
-			// 在 zip 中创建目录项
-			_, err = zipWriter.CreateHeader(&zip.FileHeader{
-				Name:     zipPath + "/",
-				Method:   zip.Deflate, //  zip.Store 不压缩
-				Modified: info.ModTime(),
-			})
-			return err
-		}
-
-		// 普通文件，写入 zip
-		file, err := os.Open(filePath)
-		if err != nil {
-			return err
-		}
-		defer file.Close()
-
-		writer, err := zipWriter.CreateHeader(&zip.FileHeader{
-			Name:     zipPath,
-			Method:   zip.Deflate,
-			Modified: info.ModTime(),
-		})
-		if err != nil {
-			return err
-		}
-
-		_, err = io.Copy(writer, file)
-		return err
-	})
-
-	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error archiving data folder: %v", err))
-		return
-	}
-
-	// 获取 ./data 和数据库文件的绝对路径以进行可靠的比较
-	dataAbsPath, err := filepath.Abs("./data")
-	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error getting absolute path for data directory: %v", err))
-		return
-	}
-
-	dbFilePath := flags.DatabaseFile
-	dbAbsPath, err := filepath.Abs(dbFilePath)
-	if err != nil {
-		// 如果无法解析数据库路径，可能是一个配置问题，但我们记录并跳过，避免备份失败
-		log.Printf("Could not determine absolute path for database file '%s', skipping explicit addition. Error: %v\n", dbFilePath, err)
-		return
-	}
-
-	// 如果数据库文件的绝对路径不是以 ./data 目录的绝对路径开头，则单独添加它
-	if !strings.HasPrefix(dbAbsPath, dataAbsPath) {
-		// 使用安全的数据库复制方法
-		tempDbPath, err := copyDatabaseToTemp(dbFilePath, tempDir)
-		if err != nil {
-			if os.IsNotExist(err) {
-				log.Printf("Database file '%s' does not exist, skipping.\n", dbFilePath)
-			} else {
-				api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error copying database file: %v", err))
-				return
-			}
-		} else {
-			// 将临时数据库文件添加到zip
-			dbInfo, err := os.Stat(tempDbPath)
-			if err != nil {
-				api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error stating temp database file: %v", err))
-				return
-			}
-
-			file, err := os.Open(tempDbPath)
-			if err != nil {
-				api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error opening temp database file: %v", err))
-				return
-			}
-			defer file.Close()
-
-			writer, err := zipWriter.CreateHeader(&zip.FileHeader{
-				Name:     filepath.Base(dbFilePath), // 使用原始数据库文件名
-				Method:   zip.Deflate,
-				Modified: dbInfo.ModTime(),
-			})
-			if err != nil {
-				api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating zip entry for database file: %v", err))
-				return
-			}
-
-			_, err = io.Copy(writer, file)
-			if err != nil {
-				api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error writing database file to zip: %v", err))
-				return
-			}
-		}
-	} else {
-		log.Printf("Database file '%s' is within './data', skipping explicit addition.\n", dbFilePath)
-	}
-
-	// 添加备份标记文件
-	markupContent := "此文件为 Komari 备份标记文件，请勿删除。\nThis is a Komari backup markup file, please do not delete.\n\n备份时间 / Backup Time: " + time.Now().Format(time.RFC3339)
-	markupWriter, err := zipWriter.CreateHeader(&zip.FileHeader{
-		Name:     "komari-backup-markup",
-		Method:   zip.Deflate,
-		Modified: time.Now(),
-	})
-	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating backup markup file: %v", err))
-		return
-	}
-
-	_, err = markupWriter.Write([]byte(markupContent))
-	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error writing backup markup file: %v", err))
-		return
-	}
-
-	// zipWriter.Close() 由 defer 自动调用
-}

api/admin/messageSender.go

@@ -1,63 +0,0 @@
-package admin
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils/messageSender"
-	"github.com/komari-monitor/komari/utils/messageSender/factory"
-)
-
-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
-	}
-	cfg, _ := config.Get()
-	// 正在使用，重载
-	if cfg.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/test/test.go

@@ -1,47 +0,0 @@
-package test
-
-import (
-	"net"
-
-	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/utils/geoip"
-	"github.com/komari-monitor/komari/utils/messageSender"
-)
-
-func TestSendMessage(c *gin.Context) {
-	message := "Komari test message."
-	err := messageSender.SendTextMessage(message, "Komari Test Notification")
-	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()
-		}
-	}
-	conf, err := config.Get()
-	if err != nil {
-		api.RespondError(c, 500, "Failed to get configuration: "+err.Error())
-		return
-	}
-	if !conf.GeoIpEnabled {
-		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/update/geoip.go

@@ -1,18 +0,0 @@
-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/upload.go

@@ -1,173 +0,0 @@
-package admin
-
-import (
-	"archive/zip"
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/cmd/flags"
-)
-
-// 只有一个备份恢复操作在进行
-var restoreMutex sync.Mutex
-
-// UploadBackup 用于接收上传的备份文件并将其内容恢复到原始位置
-func UploadBackup(c *gin.Context) {
-	// 尝试获取锁，如果已有恢复操作在进行，则立即返回错误
-	if !restoreMutex.TryLock() {
-		api.RespondError(c, http.StatusConflict, "Another restore operation is already in progress")
-		return
-	}
-	defer restoreMutex.Unlock()
-
-	// 获取上传的文件
-	file, header, err := c.Request.FormFile("backup")
-	if err != nil {
-		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") {
-		api.RespondError(c, http.StatusBadRequest, "Uploaded file must be a ZIP archive")
-		return
-	}
-
-	// 创建临时文件保存上传的zip
-	tempFile, err := os.CreateTemp("", "backup-*.zip")
-	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating temporary file: %v", err))
-		return
-	}
-	tempFilePath := tempFile.Name()
-	defer os.Remove(tempFilePath) // 确保临时文件最终被删除
-
-	// 将上传的文件内容复制到临时文件
-	_, err = io.Copy(tempFile, file)
-	if err != nil {
-		tempFile.Close()
-		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error saving uploaded file: %v", err))
-		return
-	}
-	tempFile.Close() // 关闭文件以便后续操作
-
-	// 打开zip文件准备解压
-	zipReader, err := zip.OpenReader(tempFilePath)
-	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error opening zip file: %v", err))
-		return
-	}
-	defer zipReader.Close()
-
-	// 检查是否包含备份标记文件
-	hasMarkupFile := false
-	for _, zipFile := range zipReader.File {
-		if zipFile.Name == "komari-backup-markup" {
-			hasMarkupFile = true
-			break
-		}
-	}
-	if !hasMarkupFile {
-		api.RespondError(c, http.StatusBadRequest, "Invalid backup file: missing komari-backup-markup file")
-		return
-	}
-
-	// 确保data目录存在
-	if err := os.MkdirAll("./data", 0755); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating data directory: %v", err))
-		return
-	}
-
-	// 获取数据库文件名
-	dbFileName := filepath.Base(flags.DatabaseFile)
-
-	// 解压文件
-	for _, zipFile := range zipReader.File {
-		// 检查文件路径是否安全（防止路径遍历攻击）
-		filePath := zipFile.Name
-		if strings.Contains(filePath, "..") {
-			log.Printf("Potentially unsafe path in zip: %s, skipping", filePath)
-			continue
-		}
-
-		// 跳过备份标记文件
-		if filePath == "komari-backup-markup" {
-			continue
-		}
-
-		// 确定目标路径
-		var destPath string
-		if filePath == dbFileName {
-			// 如果是数据库文件，恢复到数据库文件路径
-			destPath = flags.DatabaseFile
-		} else {
-			// 其他文件恢复到data目录
-			destPath = filepath.Join("./data", filePath)
-		}
-
-		// 如果是目录，创建目录
-		if zipFile.FileInfo().IsDir() {
-			if err := os.MkdirAll(destPath, 0755); err != nil {
-				log.Printf("Error creating directory %s: %v", destPath, err)
-			}
-			continue
-		}
-
-		// 确保目标文件的目录存在
-		destDir := filepath.Dir(destPath)
-		if err := os.MkdirAll(destDir, 0755); err != nil {
-			log.Printf("Error creating directory %s: %v", destDir, err)
-			continue
-		}
-
-		// 打开zip中的文件
-		srcFile, err := zipFile.Open()
-		if err != nil {
-			log.Printf("Error opening file from zip %s: %v", filePath, err)
-			continue
-		}
-
-		// 创建目标文件
-		destFile, err := os.Create(destPath)
-		if err != nil {
-			srcFile.Close()
-			log.Printf("Error creating file %s: %v", destPath, err)
-			continue
-		}
-
-		// 复制内容
-		_, err = io.Copy(destFile, srcFile)
-		srcFile.Close()
-		destFile.Close()
-		if err != nil {
-			log.Printf("Error extracting file %s: %v", destPath, err)
-			continue
-		}
-
-		// 保持原始文件的修改时间
-		if err := os.Chtimes(destPath, zipFile.Modified, zipFile.Modified); err != nil {
-			log.Printf("Error setting file time for %s: %v", destPath, err)
-		}
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"status":  "success",
-		"message": "Backup restored successfully. The service will restart shortly.",
-	})
-
-	go func() {
-		log.Println("Backup restored, restarting service in 2 seconds...")
-		time.Sleep(2 * time.Second)
-		os.Exit(0)
-	}()
-}

api/client/autoDiscovery.go

@@ -1,41 +0,0 @@
-package client
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/utils"
-)
-
-func RegisterClient(c *gin.Context) {
-	auth := c.GetHeader("Authorization")
-	if auth == "" {
-		api.RespondError(c, 403, "Invalid AutoDiscovery Key")
-		return
-	}
-	cfg, err := config.Get()
-	if err != nil {
-		api.RespondError(c, 500, "Failed to get configuration: "+err.Error())
-		return
-	}
-
-	if cfg.AutoDiscoveryKey == "" ||
-		len(cfg.AutoDiscoveryKey) < 12 ||
-		"Bearer "+cfg.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/report.go

@@ -1,193 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"time"
-
-	"log"
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/common"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/tasks"
-	"github.com/komari-monitor/komari/utils/notifier"
-	"github.com/komari-monitor/komari/ws"
-	"github.com/patrickmn/go-cache"
-)
-
-func UploadReport(c *gin.Context) {
-	bodyBytes, err := io.ReadAll(c.Request.Body)
-	if err != nil {
-		log.Println("Failed to read request body:", err)
-		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
-		return
-	}
-
-	var data map[string]interface{}
-	err = json.Unmarshal(bodyBytes, &data)
-	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
-		return
-	}
-	// Save report to database
-	var report common.Report
-	err = json.Unmarshal(bodyBytes, &report)
-	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
-		return
-	}
-	report.UpdatedAt = time.Now()
-	err = SaveClientReport(report.UUID, report)
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("%v", err)})
-		return
-	}
-	// Update report with method and token
-
-	ws.GetLatestReport()[report.UUID] = &report
-
-	c.Request.Body = io.NopCloser(bytes.NewBuffer(bodyBytes)) // Restore the body for further use
-	c.JSON(200, gin.H{"status": "success"})
-}
-
-func WebSocketReport(c *gin.Context) {
-	// 升级ws
-	if !websocket.IsWebSocketUpgrade(c.Request) {
-		c.JSON(http.StatusBadRequest, gin.H{"status": "error", "error": "Require WebSocket upgrade"})
-		return
-	}
-	upgrader := websocket.Upgrader{
-		CheckOrigin: func(r *http.Request) bool {
-			return true // 被控
-		},
-	}
-	// 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"})
-		return
-	}
-	conn := ws.NewSafeConn(unsafeConn)
-	defer conn.Close()
-
-	_, message, err := conn.ReadMessage()
-	if err != nil {
-		log.Println("Error reading message:", err)
-		return
-	}
-
-	// 第一次数据拿token
-	data := map[string]interface{}{}
-	err = json.Unmarshal(message, &data)
-	if err != nil {
-		conn.WriteJSON(gin.H{"status": "error", "error": "Invalid JSON"})
-		return
-	}
-	// it should ok,token was verfied in the middleware
-	token := ""
-	var errMsg string
-
-	// 优先检查查询参数中的 token
-	token = c.Query("token")
-
-	// 如果 token 为空，返回错误
-	if token == "" {
-		conn.WriteJSON(gin.H{"status": "error", "error": errMsg})
-		return
-	}
-
-	uuid, err := clients.GetClientUUIDByToken(token)
-	if err != nil {
-		conn.WriteJSON(gin.H{"status": "error", "error": errMsg})
-		return
-	}
-
-	// 只允许一个客户端的连接
-	if _, exists := ws.GetConnectedClients()[uuid]; exists {
-		conn.WriteJSON(gin.H{"status": "error", "error": "Token already in use"})
-		return
-	}
-	ws.SetConnectedClients(uuid, conn)
-	go notifier.OnlineNotification(uuid)
-	defer func() {
-		ws.DeleteConnectedClients(uuid)
-		notifier.OfflineNotification(uuid)
-	}()
-
-	for {
-		_, message, err := conn.ReadMessage()
-		if err != nil {
-			break
-		}
-
-		type MessageType struct {
-			Type string `json:"type"`
-		}
-		var msgType MessageType
-		err = json.Unmarshal(message, &msgType)
-		if err != nil {
-			conn.WriteJSON(gin.H{"status": "error", "error": "Invalid JSON"})
-			continue
-		}
-		switch msgType.Type {
-		case "", "report":
-			report := common.Report{}
-			err = json.Unmarshal(message, &report)
-			if err != nil {
-				conn.WriteJSON(gin.H{"status": "error", "error": "Invalid report format"})
-				continue
-			}
-			report.UpdatedAt = time.Now()
-			err = SaveClientReport(uuid, report)
-			if err != nil {
-				conn.WriteJSON(gin.H{"status": "error", "error": fmt.Sprintf("%v", err)})
-				continue
-			}
-			ws.SetLatestReport(uuid, &report)
-		case "ping_result":
-			var reqBody struct {
-				PingTaskID uint      `json:"task_id"`
-				PingResult int       `json:"value"`
-				PingType   string    `json:"ping_type"`
-				FinishedAt time.Time `json:"finished_at"`
-			}
-			err = json.Unmarshal(message, &reqBody)
-			if err != nil {
-				conn.WriteJSON(gin.H{"status": "error", "error": "Invalid ping result format"})
-				continue
-			}
-			pingResult := models.PingRecord{
-				Client: uuid,
-				TaskId: reqBody.PingTaskID,
-				Value:  reqBody.PingResult,
-				Time:   models.FromTime(reqBody.FinishedAt),
-			}
-			tasks.SavePingRecord(pingResult)
-		default:
-			log.Printf("Unknown message type: %s", msgType.Type)
-			conn.WriteJSON(gin.H{"status": "error", "error": "Unknown message type"})
-		}
-
-	}
-}
-
-func SaveClientReport(uuid string, report common.Report) error {
-	reports, _ := api.Records.Get(uuid)
-	if reports == nil {
-		reports = []common.Report{}
-	}
-	if report.CPU.Usage < 0.01 {
-		report.CPU.Usage = 0.01
-	}
-	reports = append(reports.([]common.Report), report)
-	api.Records.Set(uuid, reports, cache.DefaultExpiration)
-
-	return nil
-}

api/latestRecord.go

@@ -1,15 +0,0 @@
-package api
-
-import (
-	"github.com/gin-gonic/gin"
-)
-
-func GetClientRecentRecords(c *gin.Context) {
-	uuid := c.Param("uuid")
-	if uuid == "" {
-		RespondError(c, 400, "UUID is required")
-		return
-	}
-	records, _ := Records.Get(uuid)
-	RespondSuccess(c, records)
-}

api/login.go

@@ -1,77 +0,0 @@
-package api
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/config"
-
-	"github.com/gin-gonic/gin"
-)
-
-type LoginRequest struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-	TwoFa    string `json:"2fa_code"`
-}
-
-func Login(c *gin.Context) {
-	conf, _ := config.Get()
-	if conf.DisablePasswordLogin {
-		RespondError(c, http.StatusForbidden, "Password login is disabled")
-		return
-	}
-
-	bodyBytes, err := io.ReadAll(c.Request.Body)
-	if err != nil {
-		RespondError(c, http.StatusBadRequest, "Invalid request body: "+err.Error())
-		return
-	}
-	var data LoginRequest
-	err = json.Unmarshal(bodyBytes, &data)
-	if err != nil {
-		RespondError(c, http.StatusBadRequest, "Invalid request body: "+err.Error())
-		return
-	}
-	if data.Username == "" || data.Password == "" {
-		RespondError(c, http.StatusBadRequest, "Invalid request body: Username and password are required")
-		return
-	}
-
-	uuid, success := accounts.CheckPassword(data.Username, data.Password)
-	if !success {
-		RespondError(c, http.StatusUnauthorized, "Invalid credentials")
-		return
-	}
-	// 2FA
-	user, _ := accounts.GetUserByUUID(uuid)
-	if user.TwoFactor != "" { // 开启了2FA
-		if data.TwoFa == "" {
-			RespondError(c, http.StatusUnauthorized, "2FA code is required")
-			return
-		}
-		if ok, err := accounts.Verify2Fa(uuid, data.TwoFa); err != nil || !ok {
-			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 {
-		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")
-	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/nodes.go

@@ -1,26 +0,0 @@
-package api
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/clients"
-)
-
-func GetNodesInformation(c *gin.Context) {
-	clientList, err := clients.GetAllClientBasicInfo()
-	if err != nil {
-		RespondError(c, 500, "Failed to retrieve client information: "+err.Error())
-		return
-	}
-
-	count := len(clientList)
-	// 公开信息不展示IP地址,私有备注不展示
-	for i := 0; i < count; i++ {
-		clientList[i].IPv4 = ""
-		clientList[i].IPv6 = ""
-		clientList[i].Remark = ""
-		clientList[i].Version = ""
-		clientList[i].Token = ""
-	}
-
-	RespondSuccess(c, clientList)
-}

api/public.go

@@ -1,30 +0,0 @@
-package api
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/config"
-)
-
-func GetPublicSettings(c *gin.Context) {
-	cst, err := config.Get()
-	if err != nil {
-		RespondError(c, 500, err.Error())
-		return
-	}
-	// Return public settings including CORS
-	RespondSuccess(c, gin.H{
-		"sitename":                  cst.Sitename,
-		"description":               cst.Description,
-		"custom_head":               cst.CustomHead,
-		"custom_body":               cst.CustomBody,
-		"oauth_enable":              cst.OAuthEnabled,
-		"oauth_provider":            cst.OAuthProvider,
-		"disable_password_login":    cst.DisablePasswordLogin,
-		"allow_cors":                cst.AllowCors,
-		"record_enabled":            cst.RecordEnabled,
-		"record_preserve_time":      cst.RecordPreserveTime,
-		"ping_record_preserve_time": cst.PingRecordPreserveTime,
-		"private_site":              cst.PrivateSite,
-	})
-
-}

api/record/record.go

@@ -1,138 +0,0 @@
-package record
-
-import (
-	"slices"
-	"strconv"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	records "github.com/komari-monitor/komari/database/records"
-	"github.com/komari-monitor/komari/database/tasks"
-)
-
-func GetRecordsByUUID(c *gin.Context) {
-	uuid := c.Query("uuid")
-	hours := c.Query("hours")
-	if uuid == "" {
-		api.RespondError(c, 400, "UUID is required")
-		return
-	}
-	if hours == "" {
-		hours = "4"
-	}
-
-	hoursInt, err := strconv.Atoi(hours)
-	if err != nil {
-		api.RespondError(c, 400, "Invalid hours parameter")
-		return
-	}
-
-	records, err := records.GetRecordsByClientAndTime(uuid, time.Now().Add(-time.Duration(hoursInt)*time.Hour), time.Now())
-	if err != nil {
-		api.RespondError(c, 500, "Failed to fetch records: "+err.Error())
-		return
-	}
-	api.RespondSuccess(c, gin.H{
-		"records": records,
-		"count":   len(records),
-	})
-}
-
-// GET query: uuid string, hours int
-func GetPingRecords(c *gin.Context) {
-	uuid := c.Query("uuid")
-	hours := c.Query("hours")
-	type RecordsResp struct {
-		TaskId uint   `json:"task_id"`
-		Time   string `json:"time"`
-		Value  int    `json:"value"`
-	}
-	type Resp struct {
-		Count   int           `json:"count"`
-		Records []RecordsResp `json:"records"`
-		Tasks   []gin.H       `json:"tasks,omitempty"` // 任务列表
-	}
-
-	if uuid == "" {
-		api.RespondError(c, 400, "UUID is required")
-		return
-	}
-	if hours == "" {
-		hours = "4"
-	}
-
-	hoursInt, err := strconv.Atoi(hours)
-	if err != nil {
-		api.RespondError(c, 400, "Invalid hours parameter")
-		return
-	}
-
-	records, err := tasks.GetPingRecordsByClientAndTime(uuid, time.Now().Add(-time.Duration(hoursInt)*time.Hour), time.Now())
-	if err != nil {
-		api.RespondError(c, 500, "Failed to fetch records: "+err.Error())
-		return
-	}
-
-	response := &Resp{
-		Count:   len(records),
-		Records: []RecordsResp{},
-	}
-	for _, r := range records {
-		response.Records = append(response.Records, RecordsResp{
-			TaskId: r.TaskId,
-			Time:   r.Time.ToTime().Format(time.RFC3339),
-			Value:  r.Value,
-		})
-	}
-
-	if len(records) >= 0 {
-		// 获取当前属于该 uuid 的 pingTasks
-		pingTasks, err := tasks.GetAllPingTasks()
-		if err != nil {
-			api.RespondError(c, 500, "Failed to fetch ping tasks: "+err.Error())
-			return
-		}
-
-		taskIdSet := make(map[uint]struct{})
-		for _, r := range records {
-			taskIdSet[r.TaskId] = struct{}{}
-		}
-
-		tasksList := make([]gin.H, 0, len(pingTasks))
-		for _, t := range pingTasks {
-			// 只保留分配给该 uuid 的任务
-			found := slices.Contains(t.Clients, uuid)
-			if !found {
-				continue
-			}
-
-			// 计算该任务的丢包率
-			totalCount := 0
-			lossCount := 0
-			for _, r := range records {
-				if r.TaskId == t.Id {
-					totalCount++
-					if r.Value < 0 {
-						lossCount++
-					}
-				}
-			}
-
-			var lossRate float64 = 0
-			if totalCount > 0 {
-				lossRate = float64(lossCount) / float64(totalCount) * 100
-			}
-
-			tasksList = append(tasksList, gin.H{
-				"id":       t.Id,
-				"name":     t.Name,
-				"interval": t.Interval,
-				"loss":     lossRate,
-			})
-		}
-		response.Tasks = tasksList
-	}
-
-	api.RespondSuccess(c, response)
-}

cmd/chpasswd.go

@@ -1,12 +1,14 @@
 package cmd
 
 import (
+	"context"
 	"os"
 
-	"github.com/komari-monitor/komari/cmd/flags"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/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/spf13/cobra"
 )
 
@@ -25,25 +27,31 @@ var ChpasswdCmd = &cobra.Command{
 			cmd.Help()
 			return
 		}
-		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 {
+		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)
-			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,10 +1,12 @@
 package cmd
 
 import (
+	"context"
 	"os"
 
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/app"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/dbcore"
 	"github.com/spf13/cobra"
 	"gorm.io/gorm"
 )
@@ -14,10 +16,13 @@ var Disable2FA = &cobra.Command{
 	Short: "Force disable 2FA",
 	Long:  `Force disable 2FA`,
 	Run: func(cmd *cobra.Command, args []string) {
-		db := dbcore.GetDBInstance()
-		err := db.Transaction(func(tx *gorm.DB) error {
-			return tx.Model(&models.User{}).Where("two_factor != ?", "").
-				Update("two_factor", "").Error
+		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
+			})
 		})
 		if err != nil {
 			cmd.Println("Error:", err)

cmd/flags/config.go

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

cmd/nezha_compat.go

@@ -0,0 +1,404 @@
+package cmd
+
+import (
+	"context"
+	"errors"
+	"io"
+	"log"
+	"math"
+	"net"
+	"strings"
+	"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"
+
+	"github.com/komari-monitor/komari/internal/nezha/proto"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/keepalive"
+	"google.golang.org/grpc/metadata"
+	"gorm.io/gorm/clause"
+)
+
+// [Deprecated] Use StartNezhaCompat instead.
+func StartNezhaCompatServer(addr string) error {
+	boot := uint64(time.Now().Unix())
+	lis, err := net.Listen("tcp", addr)
+	if err != nil {
+		return err
+	}
+	srv := &nezhaCompatServer{bootTime: boot}
+
+	// Interceptors for metadata auth presence (lightweight; validation is inside handlers too)
+	unary := func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+		return handler(ctx, req)
+	}
+	stream := func(srvIface interface{}, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
+		return handler(srvIface, ss)
+	}
+	// Enable gRPC keepalive to tolerate long-idle streams
+	gs := grpc.NewServer(
+		grpc.UnaryInterceptor(unary),
+		grpc.StreamInterceptor(stream),
+		// Keepalive: allow client pings and keep connections stable without app traffic
+		grpc.KeepaliveParams(keepalive.ServerParameters{
+			Time:    2 * time.Minute,
+			Timeout: 20 * time.Second,
+		}),
+		grpc.KeepaliveEnforcementPolicy(keepalive.EnforcementPolicy{
+			MinTime:             20 * time.Second,
+			PermitWithoutStream: true,
+		}),
+	)
+	proto.RegisterNezhaServiceServer(gs, srv)
+	log.Printf("Nezha compat gRPC listening on %s", addr)
+	return gs.Serve(lis)
+}
+
+// ---- Manual start/stop support ----
+var (
+	nezhaSrv   *grpc.Server
+	nezhaLis   net.Listener
+	nezhaOnceM sync.Mutex
+)
+
+// StartNezhaCompat starts the Nezha compatible gRPC server asynchronously.
+// Returns error if already started.
+func StartNezhaCompat(addr string) error {
+	nezhaOnceM.Lock()
+	defer nezhaOnceM.Unlock()
+	if nezhaSrv != nil {
+		return errors.New("nezha compat server already started")
+	}
+	lis, err := net.Listen("tcp", addr)
+	if err != nil {
+		return err
+	}
+	boot := uint64(time.Now().Unix())
+	sImpl := &nezhaCompatServer{bootTime: boot}
+
+	unary := func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+		return handler(ctx, req)
+	}
+	stream := func(srvIface interface{}, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
+		return handler(srvIface, ss)
+	}
+	gs := grpc.NewServer(
+		grpc.UnaryInterceptor(unary),
+		grpc.StreamInterceptor(stream),
+		grpc.KeepaliveParams(keepalive.ServerParameters{Time: 2 * time.Minute, Timeout: 20 * time.Second}),
+		grpc.KeepaliveEnforcementPolicy(keepalive.EnforcementPolicy{MinTime: 20 * time.Second, PermitWithoutStream: true}),
+	)
+	proto.RegisterNezhaServiceServer(gs, sImpl)
+	nezhaSrv = gs
+	nezhaLis = lis
+	go func() {
+		if err := gs.Serve(lis); err != nil {
+			log.Printf("Nezha compat gRPC server stopped: %v", err)
+		}
+	}()
+	log.Printf("Nezha compat gRPC started on %s", addr)
+	return nil
+}
+
+// StopNezhaCompat stops the server if running.
+func StopNezhaCompat() error {
+	nezhaOnceM.Lock()
+	defer nezhaOnceM.Unlock()
+	if nezhaSrv == nil {
+		return errors.New("nezha compat server not running")
+	}
+	// 强制立即断开所有连接与流，不等待在途 RPC 完成。
+	nezhaSrv.Stop()
+	// Listener close (Serve already returns after GracefulStop, but close to be explicit)
+	if nezhaLis != nil {
+		_ = nezhaLis.Close()
+	}
+	nezhaSrv = nil
+	nezhaLis = nil
+	log.Printf("Nezha compat gRPC stopped")
+	return nil
+}
+
+type nezhaCompatServer struct {
+	proto.UnimplementedNezhaServiceServer
+	bootTime uint64
+}
+
+// authentication helpers
+func getAuth(ctx context.Context) (uuid string, secret string, err error) {
+	md, ok := metadata.FromIncomingContext(ctx)
+	if !ok {
+		return "", "", errors.New("missing metadata")
+	}
+	getFirst := func(key string) string {
+		vals := md.Get(key)
+		if len(vals) > 0 {
+			return vals[0]
+		}
+		return ""
+	}
+	uuid = getFirst("client_uuid")
+	secret = getFirst("client_secret")
+	if uuid == "" || secret == "" {
+		return "", "", errors.New("unauthorized: missing client_uuid/client_secret")
+	}
+	return uuid, secret, nil
+}
+
+// ReportSystemInfo: upsert static host info
+func (s *nezhaCompatServer) ReportSystemInfo(ctx context.Context, host *proto.Host) (*proto.Receipt, error) {
+	uuid, secret, err := getAuth(ctx)
+	if err != nil {
+		return nil, err
+	}
+	if err := upsertClientFromHost(uuid, secret, host); err != nil {
+		return nil, err
+	}
+	return &proto.Receipt{Proced: true}, nil
+}
+
+// ReportSystemInfo2: same as above but returns dashboard boot time
+func (s *nezhaCompatServer) ReportSystemInfo2(ctx context.Context, host *proto.Host) (*proto.Uint64Receipt, error) {
+	uuid, secret, err := getAuth(ctx)
+	if err != nil {
+		return nil, err
+	}
+	if err := upsertClientFromHost(uuid, secret, host); err != nil {
+		return nil, err
+	}
+	return &proto.Uint64Receipt{Data: s.bootTime}, nil
+}
+
+// ReportSystemState: ingest time-series records
+func (s *nezhaCompatServer) ReportSystemState(stream proto.NezhaService_ReportSystemStateServer) error {
+	ctx := stream.Context()
+	uuid, _, err := getAuth(ctx)
+	if err != nil {
+		return err
+	}
+	// presence start
+	connID := time.Now().UnixNano()
+	ws.SetPresence(uuid, connID, true)
+	go notifier.OnlineNotification(uuid, connID)
+	defer func() {
+		ws.SetPresence(uuid, connID, false)
+		notifier.OfflineNotification(uuid, connID)
+	}()
+	for {
+		st, err := stream.Recv()
+		if err == io.EOF {
+			return nil
+		}
+		if err != nil {
+			return err
+		}
+		// refresh presence TTL on every frame
+		ws.KeepAlivePresence(uuid, connID, 30*time.Second)
+		if err := ingestState(uuid, st); err != nil {
+			// still ack to avoid client stuck; log error
+			log.Printf("Nezha ingest state error: %v", err)
+		}
+		if err := stream.Send(&proto.Receipt{Proced: true}); err != nil {
+			return err
+		}
+	}
+}
+
+// RequestTask: do not dispatch tasks, just drain results to avoid Unimplemented
+func (s *nezhaCompatServer) RequestTask(stream proto.NezhaService_RequestTaskServer) error {
+	ctx := stream.Context()
+	uuid, _, err := getAuth(ctx)
+	if err != nil {
+		return err
+	}
+	ticker := time.NewTicker(10 * time.Second)
+	defer ticker.Stop()
+	connID := time.Now().UnixNano()
+	ws.SetPresence(uuid, connID, true)
+	defer ws.SetPresence(uuid, connID, false)
+	// receive results in background
+	recvErr := make(chan error, 1)
+	go func() {
+		for {
+			_, rerr := stream.Recv()
+			if rerr == io.EOF {
+				recvErr <- nil
+				return
+			}
+			if rerr != nil {
+				recvErr <- rerr
+				return
+			}
+			// refresh presence TTL when result received
+			ws.KeepAlivePresence(uuid, connID, 30*time.Second)
+		}
+	}()
+	// send heartbeat tasks periodically
+	for {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		case err := <-recvErr:
+			return err
+		case <-ticker.C:
+			if err := stream.Send(&proto.Task{}); err != nil {
+				return err
+			}
+		}
+	}
+}
+
+// Unimplemented methods intentionally left as default (IOStream, ReportGeoIP)
+
+// upsertClientFromHost maps Host into models.Client and upserts by UUID
+func upsertClientFromHost(uuid, secret string, h *proto.Host) error {
+	db := dbcore.GetDBInstance()
+	now := models.FromTime(time.Now())
+	// token guard: if existing record has different token, reject
+	var exist models.Client
+	if err := db.Where("uuid = ?", uuid).First(&exist).Error; err == nil {
+		if exist.Token != "" && exist.Token != secret {
+			return errors.New("unauthorized: token mismatch")
+		}
+	}
+	cpuName := ""
+	if len(h.Cpu) > 0 {
+		cpuName = h.Cpu[0]
+	}
+	gpuName := strings.Join(h.Gpu, "; ")
+	osName := h.Platform
+	if h.PlatformVersion != "" {
+		osName = h.Platform + " " + h.PlatformVersion
+	}
+	// clamp uint64 to int64 safely
+	clamp := func(v uint64) int64 {
+		if v > uint64(math.MaxInt64) {
+			return math.MaxInt64
+		}
+		return int64(v)
+	}
+	c := models.Client{
+		UUID:           uuid,
+		Token:          secret,
+		Name:           "nezha_" + uuid[0:8],
+		CpuName:        cpuName,
+		Arch:           h.Arch,
+		CpuCores:       len(h.Cpu),
+		OS:             osName,
+		KernelVersion:  h.PlatformVersion,
+		Virtualization: h.Virtualization,
+		GpuName:        gpuName,
+		MemTotal:       clamp(h.MemTotal),
+		SwapTotal:      clamp(h.SwapTotal),
+		DiskTotal:      clamp(h.DiskTotal),
+		Version:        h.Version,
+		UpdatedAt:      now,
+	}
+	// Upsert by UUID; don't override existing Token if already set
+	updates := map[string]interface{}{
+		"cpu_name":       c.CpuName,
+		"arch":           c.Arch,
+		"cpu_cores":      c.CpuCores,
+		"os":             c.OS,
+		"kernel_version": c.KernelVersion,
+		"virtualization": c.Virtualization,
+		"gpu_name":       c.GpuName,
+		"mem_total":      c.MemTotal,
+		"swap_total":     c.SwapTotal,
+		"disk_total":     c.DiskTotal,
+		"version":        c.Version,
+		"updated_at":     time.Now(),
+	}
+	return db.Clauses(clause.OnConflict{
+		Columns:   []clause.Column{{Name: "uuid"}},
+		DoUpdates: clause.Assignments(updates),
+	}).Create(&c).Error
+}
+
+// ingestState maps Nezha State into common.Report then saves a Record
+func ingestState(uuid string, st *proto.State) error {
+	// we may need totals from client
+	db := dbcore.GetDBInstance()
+	var client models.Client
+	if err := db.Where("uuid = ?", uuid).First(&client).Error; err != nil {
+		// If missing, create with minimal defaults to avoid failing ingestion
+		client = models.Client{UUID: uuid, Token: "", Name: "nezha_" + uuid[0:8]}
+		auditlog.EventLog("info", "auto created client "+client.Name)
+		_ = db.Create(&client).Error
+	}
+	rep := common.Report{
+		CPU:  common.CPUReport{Usage: st.Cpu},
+		Ram:  common.RamReport{Total: client.MemTotal, Used: int64(st.MemUsed)},
+		Swap: common.RamReport{Total: client.SwapTotal, Used: int64(st.SwapUsed)},
+		Load: common.LoadReport{Load1: st.Load1, Load5: st.Load5, Load15: st.Load15},
+		Disk: common.DiskReport{Total: client.DiskTotal, Used: int64(st.DiskUsed)},
+		Network: common.NetworkReport{
+			Up:        int64(st.NetOutSpeed),
+			Down:      int64(st.NetInSpeed),
+			TotalUp:   int64(st.NetOutTransfer),
+			TotalDown: int64(st.NetInTransfer),
+		},
+		Uptime:    int64(st.Uptime),
+		Process:   int(st.ProcessCount),
+		UpdatedAt: time.Now(),
+	}
+	// 更新实时缓存供前端使用
+	ws.SetLatestReport(uuid, &rep)
+	// 写入内存缓存，入库交由定时聚合任务处理
+	return apiClient.SaveClientReport(uuid, rep)
+}
+
+// ReportGeoIP: 保存 Agent 上报的 IP，并回填国家码/面板启动时间
+func (s *nezhaCompatServer) ReportGeoIP(ctx context.Context, in *proto.GeoIP) (*proto.GeoIP, error) {
+	uuid, _, err := getAuth(ctx)
+	if err != nil {
+		return nil, err
+	}
+	updates := map[string]interface{}{
+		"updated_at": time.Now(),
+	}
+	var iso string
+	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 ip := net.ParseIP(v4); ip != nil {
+					if gi, _ := geoip.GetGeoInfo(ip); gi != nil {
+						iso = gi.ISOCode
+					}
+				}
+			}
+		}
+		if v6 := strings.TrimSpace(in.Ip.Ipv6); v6 != "" {
+			updates["ipv6"] = v6
+			if iso == "" { // 优先使用 v4 的国家码
+				if cfg, err := conf.GetWithV1Format(); err == nil && cfg.GeoIpEnabled {
+					if ip := net.ParseIP(v6); ip != nil {
+						if gi, _ := geoip.GetGeoInfo(ip); gi != nil {
+							iso = gi.ISOCode
+						}
+					}
+				}
+			}
+		}
+	}
+	if iso != "" {
+		// UI 使用旗帜 emoji
+		updates["region"] = geoip.GetRegionUnicodeEmoji(iso)
+	}
+	if len(updates) > 0 {
+		_ = dbcore.GetDBInstance().Model(&models.Client{}).Where("uuid = ?", uuid).Updates(updates).Error
+	}
+	// 回写 GeoIP（包含国家码与面板启动时间）
+	resp := &proto.GeoIP{Use6: in.GetUse6(), Ip: in.GetIp(), CountryCode: iso, DashboardBootTime: s.bootTime}
+	return resp, nil
+}

cmd/permitPasswordLogin.go

@@ -1,10 +1,12 @@
 package cmd
 
 import (
+	"context"
 	"os"
 
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/app"
+	"github.com/komari-monitor/komari/internal/conf"
+	"github.com/komari-monitor/komari/internal/dbcore"
 	"github.com/spf13/cobra"
 	"gorm.io/gorm"
 )
@@ -14,10 +16,13 @@ var PermitPasswordLoginCmd = &cobra.Command{
 	Short: "Force permit password login",
 	Long:  `Force permit password login`,
 	Run: func(cmd *cobra.Command, args []string) {
-		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
+		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
+			})
 		})
 		if err != nil {
 			cmd.Println("Error:", err)

cmd/root.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"log/slog"
+
 	"github.com/komari-monitor/komari/cmd/flags"
 
 	"github.com/spf13/cobra"
@@ -19,13 +21,7 @@ func GetEnv(key, defaultValue string) string {
 
 // 从环境变量获取默认值
 var (
-	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")
+	configFileEnv = GetEnv("KOMARI_CONFIG_FILE", "./data/komari.json")
 )
 
 var RootCmd = &cobra.Command{
@@ -33,26 +29,63 @@ 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.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]")
+	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]")
 }

cmd/server.go

@@ -2,395 +2,31 @@ package cmd
 
 import (
 	"context"
-	"fmt"
-	"log"
-	"net/http"
 	"os"
-	"os/signal"
-	"strings"
-	"syscall"
 	"time"
 
-	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/api/admin"
-	"github.com/komari-monitor/komari/api/admin/clipboard"
-	log_api "github.com/komari-monitor/komari/api/admin/log"
-	"github.com/komari-monitor/komari/api/admin/notification"
-	"github.com/komari-monitor/komari/api/admin/test"
-	"github.com/komari-monitor/komari/api/admin/update"
-	"github.com/komari-monitor/komari/api/client"
-	"github.com/komari-monitor/komari/api/record"
-	"github.com/komari-monitor/komari/cmd/flags"
-	"github.com/komari-monitor/komari/database"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	d_notification "github.com/komari-monitor/komari/database/notification"
-	"github.com/komari-monitor/komari/database/records"
-	"github.com/komari-monitor/komari/database/tasks"
-	"github.com/komari-monitor/komari/public"
-	"github.com/komari-monitor/komari/utils"
-	"github.com/komari-monitor/komari/utils/cloudflared"
-	"github.com/komari-monitor/komari/utils/geoip"
-	"github.com/komari-monitor/komari/utils/messageSender"
-	"github.com/komari-monitor/komari/utils/notifier"
-	"github.com/komari-monitor/komari/utils/oauth"
-	"github.com/komari-monitor/komari/ws"
+	"github.com/komari-monitor/komari/internal/app"
+	"github.com/komari-monitor/komari/internal/scheduler"
+	"github.com/komari-monitor/komari/internal/server"
 	"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) {
-		RunServer()
+		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)
+		}
 	},
 }
 
 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", os.ModePerm); err != nil {
-		log.Fatalf("Failed to create data directory: %v", err)
-	}
-	// 创建主题目录
-	if err := os.MkdirAll("./data/theme", os.ModePerm); err != nil {
-		log.Fatalf("Failed to create theme directory: %v", err)
-	}
-	InitDatabase()
-	if utils.VersionHash != "unknown" {
-		gin.SetMode(gin.ReleaseMode)
-	}
-	conf, err := config.Get()
-	if err != nil {
-		log.Fatal(err)
-	}
-	go geoip.InitGeoIp()
-	go DoScheduledWork()
-	go messageSender.Initialize()
-	// oidcInit
-	go oauth.Initialize()
-	config.Subscribe(func(event config.ConfigEvent) {
-		if event.New.OAuthProvider != event.Old.OAuthProvider {
-			oidcProvider, err := database.GetOidcConfigByName(event.New.OAuthProvider)
-			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 event.New.NotificationMethod != event.Old.NotificationMethod {
-			messageSender.Initialize()
-		}
-
-	})
-	// 初始化 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.Default()
-
-	// 动态 CORS 中间件
-
-	DynamicCorsEnabled = conf.AllowCors
-	config.Subscribe(func(event config.ConfigEvent) {
-		DynamicCorsEnabled = event.New.AllowCors
-		if event.New.GeoIpProvider != event.Old.GeoIpProvider {
-			go geoip.InitGeoIp()
-		}
-		if event.New.NotificationMethod != event.Old.NotificationMethod {
-			go messageSender.Initialize()
-		}
-	})
-	r.Use(func(c *gin.Context) {
-		if DynamicCorsEnabled {
-			c.Header("Access-Control-Allow-Origin", "*")
-			c.Header("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS")
-			c.Header("Access-Control-Allow-Headers", "Origin, Content-Length, Content-Type, Authorization, Accept, X-CSRF-Token, X-Requested-With, Set-Cookie")
-			c.Header("Access-Control-Expose-Headers", "Content-Length, Authorization, Set-Cookie")
-			c.Header("Access-Control-Allow-Credentials", "true")
-			c.Header("Access-Control-Max-Age", "43200") // 12 hours
-			if c.Request.Method == "OPTIONS" {
-				c.AbortWithStatus(204)
-				return
-			}
-		}
-		c.Next()
-	})
-
-	r.Use(api.PrivateSiteMiddleware())
-
-	r.Use(func(c *gin.Context) {
-		if len(c.Request.URL.Path) >= 4 && c.Request.URL.Path[:4] == "/api" {
-			c.Header("Cache-Control", "no-store")
-		}
-		c.Next()
-	})
-
-	r.Any("/ping", func(c *gin.Context) {
-		c.String(200, "pong")
-	})
-	// #region 公开路由
-	r.POST("/api/login", api.Login)
-	r.GET("/api/me", api.GetMe)
-	r.GET("/api/clients", ws.GetClients)
-	r.GET("/api/nodes", api.GetNodesInformation)
-	r.GET("/api/public", api.GetPublicSettings)
-	r.GET("/api/oauth", api.OAuth)
-	r.GET("/api/oauth_callback", api.OAuthCallback)
-	r.GET("/api/logout", api.Logout)
-	r.GET("/api/version", api.GetVersion)
-	r.GET("/api/recent/:uuid", api.GetClientRecentRecords)
-
-	r.GET("/api/records/load", record.GetRecordsByUUID)
-	r.GET("/api/records/ping", record.GetPingRecords)
-	// #region Agent
-	r.POST("/api/clients/register", client.RegisterClient)
-	tokenAuthrized := r.Group("/api/clients", api.TokenAuthMiddleware())
-	{
-		tokenAuthrized.GET("/report", client.WebSocketReport) // websocket
-		tokenAuthrized.POST("/uploadBasicInfo", client.UploadBasicInfo)
-		tokenAuthrized.POST("/report", client.UploadReport)
-		tokenAuthrized.GET("/terminal", client.EstablishConnection)
-		tokenAuthrized.POST("/task/result", client.TaskResult)
-	}
-	// #region 管理员
-	adminAuthrized := r.Group("/api/admin", api.AdminAuthMiddleware())
-	{
-		adminAuthrized.GET("/download/backup", admin.DownloadBackup)
-		adminAuthrized.POST("/upload/backup", admin.UploadBackup)
-		// test
-		testGroup := adminAuthrized.Group("/test")
-		{
-			testGroup.GET("/geoip", test.TestGeoIp)
-			testGroup.POST("/sendMessage", test.TestSendMessage)
-		}
-		// update
-		updateGroup := adminAuthrized.Group("/update")
-		{
-			updateGroup.POST("/mmdb", update.UpdateMmdbGeoIP)
-			updateGroup.POST("/user", update.UpdateUser)
-			updateGroup.PUT("/favicon", update.UploadFavicon)
-			updateGroup.POST("/favicon", update.DeleteFavicon)
-		}
-		// tasks
-		taskGroup := adminAuthrized.Group("/task")
-		{
-			taskGroup.GET("/all", admin.GetTasks)
-			taskGroup.POST("/exec", admin.Exec)
-			taskGroup.GET("/:task_id", admin.GetTaskById)
-			taskGroup.GET("/:task_id/result", admin.GetTaskResultsByTaskId)
-			taskGroup.GET("/:task_id/result/:uuid", admin.GetSpecificTaskResult)
-			taskGroup.GET("/client/:uuid", admin.GetTasksByClientId)
-		}
-		// settings
-		settingsGroup := adminAuthrized.Group("/settings")
-		{
-			settingsGroup.GET("/", admin.GetSettings)
-			settingsGroup.POST("/", admin.EditSettings)
-			settingsGroup.POST("/oidc", admin.SetOidcProvider)
-			settingsGroup.GET("/oidc", admin.GetOidcProvider)
-			settingsGroup.POST("/message-sender", admin.SetMessageSenderProvider)
-			settingsGroup.GET("/message-sender", admin.GetMessageSenderProvider)
-		}
-		// themes
-		themeGroup := adminAuthrized.Group("/theme")
-		{
-			themeGroup.PUT("/upload", admin.UploadTheme)
-			themeGroup.GET("/list", admin.ListThemes)
-			themeGroup.POST("/delete", admin.DeleteTheme)
-			themeGroup.GET("/set", admin.SetTheme)
-			themeGroup.POST("/update", admin.UpdateTheme)
-		}
-		// clients
-		clientGroup := adminAuthrized.Group("/client")
-		{
-			clientGroup.POST("/add", admin.AddClient)
-			clientGroup.GET("/list", admin.ListClients)
-			clientGroup.GET("/:uuid", admin.GetClient)
-			clientGroup.POST("/:uuid/edit", admin.EditClient)
-			clientGroup.POST("/:uuid/remove", admin.RemoveClient)
-			clientGroup.GET("/:uuid/token", admin.GetClientToken)
-			clientGroup.POST("/order", admin.OrderWeight)
-			// client terminal
-			clientGroup.GET("/:uuid/terminal", api.RequestTerminal)
-		}
-
-		// records
-		recordGroup := adminAuthrized.Group("/record")
-		{
-			recordGroup.POST("/clear", admin.ClearRecord)
-			recordGroup.POST("/clear/all", admin.ClearAllRecords)
-		}
-		// oauth2
-		oauth2Group := adminAuthrized.Group("/oauth2")
-		{
-			oauth2Group.GET("/bind", admin.BindingExternalAccount)
-			oauth2Group.POST("/unbind", admin.UnbindExternalAccount)
-		}
-		sessionGroup := adminAuthrized.Group("/session")
-		{
-			sessionGroup.GET("/get", admin.GetSessions)
-			sessionGroup.POST("/remove", admin.DeleteSession)
-			sessionGroup.POST("/remove/all", admin.DeleteAllSession)
-		}
-		two_factorGroup := adminAuthrized.Group("/2fa")
-		{
-			two_factorGroup.GET("/generate", admin.Generate2FA)
-			two_factorGroup.POST("/enable", admin.Enable2FA)
-			two_factorGroup.POST("/disable", admin.Disable2FA)
-		}
-		adminAuthrized.GET("/logs", log_api.GetLogs)
-
-		// clipboard
-		clipboardGroup := adminAuthrized.Group("/clipboard")
-		{
-			clipboardGroup.GET("/:id", clipboard.GetClipboard)
-			clipboardGroup.GET("", clipboard.ListClipboard)
-			clipboardGroup.POST("", clipboard.CreateClipboard)
-			clipboardGroup.POST("/:id", clipboard.UpdateClipboard)
-			clipboardGroup.POST("/remove", clipboard.BatchDeleteClipboard)
-			clipboardGroup.POST("/:id/remove", clipboard.DeleteClipboard)
-		}
-
-		notificationGroup := adminAuthrized.Group("/notification")
-		{
-			// offline notifications
-			notificationGroup.GET("/offline", notification.ListOfflineNotifications)
-			notificationGroup.POST("/offline/edit", notification.EditOfflineNotification)
-			notificationGroup.POST("/offline/enable", notification.EnableOfflineNotification)
-			notificationGroup.POST("/offline/disable", notification.DisableOfflineNotification)
-			loadAlertGroup := notificationGroup.Group("/load")
-			{
-				loadAlertGroup.GET("/", notification.GetAllLoadNotifications)
-				loadAlertGroup.POST("/add", notification.AddLoadNotification)
-				loadAlertGroup.POST("/delete", notification.DeleteLoadNotification)
-				loadAlertGroup.POST("/edit", notification.EditLoadNotification)
-			}
-		}
-
-		pingTaskGroup := adminAuthrized.Group("/ping")
-		{
-			pingTaskGroup.GET("/", admin.GetAllPingTasks)
-			pingTaskGroup.POST("/add", admin.AddPingTask)
-			pingTaskGroup.POST("/delete", admin.DeletePingTask)
-			pingTaskGroup.POST("/edit", admin.EditPingTask)
-
-		}
-
-	}
-
-	public.Static(r.Group("/"), func(handlers ...gin.HandlerFunc) {
-		r.NoRoute(handlers...)
-	})
-	// #region 静态文件服务
-	public.UpdateIndex(conf)
-	config.Subscribe(func(event config.ConfigEvent) {
-		public.UpdateIndex(event.New)
-	})
-
-	srv := &http.Server{
-		Addr:    flags.Listen,
-		Handler: r,
-	}
-	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()
-	cfg, _ := config.Get()
-	go notifier.CheckExpireScheduledWork()
-	for {
-		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()
-			}
-		}
-	}
-
-}
-
-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()
-}

database/clients/client.go

@@ -1,288 +0,0 @@
-package clients
-
-import (
-	"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 {
-		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()
-
-	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")
-	}
-
-	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,136 +0,0 @@
-package clients
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"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
-	err = db.Where("token = ?", token).First(&client).Error
-	if err != nil {
-		return "", err
-	}
-	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
-}
-
-// SaveClientReport 保存客户端报告到 Record 表
-func SaveClientReport(clientUUID string, report common.Report) (err error) {
-	db := dbcore.GetDBInstance()
-
-	Record := models.Record{
-		Client:         clientUUID,
-		Time:           models.FromTime(time.Now()),
-		Cpu:            float32(report.CPU.Usage),
-		Gpu:            0, // Report 未提供 GPU Usage，设为 0（与原 nil 行为类似）
-		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,
-	}
-
-	// 使用事务确保 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
-	}
-
-	return nil
-}
-
-/*
-// getString 从 map 中获取字符串
-func getString(data map[string]interface{}, key string) string {
-	if val, ok := data[key]; ok {
-		if str, ok := val.(string); ok {
-			return str
-		}
-	}
-	return ""
-}
-
-// getInt 从 map 中获取整数
-func getInt(data map[string]interface{}, key string) int {
-	if val, ok := data[key]; ok {
-		if num, ok := val.(float64); ok {
-			return int(num)
-		}
-	}
-	return 0
-}
-
-// getInt64 从 map 中获取 int64
-func getInt64(data map[string]interface{}, key string) int64 {
-	if val, ok := data[key]; ok {
-		if num, ok := val.(float64); ok {
-			return int64(num)
-		}
-	}
-	return 0
-}
-
-// getFloat 从 map 中获取 float64
-func getFloat(data map[string]interface{}, key string) float64 {
-	if val, ok := data[key]; ok {
-		if num, ok := val.(float64); ok {
-			return num
-		}
-	}
-	return 0.0
-}
-*/

database/config/config.go

@@ -1,101 +0,0 @@
-package config
-
-import (
-	"errors"
-	"log"
-	"sync"
-	"time"
-
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
-	"gorm.io/gorm"
-)
-
-var mu sync.Mutex
-
-func init() {
-	mu = sync.Mutex{}
-}
-
-func Get() (models.Config, error) {
-	mu.Lock()
-	defer mu.Unlock()
-	db := dbcore.GetDBInstance()
-	var config models.Config
-	if err := db.First(&config).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			config = models.Config{
-				ID:            1,
-				Sitename:      "Komari",
-				Description:   "Komari Monitor, a simple server monitoring tool.",
-				AllowCors:     false,
-				OAuthEnabled:  false,
-				GeoIpEnabled:  true,
-				GeoIpProvider: "ip-api",
-				UpdatedAt:     models.FromTime(time.Now()),
-				CreatedAt:     models.FromTime(time.Now()),
-			}
-			if err := db.Create(&config).Error; err != nil {
-				log.Fatal("Failed to create default config:", err)
-			}
-			return config, nil
-		}
-		return config, err
-	}
-	return config, nil
-}
-
-func Save(cst models.Config) error {
-	db := dbcore.GetDBInstance()
-	oldConfig, _ := Get()
-	// Only one records
-	cst.ID = 1
-	cst.UpdatedAt = models.FromTime(time.Now())
-	if err := db.Model(&models.Config{}).Where("id = ?", cst.ID).
-		Select("*").
-		Updates(cst).Error; err != nil {
-		return err
-	}
-	newConfig, _ := Get()
-	publishEvent(oldConfig, newConfig)
-	return nil
-}
-
-func Update(cst map[string]interface{}) error {
-	db := dbcore.GetDBInstance()
-	oldConfig, _ := Get()
-	// Proceed with update
-	cst["id"] = 1
-	cst["updated_at"] = time.Now()
-	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)")
-	}
-
-	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/config/events.go

@@ -1,38 +0,0 @@
-package config
-
-import (
-	"sync"
-
-	"github.com/komari-monitor/komari/database/models"
-)
-
-// ConfigEvent represents a configuration change event
-type ConfigEvent struct {
-	Old models.Config
-	New models.Config
-}
-
-// 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 models.Config) {
-	subscribersMu.RLock()
-	defer subscribersMu.RUnlock()
-	event := ConfigEvent{Old: oldVal, New: newVal}
-	for _, sub := range subscribers {
-		go sub(event)
-	}
-}

database/dbcore/dbcore.go

@@ -1,293 +0,0 @@
-package dbcore
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"sync"
-
-	"github.com/komari-monitor/komari/cmd/flags"
-	"github.com/komari-monitor/komari/common"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/utils"
-	"gorm.io/driver/mysql"
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-)
-
-// 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
-
-		logConfig := &gorm.Config{
-			Logger: logger.Default.LogMode(logger.Silent),
-		}
-
-		if utils.VersionHash == "unknown" {
-			logConfig = &gorm.Config{
-				Logger: logger.Default.LogMode(logger.Info),
-			}
-		}
-
-		// 根据数据库类型选择不同的连接方式
-		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)
-
-		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)
-		}
-		MergeDatabase(instance)
-		// 自动迁移模型
-		err = instance.AutoMigrate(
-			&models.User{},
-			&models.Client{},
-			&models.Record{},
-			&models.Config{},
-			&models.Log{},
-			&models.Clipboard{},
-			&models.LoadNotification{},
-			&models.OfflineNotification{},
-			&models.PingRecord{},
-			&models.PingTask{},
-			&models.OidcProvider{},
-			&models.MessageSenderProvider{},
-		)
-		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.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/models/UTCTime.go

@@ -1,121 +0,0 @@
-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/config.go

@@ -1,33 +0,0 @@
-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:''"` // 自动发现密钥
-	// 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
-	// 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'"`
-	ExpireNotificationEnabled  bool   `json:"expire_notification_enabled" gorm:"default:false"` // 是否启用过期通知
-	ExpireNotificationLeadDays int    `json:"expire_notification_lead_days" gorm:"default:7"`   // 过期前多少天通知，默认7天
-	// 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

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

database/models/theme.go

@@ -1,12 +0,0 @@
-package models
-
-// Theme represents a komari theme information
-type Theme struct {
-	Name        string `json:"name"`        // 主题名称
-	Short       string `json:"short"`       // 短名称，用作文件夹名
-	Description string `json:"description"` // 主题描述
-	Version     string `json:"version"`     // 版本号
-	Author      string `json:"author"`      // 作者
-	URL         string `json:"url"`         // 主题URL
-	Preview     string `json:"preview"`     // 预览图片相对路径
-}

docs/README_ja.md

@@ -1,43 +1,44 @@
+# Komari
 
-# Komari 
 ![Badge](https://hitscounter.dev/api/hit?url=https%3A%2F%2Fgithub.com%2Fkomari-monitor%2Fkomari&label=&icon=github&color=%23a370f7&message=&style=flat&tz=UTC)
 
 ![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 インターフェース**: 直感的な監視ダッシュボードで、使いやすいです。
 
 ## クイックスタート
 
 ### 0. クラウドホスティングによるワンクリック展開
-- Rainyun - CNY 4.5/月 
 
-[![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_) 
+- Rainyun - CNY 4.5/月
 
-- Claw Run - USD 1.5/月
-
-[![](https://raw.githubusercontent.com/ClawCloud/Run-Template/refs/heads/main/Run-on-ClawCloud.svg)](https://template.run.claw.cloud/?openapp=system-fastdeploy%3FtemplateName%3Dkomari)
+[![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_)
 
 ### 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
 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 \
@@ -55,8 +56,9 @@ sudo ./install-komari.sh
 > 環境変数 `ADMIN_USERNAME` と `ADMIN_PASSWORD` を使用して、初期のユーザー名とパスワードをカスタマイズすることもできます。
 
 ### 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
    ```
@@ -66,12 +68,11 @@ sudo ./install-komari.sh
 > [!NOTE]
 > バイナリに実行権限があることを確認してください（`chmod +x komari`）。データは実行ディレクトリの `data` フォルダに保存されます。
 
-
 ### 手動ビルド
 
 #### 依存関係
 
-- Go 1.18+ および Node.js 20+（手動ビルド用）
+- Go 1.24+ および Node.js 20+（手動ビルド用）
 
 1. フロントエンドの静的ファイルをビルドします:
    ```bash
@@ -85,31 +86,50 @@ sudo ./install-komari.sh
    git clone https://github.com/komari-monitor/komari
    cd komari
    ```
-   ステップ1で生成された静的ファイルを `komari` プロジェクトのルートにある `/public/dist` フォルダにコピーします。
-   ```bash 
+   ステップ 1 で生成された静的ファイルを `komari` プロジェクトのルートにある `/public/dist` フォルダにコピーします。
+   ```bash
    go build -o komari
    ```
-4. 実行:
+3. 実行:
    ```bash
    ./komari server -l 0.0.0.0:25774
    ```
    デフォルトのリスニングポートは `25774` です。`http://localhost:25774` にアクセスします。
 
 ## フロントエンド開発ガイド
-[Komariテーマ開発ガイド | Komari](https://komari-document.pages.dev/dev/theme.html)
 
-[CrowdinでKomariを翻訳する](https://crowdin.com/project/komari/invite?h=cd051bf172c9a9f7f1360e87ffb521692507706)
+[Komari テーマ開発ガイド | Komari](https://komari-document.pages.dev/dev/theme.html)
+
+[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 を歓迎します！
 
 ## 謝辞
- - こんなに暇でいられる自分に感謝
- - PRを提出し、テーマを作成してくれたすべての開発者
 
-## Star履歴
+### DreamCloud
+
+[DreamCloud - コストパフォーマンスに優れたアジア太平洋向け高防御直通](https://as211392.com/)
+
+### 🚀 SharonNetworks スポンサー
+
+[![Sharon Networks](https://raw.githubusercontent.com/komari-monitor/public/refs/heads/main/images/sharon-networks.webp)](https://sharon.io)
+
+SharonNetworks は、あなたのビジネスの離陸を力強くサポートします！
+
+アジア太平洋のデータセンターから中国最適化ネットワーク接続を提供。低レイテンシー & 高帯域幅、Tbps 級のローカル洗浄 DDoS 防御で、ビジネスとお客様の体験を守ります。コミュニティ [Telegram グループ](https://t.me/SharonNetwork) に参加すると、チャリティまたはグループ内抽選で無料利用のチャンスがあります。
+
+### オープンソースコミュニティ
+
+PR を送ってくれた方、テーマを作成してくれた全ての開発者
+
+—— そして：こんなに暇でいられる自分に感謝
+
+## 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

@@ -1,5 +1,5 @@
+# Komari
 
-# Komari 
 ![Badge](https://hitscounter.dev/api/hit?url=https%3A%2F%2Fgithub.com%2Fkomari-monitor%2Fkomari&label=&icon=github&color=%23a370f7&message=&style=flat&tz=UTC)
 
 ![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)
@@ -9,6 +9,7 @@ Komari 是一款輕量級的自託管伺服器監控工具，旨在提供簡單
 [文檔](https://komari-document.pages.dev/) | [Telegram 群組](https://t.me/komari_monitor)
 
 ## 特性
+
 - **輕量高效**：低資源佔用，適合各種規模的伺服器。
 - **自託管**：完全掌控數據隱私，部署簡單。
 - **Web 介面**：直觀的監控儀表盤，易於使用。
@@ -17,16 +18,14 @@ Komari 是一款輕量級的自託管伺服器監控工具，旨在提供簡單
 
 ### 0. 容器雲一鍵部署
 
-- 雨雲雲應用 - CNY 4.5/月 
+- 雨雲雲應用 - CNY 4.5/月
 
-[![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_) 
-
-- Claw Run - USD 1.5/月
-
-[![](https://raw.githubusercontent.com/ClawCloud/Run-Template/refs/heads/main/Run-on-ClawCloud.svg)](https://template.run.claw.cloud/?openapp=system-fastdeploy%3FtemplateName%3Dkomari)
+[![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_)
 
 ### 1. 使用一鍵安裝腳本
+
 適用於使用了 systemd 的發行版（Ubuntu、Debian...）。
+
 ```bash
 curl -fsSL https://raw.githubusercontent.com/komari-monitor/komari/main/install-komari.sh -o install-komari.sh
 chmod +x install-komari.sh
@@ -34,6 +33,7 @@ sudo ./install-komari.sh
 ```
 
 ### 2. Docker 部署
+
 1. 建立資料目錄：
    ```bash
    mkdir -p ./data
@@ -56,6 +56,7 @@ sudo ./install-komari.sh
 > 你也可以透過環境變數 `ADMIN_USERNAME` 和 `ADMIN_PASSWORD` 自訂初始使用者名稱和密碼。
 
 ### 3. 二進位檔案部署
+
 1. 存取 Komari 的 [GitHub Release 頁面](https://github.com/komari-monitor/komari/releases) 下載適用於你作業系統的最新二進位檔案。
 2. 執行 Komari：
    ```bash
@@ -67,12 +68,11 @@ sudo ./install-komari.sh
 > [!NOTE]
 > 確保二進位檔案具有可執行權限（`chmod +x komari`）。資料將保存在執行目錄下的 `data` 資料夾中。
 
-
 ### 手工建置
 
 #### 依賴
 
-- Go 1.18+ 和 Node.js 20+（手工建置）
+- Go 1.24+ 和 Node.js 20+（手工建置）
 
 1. 建置前端靜態檔案：
    ```bash
@@ -86,33 +86,50 @@ sudo ./install-komari.sh
    git clone https://github.com/komari-monitor/komari
    cd komari
    ```
-   將步驟1中產生的靜態檔案複製到 `komari` 專案根目錄下的 `/public/dist` 資料夾。
-   ```bash 
+   將步驟 1 中產生的靜態檔案複製到 `komari` 專案根目錄下的 `/public/dist` 資料夾。
+   ```bash
    go build -o komari
    ```
-4. 執行：
+3. 執行：
    ```bash
    ./komari server -l 0.0.0.0:25774
    ```
    預設監聽 `25774` 連接埠，存取 `http://localhost:25774`。
 
 ## 前端開發指南
+
 [Komari 主題開發指南 | Komari](https://komari-document.pages.dev/dev/theme.html)
 
 [在 Crowdin 上翻譯 Komari](https://crowdin.com/project/komari/invite?h=cd051bf172c9a9f7f1360e87ffb521692507706)
 
 ## 客戶端 Agent 開發指南
+
 [Komari Agent 資訊上報與事件處理文檔](https://komari-document.pages.dev/dev/agent.html)
 
 ## 貢獻
+
 歡迎提交 Issue 或 Pull Request！
 
 ## 鳴謝
- - [DreamCloud - 极高性价比解锁直连亚太高防](https://as211392.com/)
- - 感謝我自己能這麼閒
- - 提交PR、製作主題的各位開發者
+
+### DreamCloud
+
+[DreamCloud - 極高性價比解鎖直連亞太高防](https://as211392.com/)
+
+### 🚀 由 SharonNetworks 贊助
+
+[![Sharon Networks](https://raw.githubusercontent.com/komari-monitor/public/refs/heads/main/images/sharon-networks.webp)](https://sharon.io)
+
+SharonNetworks 為您的業務起飛保駕護航！
+
+亞太資料中心提供頂級的中國優化網路接入 · 低延遲 & 高頻寬 & 提供 Tbps 級本地清洗高防服務，為您的業務保駕護航，為您的客戶提供極致體驗。加入社群 [Telegram 群組](https://t.me/SharonNetwork) 可參與公益募捐或群內抽獎免費使用。
+
+### 開源社群
+
+提交 PR、製作主題的各位開發者
+
+—— 以及：感謝我自己能這麼閒
 
 ## Star History
 
 [![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.md

@@ -1,14 +1,15 @@
+# Komari
 
-# Komari 
 ![Badge](https://hitscounter.dev/api/hit?url=https%3A%2F%2Fgithub.com%2Fkomari-monitor%2Fkomari&label=&icon=github&color=%23a370f7&message=&style=flat&tz=UTC)
 
 ![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 界面查看服务器状态，并通过轻量级 Agent 收集数据。
 
-[文档](https://komari-document.pages.dev/) | [Telegram 群组](https://t.me/komari_monitor)
+[文档](https://komari-document.pages.dev/) | [文档(镜像站 By Geekertao)](https://www.komari.wiki) | [Telegram 群组](https://t.me/komari_monitor)
 
 ## 特性
+
 - **轻量高效**：低资源占用，适合各种规模的服务器。
 - **自托管**：完全掌控数据隐私，部署简单。
 - **Web 界面**：直观的监控仪表盘，易于使用。
@@ -17,16 +18,14 @@ Komari 是一款轻量级的自托管服务器监控工具，旨在提供简单
 
 ### 0. 容器云一键部署
 
-- 雨云云应用 - CNY 4.5/月 
+- 雨云云应用 - CNY 4.5/月
 
-[![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_) 
-
-- Claw Run - USD 1.5/月
-
-[![](https://raw.githubusercontent.com/ClawCloud/Run-Template/refs/heads/main/Run-on-ClawCloud.svg)](https://template.run.claw.cloud/?openapp=system-fastdeploy%3FtemplateName%3Dkomari)
+[![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_)
 
 ### 1. 使用一键安装脚本
+
 适用于使用了 systemd 的发行版（Ubuntu、Debian...）。
+
 ```bash
 curl -fsSL https://raw.githubusercontent.com/komari-monitor/komari/main/install-komari.sh -o install-komari.sh
 chmod +x install-komari.sh
@@ -34,6 +33,7 @@ sudo ./install-komari.sh
 ```
 
 ### 2. Docker 部署
+
 1. 创建数据目录：
    ```bash
    mkdir -p ./data
@@ -56,6 +56,7 @@ sudo ./install-komari.sh
 > 你也可以通过环境变量 `ADMIN_USERNAME` 和 `ADMIN_PASSWORD` 自定义初始用户名和密码。
 
 ### 3. 二进制文件部署
+
 1. 访问 Komari 的 [GitHub Release 页面](https://github.com/komari-monitor/komari/releases) 下载适用于你操作系统的最新二进制文件。
 2. 运行 Komari：
    ```bash
@@ -67,12 +68,11 @@ sudo ./install-komari.sh
 > [!NOTE]
 > 确保二进制文件具有可执行权限（`chmod +x komari`）。数据将保存在运行目录下的 `data` 文件夹中。
 
-
 ### 手工构建
 
 #### 依赖
 
-- Go 1.18+ 和 Node.js 20+（手工构建）
+- Go 1.24+ 和 Node.js 20+（手工构建）
 
 1. 构建前端静态文件：
    ```bash
@@ -86,31 +86,49 @@ sudo ./install-komari.sh
    git clone https://github.com/komari-monitor/komari
    cd komari
    ```
-   将步骤1中生成的静态文件复制到 `komari` 项目根目录下的 `/public/dist` 文件夹。
-   ```bash 
+   将步骤 1 中生成的静态文件复制到 `komari` 项目根目录下的 `/public/dist` 文件夹。
+   ```bash
    go build -o komari
    ```
-4. 运行：
+3. 运行：
    ```bash
    ./komari server -l 0.0.0.0:25774
    ```
    默认监听 `25774` 端口，访问 `http://localhost:25774`。
 
 ## 前端开发指南
+
 [Komari 主题开发指南 | Komari](https://komari-document.pages.dev/dev/theme.html)
 
 [在 Crowdin 上翻译 Komari](https://crowdin.com/project/komari/invite?h=cd051bf172c9a9f7f1360e87ffb521692507706)
 
 ## 客户端 Agent 开发指南
+
 [Komari Agent 信息上报与事件处理文档](https://komari-document.pages.dev/dev/agent.html)
 
 ## 贡献
+
 欢迎提交 Issue 或 Pull Request！
 
 ## 鸣谢
- - [DreamCloud - 极高性价比解锁直连亚太高防](https://as211392.com/)
- - 感谢我自己能这么闲
- - 提交PR、制作主题的各位开发者
+
+### DreamCloud
+
+[DreamCloud - 极高性价比解锁直连亚太高防](https://as211392.com/)
+
+### 🚀 由 SharonNetworks 赞助
+
+[![Sharon Networks](https://raw.githubusercontent.com/komari-monitor/public/refs/heads/main/images/sharon-networks.webp)](https://sharon.io)
+
+SharonNetworks 为您的业务起飞保驾护航！
+
+亚太数据中心提供顶级的中国优化网络接入 · 低延时 & 高带宽 & 提供 Tbps 级本地清洗高防服务，为您的业务保驾护航，为您的客户提供极致体验。加入社区 [Telegram 群组](https://t.me/SharonNetwork) 可参与公益募捐或群内抽奖免费使用。
+
+### 开源社区
+
+提交 PR、制作主题的各位开发者
+
+—— 以及：感谢我自己能这么闲
 
 ## Star History
 

go.mod

@@ -1,29 +1,37 @@
 module github.com/komari-monitor/komari
 
-go 1.23.2
+go 1.24.0
+
+toolchain go1.24.11
 
 require (
+	github.com/coreos/go-oidc/v3 v3.15.0
+	github.com/dop251/goja v0.0.0-20251008123653-cf18d89f3cf6
+	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
+	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
 // golang.org/x/crypto Vulnerable to Denial of Service (DoS) via Slow or Incomplete Key Exchange #3
-require golang.org/x/crypto v0.37.0 // indirect
+require golang.org/x/crypto v0.39.0 // indirect
 
 // HTTP Proxy bypass using IPv6 Zone IDs in golang.org/x/net #2
 // golang.org/x/net vulnerable to Cross-site Scripting #4
-require golang.org/x/net v0.39.0 // indirect
+require golang.org/x/net v0.41.0 // indirect
 
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
@@ -32,20 +40,24 @@ require (
 	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
 	github.com/gin-contrib/sse v1.0.0 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.1 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.26.0 // indirect
+	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
 	github.com/go-sql-driver/mysql v1.9.2 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/google/go-cmp v0.6.0 // 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
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-sqlite3 v1.14.27 // indirect
@@ -58,9 +70,10 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	golang.org/x/arch v0.15.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
-	golang.org/x/text v0.25.0 // indirect
-	google.golang.org/protobuf v1.36.6 // 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
+	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

@@ -1,5 +1,7 @@
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
+github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI=
 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
@@ -10,17 +12,31 @@ github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFos
 github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
 github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
+github.com/coreos/go-oidc/v3 v3.15.0 h1:R6Oz8Z4bqWR7VFQ+sPSvZPQv4x8M+sJkDO5ojgwlyAg=
+github.com/coreos/go-oidc/v3 v3.15.0/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
+github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dop251/goja v0.0.0-20251008123653-cf18d89f3cf6 h1:6dE1TmjqkY6tehR4A67gDNhvDtuZ54ocu7ab4K9o540=
+github.com/dop251/goja v0.0.0-20251008123653-cf18d89f3cf6/go.mod h1:MxLav0peU43GgvwVgNbLAj1s/bSGboKkhuULvq/7hx4=
+github.com/dop251/goja_nodejs v0.0.0-20251015164255-5e94316bedaf h1:gbmvliZnCut4NjaPSNOQlfqBoZ9C5Dpf72mHMMYhgVE=
+github.com/dop251/goja_nodejs v0.0.0-20251015164255-5e94316bedaf/go.mod h1:Tb7Xxye4LX7cT3i8YLvmPMGCV92IOi4CDZvm/V8ylc0=
 github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
 github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
 github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
 github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
 github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
 github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/go-jose/go-jose/v4 v4.1.1 h1:JYhSgy4mXXzAdF3nUx3ygx347LRXJRrpgyU3adRmkAI=
+github.com/go-jose/go-jose/v4 v4.1.1/go.mod h1:BdsZGqgdO3b6tTc6LSE56wcDbMMLuPsw5d4ZD5f94kA=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -29,16 +45,26 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
 github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
+github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q=
+github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/go-sql-driver/mysql v1.9.2 h1:4cNKDYQ1I84SXslGddlsrMhc8k4LeDVj6Ad6WRjiHuU=
 github.com/go-sql-driver/mysql v1.9.2/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
+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=
@@ -83,7 +109,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pquerna/otp v1.5.0 h1:NMMR+WrmaqXU4EzdGJEE1aUUI0AMRzsp96fFFWNPwxs=
 github.com/pquerna/otp v1.5.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -107,17 +132,41 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
+go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
+go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
+go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
+go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
+go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
+go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
+go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
+go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
+go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
 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.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
-golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
-golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
-golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+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/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=
+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+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=
+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=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4=
+google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
 google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -125,6 +174,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/all.go

@@ -0,0 +1,29 @@
+package internal
+
+import (
+	// Import all internal packages to ensure their init() functions are executed
+	_ "github.com/komari-monitor/komari/internal/api_rpc"
+	_ "github.com/komari-monitor/komari/internal/api_v1"
+	_ "github.com/komari-monitor/komari/internal/client"
+	_ "github.com/komari-monitor/komari/internal/cloudflared"
+	_ "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/eventType"
+	_ "github.com/komari-monitor/komari/internal/geoip"
+	_ "github.com/komari-monitor/komari/internal/jsruntime"
+	_ "github.com/komari-monitor/komari/internal/log"
+	_ "github.com/komari-monitor/komari/internal/messageSender"
+	_ "github.com/komari-monitor/komari/internal/mjpeg"
+	_ "github.com/komari-monitor/komari/internal/nezha"
+	_ "github.com/komari-monitor/komari/internal/notifier"
+	_ "github.com/komari-monitor/komari/internal/oauth"
+	_ "github.com/komari-monitor/komari/internal/patch"
+	_ "github.com/komari-monitor/komari/internal/pingSchedule"
+	_ "github.com/komari-monitor/komari/internal/plugin"
+	_ "github.com/komari-monitor/komari/internal/renewal"
+	_ "github.com/komari-monitor/komari/internal/restore"
+	_ "github.com/komari-monitor/komari/internal/ws"
+)
+
+func All() {}

internal/api_rpc/JsonRpc.go

@@ -0,0 +1,272 @@
+package api_rpc
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"io"
+	"net/http"
+	"reflect"
+	"strings"
+	"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"
+)
+
+func RegisterRouters(path string, r *gin.Engine) {
+	r.GET(path, OnRpcRequest)
+	r.POST(path, OnRpcRequest)
+}
+
+// Json Rpc2 over websocket, /api/rpc2
+func OnRpcRequest(c *gin.Context) {
+
+	// GET -> WebSocket
+	if c.Request.Method == http.MethodGet {
+		_conn, err := ws.UpgradeRequest(c, func(r *http.Request) bool {
+			if conf.Conf.Site.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"})
+			return
+		}
+		permissionGroup := detectPermissionGroup(c)
+		meta := buildContextMeta(c, permissionGroup)
+		defer conn.Close()
+		for {
+			var req rpc.JsonRpcRequest
+			err := conn.ReadJSON(&req)
+			if err != nil {
+				// JSON 解析
+				var se *json.SyntaxError
+				var ute *json.UnmarshalTypeError
+				if errors.As(err, &se) || errors.As(err, &ute) {
+					conn.WriteJSON(rpc.ErrorResponse(nil, rpc.InvalidRequest, "bad request: "+err.Error(), nil))
+					continue
+				}
+				// 其它视为连接/IO 错误
+				break
+			}
+			if jerr := req.Validate(); jerr != nil {
+				conn.WriteJSON(jerr.ResponseWithID(req.ID))
+				continue
+			}
+			dispatchByPermissionWithMeta(conn, permissionGroup, meta, &req)
+		}
+		return
+	}
+
+	// 否则按 HTTP POST JSON-RPC 处理 (支持单个或批量)
+	if c.Request.Method != http.MethodPost {
+		c.JSON(http.StatusMethodNotAllowed, gin.H{"error": "method not allowed"})
+		return
+	}
+	body, err := io.ReadAll(c.Request.Body)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, rpc.ErrorResponse(nil, rpc.ParseError, "read body error", err.Error()))
+		return
+	}
+	requests, jerr := rpc.ParseRequests(body)
+	if jerr != nil {
+		c.JSON(http.StatusBadRequest, jerr.Response())
+		return
+	}
+	permissionGroup := detectPermissionGroup(c)
+	meta := buildContextMeta(c, permissionGroup)
+	// 批量
+	responses := make([]*rpc.JsonRpcResponse, 0, len(requests))
+	for _, rreq := range requests {
+		// 权限与命名空间
+		fc := strings.Split(rreq.Method, ":")
+		if len(fc) == 1 {
+			fc[0] = "common"
+		}
+		allowed := false
+		switch fc[0] {
+		case "guest", "", "rpc", "common":
+			allowed = true
+		case GroupClient:
+			if permissionGroup == GroupClient || permissionGroup == "admin" {
+				allowed = true
+			}
+		case "admin":
+			if permissionGroup == "admin" {
+				allowed = true
+			}
+		default:
+			responses = append(responses, rpc.ErrorResponse(rreq.ID, rpc.Unauthenticated, "Unauthorized", nil))
+			continue
+		}
+		if !allowed {
+			responses = append(responses, rpc.ErrorResponse(rreq.ID, rpc.PermissionDenied, "Permission denied", nil))
+			continue
+		}
+		responses = append(responses, rpc.CallWithContext(rpc.NewContextWithMeta(context.TODO(), meta), rreq.ID, rreq.Method, rreq.Params))
+	}
+	// 单个请求直接对象，批量请求数组 (符合 JSON-RPC 2.0)
+	if len(responses) == 1 {
+		c.JSON(http.StatusOK, responses[0])
+	} else {
+		c.JSON(http.StatusOK, responses)
+	}
+}
+
+// detectPermissionGroup 提取权限分组，与原逻辑保持一致
+func detectPermissionGroup(c *gin.Context) string {
+	permissionGroup := "guest"
+	token := c.Query("token")
+	if _, err := client.GetClientUUIDByToken(token); err == nil {
+		permissionGroup = GroupClient
+	}
+	if session_token, _ := c.Cookie("session_token"); session_token != "" {
+		if _, err := accounts.GetUserBySession(session_token); err == nil {
+			permissionGroup = "admin"
+		}
+	}
+	apiKey := c.GetHeader("Authorization")
+	if apiKey == "Bearer "+conf.Conf.Login.ApiKey {
+		permissionGroup = "admin"
+	}
+	return permissionGroup
+}
+
+// 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")
+	if token == "" {
+		// 兼容 header Bearer <token>
+		hAuth := c.GetHeader("Authorization")
+		if strings.HasPrefix(hAuth, "Bearer ") {
+			token = strings.TrimPrefix(hAuth, "Bearer ")
+		}
+	}
+	if token != "" {
+		if uuid, err := client.GetClientUUIDByToken(token); err == nil {
+			meta.ClientToken = token
+			meta.ClientUUID = uuid
+		}
+	}
+	// 提取用户 (session cookie)
+	if session_token, _ := c.Cookie("session_token"); session_token != "" {
+		if user, err := accounts.GetUserBySession(session_token); err == nil {
+			meta.User = &user
+			meta.UserUUID = user.UUID
+		}
+	}
+	meta.RemoteIP = c.ClientIP()
+	meta.UserAgent = c.GetHeader("User-Agent")
+	return meta
+}
+
+// dispatchByPermissionWithMeta 与原函数类似，但会携带 meta 上下文给 handler
+func dispatchByPermissionWithMeta(conn *ws.SafeConn, permissionGroup string, meta *rpc.ContextMeta, req *rpc.JsonRpcRequest) {
+	fc := strings.Split(req.Method, ":")
+	if len(fc) == 1 {
+		fc[0] = "common"
+	}
+	ctx := rpc.NewContextWithMeta(context.Background(), 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" {
+			go conn.WriteJSON(rpc.CallWithContext(ctx, req.ID, req.Method, req.Params))
+		} else {
+			conn.WriteJSON(rpc.ErrorResponse(req.ID, rpc.PermissionDenied, "Permission Denied", 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))
+		}
+	default:
+		conn.WriteJSON(rpc.ErrorResponse(req.ID, rpc.Unauthenticated, "Unauthenticated", 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
+	registry   = make(map[string]reflect.Value)
+)
+
+// Register 将以分组common注册
+func Register(name string, cb rpc.Handler) error {
+	return RegisterWithGroupAndMeta(name, "common", cb, &rpc.MethodMeta{
+		Name:        name,
+		Summary:     "This method does not provide a summary",
+		Description: "This method does not provide a description",
+	})
+}
+
+// RegisterWithGroup 将回调按分组注册。
+// 传入函数:       Register("ns", someFunc) -> 注册 ns:SomeFunc
+// group 为空时使用默认分组 "common"。
+func RegisterWithGroupAndMeta(name, group string, cb rpc.Handler, meta *rpc.MethodMeta) error {
+	return rpc.RegisterWithMeta(group+":"+name, cb, meta)
+}
+
+// GetRegisteredKeys 返回已注册的方法 key 列表 (调试用)。
+func GetRegisteredKeys() []string {
+	registryMu.RLock()
+	defer registryMu.RUnlock()
+	keys := make([]string, 0, len(registry))
+	for k := range registry {
+		keys = append(keys, k)
+	}
+	return keys
+}

internal/api_rpc/client.go

@@ -0,0 +1,31 @@
+package api_rpc
+
+import (
+	"context"
+
+	"github.com/komari-monitor/komari/pkg/rpc"
+)
+
+const GroupClient = "client"
+
+func init() {
+	RegisterWithGroupAndMeta("register", GroupClient, registerClient, &rpc.MethodMeta{
+		Name:        "RegisterClient",
+		Description: "Register a new client with the server (Auto discovery).",
+		Params: []rpc.ParamMeta{
+			{
+				Name:        "name",
+				Type:        "string",
+				Description: "The name of the client to register.",
+			},
+		},
+	})
+}
+
+func registerClient(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError) {
+	var params struct {
+		Name string `json:"name"`
+	}
+	req.BindParams(&params)
+	return nil, rpc.MakeError(rpc.InternalError, "Not impl yet", nil)
+}

internal/api_rpc/common.go

@@ -0,0 +1,557 @@
+package api_rpc
+
+import (
+	"context"
+	"fmt"
+	"math"
+	"sort"
+	"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"
+
+	cache "github.com/patrickmn/go-cache"
+)
+
+// pingstats:<uuid>
+var pingStatsCache = cache.New(1*time.Minute, 2*time.Minute)
+
+type pingStat struct {
+	Name   string  `json:"name"`
+	Latest int     `json:"latest"`
+	Avg    int     `json:"avg"`
+	Tail   float64 `json:"tail"` // (P99-P50)/P50
+	Loss   float64 `json:"loss"` // 丢包率 %
+	Min    int     `json:"min"`
+	Max    int     `json:"max"`
+}
+
+// getPingStatsForNode 计算并缓存节点最近 1 小时 ping 统计
+func getPingStatsForNode(uuid string, pingTasks []models.PingTask) map[string]pingStat {
+	if uuid == "" {
+		return map[string]pingStat{}
+	}
+	key := fmt.Sprintf("pingstats:%s", uuid)
+	if v, ok := pingStatsCache.Get(key); ok {
+		if m, ok2 := v.(map[string]pingStat); ok2 {
+			return m
+		}
+	}
+	// 筛选属于该节点的任务
+	assigned := make([]models.PingTask, 0, 4)
+	for _, t := range pingTasks {
+		for _, c := range t.Clients {
+			if c == uuid {
+				assigned = append(assigned, t)
+				break
+			}
+		}
+	}
+	if len(assigned) == 0 {
+		empty := map[string]pingStat{}
+		pingStatsCache.Set(key, empty, cache.DefaultExpiration)
+		return empty
+	}
+	end := time.Now()
+	start := end.Add(-1 * time.Hour)
+	recs, err := tasks.GetPingRecords(uuid, -1, start, end)
+	if err != nil || len(recs) == 0 {
+		empty := map[string]pingStat{}
+		pingStatsCache.Set(key, empty, cache.DefaultExpiration)
+		return empty
+	}
+	grouped := make(map[uint][]models.PingRecord)
+	for _, r := range recs {
+		for _, t := range assigned {
+			if r.TaskId == t.Id {
+				grouped[r.TaskId] = append(grouped[r.TaskId], r)
+				break
+			}
+		}
+	}
+	result := make(map[string]pingStat, len(grouped))
+	for _, t := range assigned {
+		records := grouped[t.Id]
+		if len(records) == 0 {
+			continue
+		}
+		latest := -1
+		var latestTs time.Time
+		values := make([]int, 0, len(records))
+		sum := 0
+		valid := 0
+		total := 0
+		lossCount := 0
+		minLat := 0
+		maxLat := 0
+		for _, r := range records {
+			total++
+			if r.Value < 0 { // 丢包
+				lossCount++
+				continue
+			}
+			values = append(values, r.Value)
+			sum += r.Value
+			valid++
+			if minLat == 0 || r.Value < minLat {
+				minLat = r.Value
+			}
+			if r.Value > maxLat {
+				maxLat = r.Value
+			}
+			ts := r.Time.ToTime()
+			if latestTs.IsZero() || ts.After(latestTs) {
+				latestTs = ts
+				latest = r.Value
+			}
+		}
+		avg := 0
+		if valid > 0 {
+			avg = sum / valid
+		}
+		p50, p99 := 0, 0
+		if len(values) > 0 {
+			sort.Ints(values)
+			percentile := func(vals []int, pct float64) int {
+				if len(vals) == 0 {
+					return 0
+				}
+				if pct <= 0 {
+					return vals[0]
+				}
+				if pct >= 1 {
+					return vals[len(vals)-1]
+				}
+				pos := (float64(len(vals) - 1)) * pct
+				lo := int(math.Floor(pos))
+				hi := int(math.Ceil(pos))
+				if lo == hi {
+					return vals[lo]
+				}
+				frac := pos - float64(lo)
+				v := float64(vals[lo]) + (float64(vals[hi])-float64(vals[lo]))*frac
+				return int(math.Round(v))
+			}
+			p50 = percentile(values, 0.50)
+			p99 = percentile(values, 0.99)
+		}
+		tail := 0.0
+		if p50 > 0 && p99 >= p50 {
+			tail = float64(p99-p50) / float64(p50)
+		}
+		lossRate := 0.0
+		if total > 0 {
+			lossRate = float64(lossCount) / float64(total) * 100
+		}
+		result[fmt.Sprintf("%d", t.Id)] = pingStat{
+			Name:   t.Name,
+			Latest: latest,
+			Avg:    avg,
+			Tail:   tail,
+			Loss:   lossRate,
+			Min:    minLat,
+			Max:    maxLat,
+		}
+	}
+	pingStatsCache.Set(key, result, cache.DefaultExpiration)
+	return result
+}
+
+func init() {
+	RegisterWithGroupAndMeta("getNodes", "common",
+		func(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError) {
+			return getNodes(ctx, req)
+		},
+		&rpc.MethodMeta{
+			Name:    "getNodes",
+			Summary: "Get all nodes",
+			Params: []rpc.ParamMeta{
+				{
+					Name:        "uuid",
+					Description: "Specify the UUID of the node",
+					Required:    false,
+					Type:        "string",
+				},
+			},
+			Returns: "Client | { [uuid]: Client }",
+		},
+	)
+	RegisterWithGroupAndMeta("getNodesLatestStatus", "common",
+		func(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError) {
+			return getNodesLatestStatus(ctx, req)
+		},
+		&rpc.MethodMeta{
+			Name:    "getNodesLatestStatus",
+			Summary: "Get latest status reports (single node or map).",
+			Params: []rpc.ParamMeta{
+				{
+					Name:        "uuid",
+					Description: "Specify the UUID of the node (optional)",
+					Required:    false,
+					Type:        "string",
+				},
+				{
+					Name:        "uuids",
+					Description: "Specify multiple UUIDs (array) to get subset (ignored if uuid provided)",
+					Required:    false,
+					Type:        "string[]",
+				},
+			},
+			Returns: "Record | { [uuid]: Record }",
+		},
+	)
+	Register("getMe", func(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError) {
+		return getMe(ctx, req)
+	})
+	Register("getPublicInfo", getPublicInfo)
+	Register("getVersion", getVersion)
+	Register("getNodeRecentStatus", getNodeRecentStatus)
+}
+
+func getNodes(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError) {
+	var params struct {
+		UUID string `json:"uuid"`
+	}
+	req.BindParams(&params)
+	cinfo, err := client.GetAllClientBasicInfo()
+	if err != nil {
+		return nil, rpc.MakeError(rpc.InternalError, "Failed to get client info", cinfo)
+	}
+	meta := rpc.MetaFromContext(ctx)
+
+	cfg, _ := conf.GetWithV1Format()
+	if meta.Permission != "admin" {
+		// 过滤 Hidden 节点并隐藏敏感字段
+		filtered := make([]models.Client, 0, len(cinfo))
+		for _, node := range cinfo {
+			if node.Hidden { // 非 admin 不显示隐藏节点
+				continue
+			}
+			if cfg.SendIpAddrToGuest {
+				if node.IPv4 != "" {
+					node.IPv4 = strings.Split(node.IPv4, ".")[0] + ".*.*.*"
+				}
+				if node.IPv6 != "" {
+					node.IPv6 = strings.Split(node.IPv6, ":")[0] + ":*:*:*:*:*:*:*"
+				}
+			} else {
+				node.IPv4 = ""
+				node.IPv6 = ""
+			}
+
+			node.Remark = ""
+			node.Version = ""
+			node.Token = ""
+			filtered = append(filtered, node)
+		}
+		cinfo = filtered
+	}
+	if params.UUID != "" {
+		for _, node := range cinfo {
+			if node.UUID == params.UUID {
+				return node, nil
+			}
+		}
+		return nil, rpc.MakeError(rpc.InvalidParams, "Node not found", params.UUID)
+	}
+
+	nodesMap := make(map[string]models.Client, len(cinfo))
+	for _, node := range cinfo {
+		nodesMap[node.UUID] = node
+	}
+	return nodesMap, nil
+}
+
+func getPublicInfo(_ context.Context, _ *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError) {
+	info, err := database.GetPublicInfo()
+	if err != nil {
+		return nil, rpc.MakeError(rpc.InternalError, "Failed to get public info", err.Error())
+	}
+	return info, nil
+}
+
+func getNodesLatestStatus(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError) {
+	var params struct {
+		UUID  string   `json:"uuid"`
+		UUIDs []string `json:"uuids"`
+	}
+	req.BindParams(&params)
+
+	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 {
+		onlineSet[uuid] = true
+	}
+
+	// Hidden 过滤
+	if meta.Permission != "admin" {
+		cinfo, err := client.GetAllClientBasicInfo()
+		if err != nil {
+			return nil, rpc.MakeError(rpc.InternalError, "Failed to get client info", err.Error())
+		}
+		hidden := make(map[string]bool, len(cinfo))
+		for _, c := range cinfo {
+			if c.Hidden {
+				hidden[c.UUID] = true
+			}
+		}
+		for uuid := range latest {
+			if hidden[uuid] {
+				delete(latest, uuid)
+			}
+		}
+	}
+
+	// 如果指定 uuid 但找不到，直接返回 not found
+	if params.UUID != "" {
+		if _, ok := latest[params.UUID]; !ok {
+			return nil, rpc.MakeError(rpc.InvalidParams, "Node not found", params.UUID)
+		}
+	}
+
+	type recordLike struct {
+		Client         string              `json:"client"`
+		Time           models.LocalTime    `json:"time"`
+		Cpu            float32             `json:"cpu"`
+		Gpu            float32             `json:"gpu"`
+		Ram            int64               `json:"ram"`
+		RamTotal       int64               `json:"ram_total"`
+		Swap           int64               `json:"swap"`
+		SwapTotal      int64               `json:"swap_total"`
+		Load           float32             `json:"load"`
+		Load5          float32             `json:"load5"`
+		Load15         float32             `json:"load15"`
+		Temp           float32             `json:"temp"`
+		Disk           int64               `json:"disk"`
+		DiskTotal      int64               `json:"disk_total"`
+		NetIn          int64               `json:"net_in"`
+		NetOut         int64               `json:"net_out"`
+		NetTotalUp     int64               `json:"net_total_up"`
+		NetTotalDown   int64               `json:"net_total_down"`
+		Process        int                 `json:"process"`
+		Connections    int                 `json:"connections"`
+		ConnectionsUdp int                 `json:"connections_udp"`
+		Online         bool                `json:"online"`
+		Uptime         int64               `json:"uptime"`
+		Ping           map[string]pingStat `json:"ping"`
+	}
+
+	respMap := make(map[string]recordLike, len(latest))
+
+	// 预取所有 ping 任务
+	pingTasks, _ := tasks.GetAllPingTasks()
+
+	appendOne := func(uuid string, rep *common.Report) {
+		if rep == nil {
+			return
+		}
+		stats := getPingStatsForNode(uuid, pingTasks)
+		rl := recordLike{
+			Client:         uuid,
+			Time:           models.FromTime(rep.UpdatedAt),
+			Cpu:            float32(rep.CPU.Usage),
+			Gpu:            0,
+			Ram:            rep.Ram.Used,
+			RamTotal:       rep.Ram.Total,
+			Swap:           rep.Swap.Used,
+			SwapTotal:      rep.Swap.Total,
+			Load:           float32(rep.Load.Load1),
+			Load5:          float32(rep.Load.Load5),
+			Load15:         float32(rep.Load.Load15),
+			Temp:           0,
+			Disk:           rep.Disk.Used,
+			DiskTotal:      rep.Disk.Total,
+			NetIn:          rep.Network.Down,
+			NetOut:         rep.Network.Up,
+			NetTotalUp:     rep.Network.TotalUp,
+			NetTotalDown:   rep.Network.TotalDown,
+			Process:        rep.Process,
+			Connections:    rep.Connections.TCP + rep.Connections.UDP,
+			ConnectionsUdp: rep.Connections.UDP,
+			Online:         onlineSet[uuid],
+			Uptime:         rep.Uptime,
+			Ping:           stats,
+		}
+		respMap[uuid] = rl
+	}
+
+	// 选择逻辑
+	if params.UUID != "" { // 单个
+		appendOne(params.UUID, latest[params.UUID])
+		return respMap[params.UUID], nil
+	}
+	selected := map[string]bool{}
+	if len(params.UUIDs) > 0 {
+		for _, id := range params.UUIDs {
+			selected[id] = true
+		}
+		for uuid, rep := range latest {
+			if selected[uuid] {
+				appendOne(uuid, rep)
+			}
+		}
+		return respMap, nil
+	}
+	for uuid, rep := range latest {
+		appendOne(uuid, rep)
+	}
+	return respMap, nil
+}
+
+func getMe(ctx context.Context, _ *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError) {
+	var resp struct {
+		TwoFAEnabled bool   `json:"2fa_enabled"`
+		LoggedIn     bool   `json:"logged_in"`
+		SSOId        string `json:"sso_id"`
+		SSOType      string `json:"sso_type"`
+		Username     string `json:"username"`
+		UUID         string `json:"uuid"`
+	}
+
+	meta := rpc.MetaFromContext(ctx)
+
+	switch meta.Permission {
+	case "admin":
+		resp.TwoFAEnabled = meta.User.TwoFactor != ""
+		resp.LoggedIn = true
+		resp.SSOId = meta.User.SSOID
+		resp.SSOType = meta.User.SSOType
+		resp.Username = meta.User.Username
+		resp.UUID = meta.User.UUID
+		return resp, nil
+	case "guest":
+		resp.LoggedIn = false
+		return resp, nil
+	case "client":
+		resp.LoggedIn = true
+		resp.SSOId = "client"
+		resp.SSOType = "client"
+		resp.Username = "client"
+		resp.UUID = meta.ClientToken
+		client, err := client.GetClientUUIDByToken(meta.ClientToken)
+		if err != nil {
+			resp.UUID = client
+		}
+		return resp, nil
+	default:
+		return nil, rpc.MakeError(rpc.InvalidParams, "Invalid user role", meta.Permission)
+	}
+}
+
+func getVersion(_ context.Context, _ *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError) {
+	return struct {
+		Version string `json:"version"`
+		Hash    string `json:"hash"`
+	}{
+		Version: conf.Version,
+		Hash:    conf.CommitHash,
+	}, nil
+}
+
+func getNodeRecentStatus(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError) {
+	var params struct {
+		UUID string `json:"uuid"`
+	}
+	req.BindParams(&params)
+	if params.UUID == "" {
+		return nil, rpc.MakeError(rpc.InvalidParams, "UUID is required", params)
+	}
+	meta := rpc.MetaFromContext(ctx)
+	// 登录状态检查
+	isLogin := false
+	if meta.Permission == "admin" {
+		isLogin = true
+	}
+
+	// 仅在未登录时需要 Hidden 信息做过滤
+	hiddenMap := map[string]bool{}
+	if !isLogin {
+		var hiddenClients []models.Client
+		db := dbcore.GetDBInstance()
+		_ = db.Select("uuid").Where("hidden = ?", true).Find(&hiddenClients).Error
+		for _, cli := range hiddenClients {
+			hiddenMap[cli.UUID] = true
+		}
+
+		if hiddenMap[params.UUID] {
+			return nil, rpc.MakeError(rpc.InvalidParams, "UUID is required", params) //防止未登录用户获取隐藏客户端数据
+		}
+	}
+
+	raw, _ := vars.Records.Get(params.UUID)
+	reports, _ := raw.([]common.Report)
+
+	// 扁平化为 { count, records: [] }
+	type flatRecord struct {
+		Client         string           `json:"client"`
+		Time           models.LocalTime `json:"time"`
+		Cpu            float32          `json:"cpu"`
+		Gpu            float32          `json:"gpu"`
+		Ram            int64            `json:"ram"`
+		RamTotal       int64            `json:"ram_total"`
+		Swap           int64            `json:"swap"`
+		SwapTotal      int64            `json:"swap_total"`
+		Load           float32          `json:"load"`
+		Temp           float32          `json:"temp"`
+		Disk           int64            `json:"disk"`
+		DiskTotal      int64            `json:"disk_total"`
+		NetIn          int64            `json:"net_in"`
+		NetOut         int64            `json:"net_out"`
+		NetTotalUp     int64            `json:"net_total_up"`
+		NetTotalDown   int64            `json:"net_total_down"`
+		Process        int              `json:"process"`
+		Connections    int              `json:"connections"`
+		ConnectionsUdp int              `json:"connections_udp"`
+	}
+
+	resp := struct {
+		Count   int          `json:"count"`
+		Records []flatRecord `json:"records"`
+	}{
+		Count:   0,
+		Records: []flatRecord{},
+	}
+
+	if len(reports) == 0 {
+		return resp, nil
+	}
+
+	resp.Records = make([]flatRecord, 0, len(reports))
+	for _, r := range reports {
+		fr := flatRecord{
+			Client:         params.UUID,
+			Time:           models.FromTime(r.UpdatedAt),
+			Cpu:            float32(r.CPU.Usage),
+			Gpu:            0,
+			Ram:            r.Ram.Used,
+			RamTotal:       r.Ram.Total,
+			Swap:           r.Swap.Used,
+			SwapTotal:      r.Swap.Total,
+			Load:           float32(r.Load.Load1),
+			Temp:           0,
+			Disk:           r.Disk.Used,
+			DiskTotal:      r.Disk.Total,
+			NetIn:          r.Network.Down,
+			NetOut:         r.Network.Up,
+			NetTotalUp:     r.Network.TotalUp,
+			NetTotalDown:   r.Network.TotalDown,
+			Process:        r.Process,
+			Connections:    r.Connections.TCP + r.Connections.UDP,
+			ConnectionsUdp: r.Connections.UDP,
+		}
+		resp.Records = append(resp.Records, fr)
+	}
+	resp.Count = len(resp.Records)
+	return resp, nil
+}

internal/api_rpc/common.record.go

@@ -0,0 +1,806 @@
+package api_rpc
+
+import (
+	"context"
+	"fmt"
+	"math"
+	"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"
+)
+
+func init() {
+	Register("getRecords", getRecords)
+}
+
+func getRecords(ctx context.Context, req *rpc.JsonRpcRequest) (any, *rpc.JsonRpcError) {
+	meta := rpc.MetaFromContext(ctx)
+	var params struct {
+		Type     string `json:"type"`      // "load" | "ping"; default "load"
+		UUID     string `json:"uuid"`      // client uuid; empty = all clients
+		Hours    int    `json:"hours"`     // time window in hours; default 1 if start/end not provided
+		Start    string `json:"start"`     // RFC3339 start time (optional)
+		End      string `json:"end"`       // RFC3339 end time (optional)
+		LoadType string `json:"load_type"` // for type=load: cpu|gpu|ram|swap|load|temp|disk|network|process|connections|all
+		TaskID   int    `json:"task_id"`   // for type=ping: optional task id; -1 or omitted means all
+		MaxCount int    `json:"maxCount"`  // max number of points; -1 unlimited; default 4000
+	}
+	req.BindParams(&params)
+
+	// defaults
+	if params.Type == "" {
+		params.Type = "load"
+	}
+	// parse time window
+	var startTime, endTime time.Time
+	if params.Start != "" || params.End != "" {
+		// allow partial: missing end means now
+		var err error
+		if params.End == "" {
+			endTime = time.Now()
+		} else {
+			endTime, err = time.Parse(time.RFC3339, params.End)
+			if err != nil {
+				return nil, rpc.MakeError(rpc.InvalidParams, "Invalid end time", params.End)
+			}
+		}
+		if params.Start == "" {
+			// default to 1 hour before end
+			startTime = endTime.Add(-1 * time.Hour)
+		} else {
+			start, err := time.Parse(time.RFC3339, params.Start)
+			if err != nil {
+				return nil, rpc.MakeError(rpc.InvalidParams, "Invalid start time", params.Start)
+			}
+			startTime = start
+		}
+	} else {
+		hours := params.Hours
+		if hours <= 0 {
+			hours = 1 // default 1 hour
+		}
+		endTime = time.Now()
+		startTime = endTime.Add(-time.Duration(hours) * time.Hour)
+	}
+
+	// Hidden filtering for non-admin
+	isAdmin := meta.Permission == "admin"
+	hidden := map[string]bool{}
+	if !isAdmin {
+		cinfo, err := client.GetAllClientBasicInfo()
+		if err != nil {
+			return nil, rpc.MakeError(rpc.InternalError, "Failed to get client info", err.Error())
+		}
+		for _, c := range cinfo {
+			if c.Hidden {
+				hidden[c.UUID] = true
+			}
+		}
+		if params.UUID != "" && hidden[params.UUID] {
+			return nil, rpc.MakeError(rpc.InvalidParams, "UUID not found", params.UUID)
+		}
+	}
+
+	switch params.Type {
+	case "load":
+		// fetch load records
+		recs, err := getLoadRecordsCombined(params.UUID, startTime, endTime)
+		if err != nil {
+			return nil, rpc.MakeError(rpc.InternalError, "Failed to fetch records", err.Error())
+		}
+		// hidden filter on non-admin
+		if !isAdmin {
+			filtered := recs[:0]
+			for _, r := range recs {
+				if hidden[r.Client] {
+					continue
+				}
+				filtered = append(filtered, r)
+			}
+			recs = filtered
+		}
+
+		// resolve maxCount default for load
+		maxCount := params.MaxCount
+		if maxCount == 0 {
+			maxCount = 4000
+		}
+
+		// optional load_type filtering -> group by client
+		if params.LoadType != "" && params.LoadType != "all" {
+			items := filterRecordsByLoadType(recs, params.LoadType)
+			grouped := make(map[string][]flatRecord)
+			for _, it := range items {
+				grouped[it.Client] = append(grouped[it.Client], it)
+			}
+			// sort and count
+			total := 0
+			groupsMeta := make([]struct {
+				name   string
+				length int
+			}, 0, len(grouped))
+			for name := range grouped {
+				arr := grouped[name]
+				sort.Slice(arr, func(i, j int) bool { return arr[i].Time.ToTime().Before(arr[j].Time.ToTime()) })
+				grouped[name] = arr
+				l := len(arr)
+				total += l
+				groupsMeta = append(groupsMeta, struct {
+					name   string
+					length int
+				}{name: name, length: l})
+			}
+			// downsample across all clients proportionally
+			if maxCount != -1 && total > maxCount {
+				targets := allocateTargets(groupsMeta, maxCount)
+				total = 0
+				for name, k := range targets {
+					grouped[name] = downsampleFlatRecords(grouped[name], k)
+					total += len(grouped[name])
+				}
+			}
+			return struct {
+				Count    int                     `json:"count"`
+				Records  map[string][]flatRecord `json:"records"`
+				LoadType string                  `json:"load_type"`
+				From     models.LocalTime        `json:"from"`
+				To       models.LocalTime        `json:"to"`
+			}{Count: total, Records: grouped, LoadType: params.LoadType, From: models.FromTime(startTime), To: models.FromTime(endTime)}, nil
+		}
+		// default: return full records, grouped by client
+		grouped := make(map[string][]models.Record)
+		for _, r := range recs {
+			grouped[r.Client] = append(grouped[r.Client], r)
+		}
+		total := 0
+		groupsMeta := make([]struct {
+			name   string
+			length int
+		}, 0, len(grouped))
+		for name := range grouped {
+			arr := grouped[name]
+			sort.Slice(arr, func(i, j int) bool { return arr[i].Time.ToTime().Before(arr[j].Time.ToTime()) })
+			grouped[name] = arr
+			l := len(arr)
+			total += l
+			groupsMeta = append(groupsMeta, struct {
+				name   string
+				length int
+			}{name: name, length: l})
+		}
+		if maxCount != -1 && total > maxCount {
+			targets := allocateTargets(groupsMeta, maxCount)
+			total = 0
+			for name, k := range targets {
+				grouped[name] = downsampleModelRecords(grouped[name], k)
+				total += len(grouped[name])
+			}
+		}
+		return struct {
+			Count   int                        `json:"count"`
+			Records map[string][]models.Record `json:"records"`
+			From    models.LocalTime           `json:"from"`
+			To      models.LocalTime           `json:"to"`
+		}{Count: total, Records: grouped, From: models.FromTime(startTime), To: models.FromTime(endTime)}, nil
+
+	case "ping":
+		taskId := params.TaskID
+		if taskId == 0 {
+			taskId = -1
+		}
+		recs, err := tasks.GetPingRecords(params.UUID, taskId, startTime, endTime)
+		if err != nil {
+			return nil, rpc.MakeError(rpc.InternalError, "Failed to fetch ping records", err.Error())
+		}
+		// hidden filter
+		if !isAdmin {
+			filtered := recs[:0]
+			for _, r := range recs {
+				if r.Client != "" && hidden[r.Client] {
+					continue
+				}
+				filtered = append(filtered, r)
+			}
+			recs = filtered
+		}
+
+		type RecordsResp struct {
+			TaskId uint             `json:"task_id,omitempty"`
+			Time   models.LocalTime `json:"time"`
+			Value  int              `json:"value"`
+			Client string           `json:"client,omitempty"`
+		}
+		type ClientBasicInfo struct {
+			Client string  `json:"client"`
+			Loss   float64 `json:"loss"`
+			Min    int     `json:"min"`
+			Max    int     `json:"max"`
+		}
+		type Resp struct {
+			Count     int               `json:"count"`
+			BasicInfo []ClientBasicInfo `json:"basic_info,omitempty"`
+			Records   []RecordsResp     `json:"records"`
+			Tasks     []map[string]any  `json:"tasks"`
+			From      models.LocalTime  `json:"from"`
+			To        models.LocalTime  `json:"to"`
+		}
+
+		response := &Resp{Count: 0, Records: []RecordsResp{}, From: models.FromTime(startTime), To: models.FromTime(endTime)}
+
+		// stats per client
+		clientStats := make(map[string]struct {
+			total int
+			loss  int
+			min   int
+			max   int
+		})
+
+		for _, r := range recs {
+			rr := RecordsResp{
+				TaskId: r.TaskId,
+				Time:   r.Time,
+				Value:  r.Value,
+				Client: r.Client,
+			}
+			st := clientStats[r.Client]
+			st.total++
+			if r.Value < 0 {
+				st.loss++
+			} else {
+				if st.min == 0 || r.Value < st.min {
+					st.min = r.Value
+				}
+				if r.Value > st.max {
+					st.max = r.Value
+				}
+			}
+			clientStats[r.Client] = st
+			response.Records = append(response.Records, rr)
+		}
+
+		if len(clientStats) > 0 {
+			response.BasicInfo = make([]ClientBasicInfo, 0, len(clientStats))
+			for client, st := range clientStats {
+				if client != "" && !isAdmin && hidden[client] {
+					continue
+				}
+				loss := float64(0)
+				if st.total > 0 {
+					loss = float64(st.loss) / float64(st.total) * 100
+				}
+				response.BasicInfo = append(response.BasicInfo, ClientBasicInfo{
+					Client: client,
+					Loss:   loss,
+					Min:    st.min,
+					Max:    st.max,
+				})
+			}
+		}
+
+		// tasks summary (always included for ping type; do not expose target field)
+		pingTasks, err := tasks.GetAllPingTasks()
+		if err != nil {
+			return nil, rpc.MakeError(rpc.InternalError, "Failed to fetch ping tasks", err.Error())
+		}
+		toList := make([]map[string]any, 0, len(pingTasks))
+		for _, t := range pingTasks {
+			if taskId != -1 && t.Id != uint(taskId) {
+				continue
+			}
+			if params.UUID != "" { // ensure task assigned to specific client when filtering by uuid
+				assigned := false
+				for _, c := range t.Clients {
+					if c == params.UUID {
+						assigned = true
+						break
+					}
+				}
+				if !assigned {
+					continue
+				}
+			}
+			total := 0
+			lossCount := 0
+			minLat := 0
+			maxLat := 0
+			sum := 0
+			valid := 0
+			latestVal := -1
+			var latestTs time.Time
+			// 收集该任务的所有有效(非丢包)延迟值以计算百分位
+			latencies := make([]int, 0, 64)
+			for _, r := range recs {
+				if r.TaskId != t.Id {
+					continue
+				}
+				if params.UUID != "" && r.Client != params.UUID {
+					continue
+				}
+				total++
+				if r.Value < 0 { // 丢包
+					lossCount++
+					continue
+				}
+				valid++
+				sum += r.Value
+				latencies = append(latencies, r.Value)
+				if minLat == 0 || r.Value < minLat {
+					minLat = r.Value
+				}
+				if r.Value > maxLat {
+					maxLat = r.Value
+				}
+				// track latest non-negative value
+				ts := r.Time.ToTime()
+				if latestTs.IsZero() || ts.After(latestTs) {
+					latestTs = ts
+					latestVal = r.Value
+				}
+			}
+
+			// 计算 P50 / P99
+			p50 := 0
+			p99 := 0
+			if len(latencies) > 0 {
+				sort.Ints(latencies)
+				getPercentileInt := func(values []int, percentile float64) int {
+					if len(values) == 0 {
+						return 0
+					}
+					if percentile <= 0 {
+						return values[0]
+					}
+					if percentile >= 1 {
+						return values[len(values)-1]
+					}
+					pos := (float64(len(values) - 1)) * percentile
+					lo := int(math.Floor(pos))
+					hi := int(math.Ceil(pos))
+					if lo == hi {
+						return values[lo]
+					}
+					frac := pos - float64(lo)
+					v := float64(values[lo]) + (float64(values[hi])-float64(values[lo]))*frac
+					return int(math.Round(v))
+				}
+				p50 = getPercentileInt(latencies, 0.50)
+				p99 = getPercentileInt(latencies, 0.99)
+			}
+			ratio := 0.0
+			if p50 > 0 && p99 >= p50 {
+				jitterMs := float64(p99 - p50)
+				adjustedBase := math.Max(math.Min(float64(p50), 50.0), 10.0)
+				ratio = jitterMs / adjustedBase
+			}
+			lossRate := 0.0
+			if total > 0 {
+				lossRate = float64(lossCount) / float64(total) * 100
+			}
+			avg := 0
+			if valid > 0 {
+				avg = sum / valid
+			}
+			info := map[string]any{
+				"id":            t.Id,
+				"name":          t.Name,
+				"type":          t.Type,
+				"interval":      t.Interval,
+				"loss":          lossRate,
+				"min":           minLat,
+				"max":           maxLat,
+				"avg":           avg,
+				"latest":        latestVal,
+				"total":         total,
+				"p50":           p50,
+				"p99":           p99,
+				"p99_p50_ratio": ratio,
+			}
+			if params.UUID == "" && taskId != -1 { // retain existing behavior of exposing clients only when filtering by task
+				info["clients"] = t.Clients
+			}
+			toList = append(toList, info)
+		}
+		response.Tasks = toList
+		// apply maxCount for ping
+		maxCount := params.MaxCount
+		if maxCount == 0 {
+			maxCount = 4000
+		}
+		if maxCount != -1 && len(response.Records) > maxCount {
+			// group records by TaskId for proportional downsampling
+			taskGroups := make(map[uint][]RecordsResp)
+			for _, r := range response.Records {
+				taskGroups[r.TaskId] = append(taskGroups[r.TaskId], r)
+			}
+
+			// sort each group by time
+			for taskId := range taskGroups {
+				sort.Slice(taskGroups[taskId], func(i, j int) bool {
+					return taskGroups[taskId][i].Time.ToTime().Before(taskGroups[taskId][j].Time.ToTime())
+				})
+			}
+
+			// calculate proportional allocation for each task
+			type taskMeta struct {
+				taskId uint
+				length int
+			}
+			groupsMeta := make([]taskMeta, 0, len(taskGroups))
+			for taskId, records := range taskGroups {
+				groupsMeta = append(groupsMeta, taskMeta{
+					taskId: taskId,
+					length: len(records),
+				})
+			}
+
+			// use existing allocateTargets function (create compatible struct)
+			strTargets := allocateTargets(
+				func() []struct {
+					name   string
+					length int
+				} {
+					result := make([]struct {
+						name   string
+						length int
+					}, len(groupsMeta))
+					for i, meta := range groupsMeta {
+						result[i] = struct {
+							name   string
+							length int
+						}{name: fmt.Sprintf("%d", meta.taskId), length: meta.length}
+					}
+					return result
+				}(),
+				maxCount,
+			)
+
+			// downsample each task group
+			downsampledRecords := make([]RecordsResp, 0, maxCount)
+			samplePingRecords := func(in []RecordsResp, k int) []RecordsResp {
+				n := len(in)
+				if k <= 0 || n == 0 {
+					return []RecordsResp{}
+				}
+				if k >= n {
+					return in
+				}
+				out := make([]RecordsResp, 0, k)
+				if k == 1 {
+					out = append(out, in[n-1])
+					return out
+				}
+				for i := 0; i < k; i++ {
+					idx := int(math.Round(float64(i) * float64(n-1) / float64(k-1)))
+					if idx < 0 {
+						idx = 0
+					} else if idx >= n {
+						idx = n - 1
+					}
+					out = append(out, in[idx])
+				}
+				return out
+			}
+
+			for taskId, records := range taskGroups {
+				targetKey := fmt.Sprintf("%d", taskId)
+				targetCount := strTargets[targetKey]
+				sampled := samplePingRecords(records, targetCount)
+				downsampledRecords = append(downsampledRecords, sampled...)
+			}
+
+			response.Records = downsampledRecords
+		}
+		response.Count = len(response.Records)
+		// sort by time asc
+		sort.Slice(response.Records, func(i, j int) bool {
+			return response.Records[i].Time.ToTime().Before(response.Records[j].Time.ToTime())
+		})
+		return response, nil
+	default:
+		return nil, rpc.MakeError(rpc.InvalidParams, "Invalid type, expected 'load' or 'ping'", params.Type)
+	}
+}
+
+// ---------- helpers for load records ----------
+
+// getLoadRecordsCombined fetches records for a client or all clients within a time range,
+// combining recent short-term table and long-term table with 15-min grouping for recent part.
+func getLoadRecordsCombined(uuid string, start, end time.Time) ([]models.Record, error) {
+	// prefer the existing function when uuid provided
+	if uuid != "" {
+		return recordsdb.GetRecordsByClientAndTime(uuid, start, end)
+	}
+	db := dbcore.GetDBInstance()
+	fourHoursAgo := time.Now().Add(-4*time.Hour - time.Minute)
+
+	var recent []models.Record
+	recentStart := start
+	if end.After(fourHoursAgo) {
+		if recentStart.Before(fourHoursAgo) {
+			recentStart = fourHoursAgo
+		}
+		_ = db.Table("records").Where("time >= ? AND time <= ?", recentStart, end).Order("time ASC").Find(&recent).Error
+	}
+
+	var longTerm []models.Record
+	_ = db.Table("records_long_term").Where("time >= ? AND time <= ?", start, end).Order("time ASC").Find(&longTerm).Error
+
+	// if no long term, return all recent
+	if len(longTerm) == 0 {
+		return recent, nil
+	}
+
+	// group recent by client+15min, keep latest in bucket
+	type key struct {
+		c    string
+		slot string
+	}
+	grouped := make(map[key]models.Record)
+	for _, rec := range recent {
+		k := key{c: rec.Client, slot: rec.Time.ToTime().Truncate(15 * time.Minute).Format(time.RFC3339)}
+		if old, ok := grouped[k]; !ok || rec.Time.ToTime().After(old.Time.ToTime()) {
+			grouped[k] = rec
+		}
+	}
+	flat := make([]models.Record, 0, len(grouped))
+	for _, rec := range grouped {
+		flat = append(flat, rec)
+	}
+	sort.Slice(flat, func(i, j int) bool { return flat[i].Time.ToTime().Before(flat[j].Time.ToTime()) })
+	flat = append(flat, longTerm...)
+	return flat, nil
+}
+
+// ---------- downsampling helpers ----------
+
+// allocateTargets splits maxTotal across groups proportionally to their lengths.
+func allocateTargets(groups []struct {
+	name   string
+	length int
+}, maxTotal int) map[string]int {
+	result := make(map[string]int, len(groups))
+	if maxTotal < 0 {
+		for _, g := range groups {
+			result[g.name] = g.length
+		}
+		return result
+	}
+	total := 0
+	for _, g := range groups {
+		total += g.length
+	}
+	if total <= maxTotal {
+		for _, g := range groups {
+			result[g.name] = g.length
+		}
+		return result
+	}
+	// initial allocation based on proportion
+	type rem struct {
+		idx  int
+		frac float64
+	}
+	remainders := make([]rem, 0, len(groups))
+	sumTargets := 0
+	for i, g := range groups {
+		if g.length <= 0 {
+			result[g.name] = 0
+			continue
+		}
+		raw := float64(g.length) * float64(maxTotal) / float64(total)
+		t := int(math.Floor(raw))
+		if t > g.length {
+			t = g.length
+		}
+		result[groups[i].name] = t
+		sumTargets += t
+		remainders = append(remainders, rem{i, raw - float64(t)})
+	}
+	// distribute remaining by largest fractional parts
+	if sumTargets < maxTotal {
+		need := maxTotal - sumTargets
+		sort.Slice(remainders, func(i, j int) bool { return remainders[i].frac > remainders[j].frac })
+		for _, r := range remainders {
+			if need == 0 {
+				break
+			}
+			g := groups[r.idx]
+			cur := result[g.name]
+			if cur < g.length {
+				result[g.name] = cur + 1
+				need--
+			}
+		}
+		// if still left, second pass round-robin
+		if need > 0 {
+			for need > 0 {
+				for _, g := range groups {
+					if need == 0 {
+						break
+					}
+					if result[g.name] < g.length {
+						result[g.name]++
+						need--
+					}
+				}
+				if need > 0 {
+					break
+				}
+			}
+		}
+	} else if sumTargets > maxTotal {
+		over := sumTargets - maxTotal
+		sort.Slice(remainders, func(i, j int) bool { return remainders[i].frac < remainders[j].frac })
+		for _, r := range remainders {
+			if over == 0 {
+				break
+			}
+			g := groups[r.idx]
+			if result[g.name] > 0 {
+				result[g.name]--
+				over--
+			}
+		}
+		if over > 0 {
+			for over > 0 {
+				for _, g := range groups {
+					if over == 0 {
+						break
+					}
+					if result[g.name] > 0 {
+						result[g.name]--
+						over--
+					}
+				}
+				if over > 0 {
+					break
+				}
+			}
+		}
+	}
+	return result
+}
+
+func downsampleModelRecords(in []models.Record, k int) []models.Record {
+	n := len(in)
+	if k <= 0 || n == 0 {
+		return []models.Record{}
+	}
+	if k >= n {
+		return in
+	}
+	out := make([]models.Record, 0, k)
+	if k == 1 {
+		out = append(out, in[n-1])
+		return out
+	}
+	for i := 0; i < k; i++ {
+		idx := int(math.Round(float64(i) * float64(n-1) / float64(k-1)))
+		if idx < 0 {
+			idx = 0
+		} else if idx >= n {
+			idx = n - 1
+		}
+		out = append(out, in[idx])
+	}
+	return out
+}
+
+func downsampleFlatRecords(in []flatRecord, k int) []flatRecord {
+	n := len(in)
+	if k <= 0 || n == 0 {
+		return []flatRecord{}
+	}
+	if k >= n {
+		return in
+	}
+	out := make([]flatRecord, 0, k)
+	if k == 1 {
+		out = append(out, in[n-1])
+		return out
+	}
+	for i := 0; i < k; i++ {
+		idx := int(math.Round(float64(i) * float64(n-1) / float64(k-1)))
+		if idx < 0 {
+			idx = 0
+		} else if idx >= n {
+			idx = n - 1
+		}
+		out = append(out, in[idx])
+	}
+	return out
+}
+
+// flatRecord is a projection used when load_type is specified.
+type flatRecord struct {
+	Client         string           `json:"client"`
+	Time           models.LocalTime `json:"time"`
+	Cpu            *float32         `json:"cpu,omitempty"`
+	Gpu            *float32         `json:"gpu,omitempty"`
+	Ram            *int64           `json:"ram,omitempty"`
+	RamTotal       *int64           `json:"ram_total,omitempty"`
+	Swap           *int64           `json:"swap,omitempty"`
+	SwapTotal      *int64           `json:"swap_total,omitempty"`
+	Load           *float32         `json:"load,omitempty"`
+	Temp           *float32         `json:"temp,omitempty"`
+	Disk           *int64           `json:"disk,omitempty"`
+	DiskTotal      *int64           `json:"disk_total,omitempty"`
+	NetIn          *int64           `json:"net_in,omitempty"`
+	NetOut         *int64           `json:"net_out,omitempty"`
+	NetTotalUp     *int64           `json:"net_total_up,omitempty"`
+	NetTotalDown   *int64           `json:"net_total_down,omitempty"`
+	Process        *int             `json:"process,omitempty"`
+	Connections    *int             `json:"connections,omitempty"`
+	ConnectionsUdp *int             `json:"connections_udp,omitempty"`
+	Uptime         *int64           `json:"uptime,omitempty"`
+}
+
+func filterRecordsByLoadType(recs []models.Record, loadType string) []flatRecord {
+	out := make([]flatRecord, 0, len(recs))
+	for _, r := range recs {
+		fr := flatRecord{Client: r.Client, Time: r.Time}
+		// always include uptime when present
+		//if r.Uptime != 0 {
+		//	v := r.Uptime
+		//	fr.Uptime = &v
+		//}
+		switch loadType {
+		case "cpu":
+			v := r.Cpu
+			fr.Cpu = &v
+		case "gpu":
+			v := r.Gpu
+			fr.Gpu = &v
+		case "ram":
+			v := r.Ram
+			fr.Ram = &v
+			vt := r.RamTotal
+			fr.RamTotal = &vt
+		case "swap":
+			v := r.Swap
+			fr.Swap = &v
+			vt := r.SwapTotal
+			fr.SwapTotal = &vt
+		case "load":
+			v := r.Load
+			fr.Load = &v
+		case "temp":
+			v := r.Temp
+			fr.Temp = &v
+		case "disk":
+			v := r.Disk
+			fr.Disk = &v
+			vt := r.DiskTotal
+			fr.DiskTotal = &vt
+		case "network":
+			vi := r.NetIn
+			vo := r.NetOut
+			vtu := r.NetTotalUp
+			vtd := r.NetTotalDown
+			fr.NetIn = &vi
+			fr.NetOut = &vo
+			fr.NetTotalUp = &vtu
+			fr.NetTotalDown = &vtd
+		case "process":
+			v := r.Process
+			fr.Process = &v
+		case "connections":
+			v := r.Connections
+			fr.Connections = &v
+			vu := r.ConnectionsUdp
+			fr.ConnectionsUdp = &vu
+		default:
+			// unknown type: fallback to all fields as a full record would be returned elsewhere
+			v := r.Cpu
+			fr.Cpu = &v
+		}
+		out = append(out, fr)
+	}
+	return out
+}

internal/api_rpc/init.go

@@ -0,0 +1,15 @@
+package api_rpc
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/gookit/event"
+	"github.com/komari-monitor/komari/internal/eventType"
+)
+
+func init() {
+	event.On(eventType.ServerInitializeStart, event.ListenerFunc(func(e event.Event) error {
+		r := e.Get("engine").(*gin.Engine)
+		RegisterRouters("/api/rpc2", r)
+		return nil
+	}))
+}

internal/api_v1/AdminAuthMiddleware.go

@@ -1,15 +1,21 @@
-package api
+package api_v1
 
 import (
 	"net/http"
+	"strings"
 
-	"github.com/komari-monitor/komari/database/accounts"
+	"github.com/komari-monitor/komari/internal/api_v1/resp"
+	"github.com/komari-monitor/komari/internal/database/accounts"
 
 	"github.com/gin-gonic/gin"
 )
 
 func AdminAuthMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
+		if !strings.HasPrefix(c.Request.URL.Path, "/api/admin") {
+			c.Next()
+			return
+		}
 		// API key authentication
 		apiKey := c.GetHeader("Authorization")
 		if isApiKeyValid(apiKey) {
@@ -20,7 +26,7 @@ func AdminAuthMiddleware() gin.HandlerFunc {
 		// session-based authentication
 		session, err := c.Cookie("session_token")
 		if err != nil {
-			RespondError(c, http.StatusUnauthorized, "Unauthorized.")
+			resp.RespondError(c, http.StatusUnauthorized, "Unauthorized.")
 			c.Abort()
 			return
 		}
@@ -28,7 +34,7 @@ func AdminAuthMiddleware() gin.HandlerFunc {
 		// Komari is a single user system
 		uuid, err := accounts.GetSession(session)
 		if err != nil {
-			RespondError(c, http.StatusUnauthorized, "Unauthorized.")
+			resp.RespondError(c, http.StatusUnauthorized, "Unauthorized.")
 			c.Abort()
 			return
 		}

internal/api_v1/Common.go

@@ -0,0 +1,107 @@
+package api_v1
+
+import (
+	"log"
+	"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/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"
+)
+
+func SaveClientReportToDB() error {
+	lastMinute := time.Now().Add(-time.Minute).Unix()
+	var records []models.Record
+	var gpuRecords []models.GPURecord
+
+	// 遍历所有客户端记录
+	for uuid, x := range vars.Records.Items() {
+		if uuid == "" {
+			continue
+		}
+
+		reports, ok := x.Object.([]common.Report)
+		if !ok {
+			log.Printf("Invalid report type for UUID %s", uuid)
+			continue
+		}
+
+		// 过滤一分钟前的记录
+		var filtered []common.Report
+		for _, r := range reports {
+			if r.UpdatedAt.Unix() >= lastMinute {
+				filtered = append(filtered, r)
+			}
+		}
+
+		// 更新缓存
+		vars.Records.Set(uuid, filtered, cache.DefaultExpiration)
+
+		// 计算平均报告并添加到记录列表
+		if len(filtered) > 0 {
+			r := utils.AverageReport(uuid, time.Now(), filtered, 0.3)
+			records = append(records, r)
+
+			// 使用与其他数据相同的聚合逻辑处理GPU数据
+			gpuAggregated := utils.AverageGPUReports(uuid, time.Now(), filtered, 0.3)
+			gpuRecords = append(gpuRecords, gpuAggregated...)
+		}
+	}
+
+	// 批量插入数据库前去重（client与time共同构成唯一键）
+	db := dbcore.GetDBInstance()
+
+	if len(records) > 0 {
+		unique := make(map[string]models.Record)
+		for _, rec := range records {
+			key := rec.Client + "_" + strconv.FormatInt(rec.Time.ToTime().Unix(), 10)
+			unique[key] = rec
+		}
+		var deduped []models.Record
+		for _, rec := range unique {
+			deduped = append(deduped, rec)
+		}
+		if err := db.Model(&models.Record{}).Create(&deduped).Error; err != nil {
+			log.Printf("Failed to save records to database: %v", err)
+			return err
+		}
+	}
+
+	// 批量插入GPU记录
+	if len(gpuRecords) > 0 {
+		// GPU记录也需要去重，防止重复插入
+		gpuUnique := make(map[string]models.GPURecord)
+		for _, rec := range gpuRecords {
+			key := rec.Client + "_" + strconv.Itoa(rec.DeviceIndex) + "_" + strconv.FormatInt(rec.Time.ToTime().Unix(), 10)
+			gpuUnique[key] = rec
+		}
+		var gpuDeduped []models.GPURecord
+		for _, rec := range gpuUnique {
+			gpuDeduped = append(gpuDeduped, rec)
+		}
+		if err := db.Model(&models.GPURecord{}).Create(&gpuDeduped).Error; err != nil {
+			log.Printf("Failed to save GPU records to database: %v", err)
+			return err
+		}
+	}
+
+	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
+}

internal/api_v1/PrivateSiteMiddleware.go

@@ -0,0 +1,105 @@
+package api_v1
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/komari-monitor/komari/internal/api_v1/resp"
+	"github.com/komari-monitor/komari/internal/conf"
+	"github.com/komari-monitor/komari/internal/database/accounts"
+
+	"github.com/gin-gonic/gin"
+)
+
+var (
+	requireAuthPaths = []string{
+		// v1 API at 2025-12-06
+		// "/api/rpc2",
+		// "/ping",
+		// "/api/login",
+		// "/api/me",
+		"/api/clients",
+		"/api/nodes",
+		// "/api/public",
+		// "/api/oauth",
+		// "/api/oauth_callback",
+		// "/api/logout",
+		// "/api/version",
+		"/api/recent/",
+		"/api/records/",
+		"/api/task/",
+		// "/api/clients/register",
+		// "/api/clients/report",
+		// "/api/clients/uploadBasicInfo",
+		// "/api/clients/terminal",
+		// "/api/clients/task/result",
+		// "/api/admin/download/backup",
+	}
+)
+
+func PrivateSiteMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// API key authentication
+		apiKey := c.GetHeader("Authorization")
+		if isApiKeyValid(apiKey) {
+			c.Set("api_key", apiKey)
+			c.Next()
+			return
+		}
+		path := c.Request.URL.Path
+		// 如果不是 /api 开头的路径，直接放行
+		if !strings.HasPrefix(path, "/api") {
+			c.Next()
+			return
+		}
+
+		// /api/clients/* 由 TokenAuthMiddleware 处理
+		// /api/rpc2 由 api_rpc 处理
+		// /api/admin/* 由 AdminAuthMiddleware 处理
+		if strings.HasPrefix(path, "/api/clients/") ||
+			strings.HasPrefix(path, "/api/admin") ||
+			strings.HasPrefix(path, "/api/rpc2") {
+			c.Next()
+			return
+		}
+
+		require := false
+		for _, p := range requireAuthPaths {
+			if strings.HasPrefix(path, p) {
+				require = true
+				break
+			}
+		}
+
+		if !require {
+			c.Next()
+			return
+		}
+		conf, err := conf.GetWithV1Format()
+		if err != nil {
+			resp.RespondError(c, http.StatusInternalServerError, "Failed to get configuration.")
+			c.Abort()
+			return
+		}
+		// 验证私有, 如果不是私有站点，直接放行
+		if !conf.PrivateSite {
+			c.Next()
+			return
+		}
+		// 如果是私有站点，检查是否有 session
+		session, err := c.Cookie("session_token")
+		if err != nil {
+			resp.RespondError(c, http.StatusUnauthorized, "Private site is enabled, please login first.")
+			c.Abort()
+			return
+		}
+		_, err = accounts.GetSession(session)
+		if err != nil {
+			resp.RespondError(c, http.StatusUnauthorized, "Private site is enabled, please login first.")
+			c.Abort()
+			return
+		}
+
+		c.Next()
+	}
+}

internal/api_v1/TokenAuthMiddleware.go

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

internal/api_v1/admin/2fa.go

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

internal/api_v1/admin/client.go

@@ -4,10 +4,12 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/records"
-	"github.com/komari-monitor/komari/ws"
+	"github.com/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"
 )
 
 func AddClient(c *gin.Context) {
@@ -30,6 +32,10 @@ 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": ""})
 }
 
@@ -45,13 +51,17 @@ func EditClient(c *gin.Context) {
 		return
 	}
 	req["uuid"] = uuid
-	err := clients.SaveClient(req)
+	err := clients.PartialUpdate(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"})
 }
 
@@ -70,6 +80,9 @@ 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) {

internal/api_v1/admin/client_weight.go

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

internal/api_v1/admin/clipboard/clipboard.go

@@ -5,10 +5,10 @@ import (
 	"strconv"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/auditlog"
-	clipboardDB "github.com/komari-monitor/komari/database/clipboard"
-	"github.com/komari-monitor/komari/database/models"
+	"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"
 )
 
 // 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 {
-		api.RespondError(c, http.StatusBadRequest, "Invalid ID")
+		resp.RespondError(c, http.StatusBadRequest, "Invalid ID")
 		return
 	}
 	cb, err := clipboardDB.GetClipboardByID(id)
 	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "Failed to get clipboard: "+err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, "Failed to get clipboard: "+err.Error())
 		return
 	}
-	api.RespondSuccess(c, cb)
+	resp.RespondSuccess(c, cb)
 }
 
 // ListClipboard lists all clipboard entries
 func ListClipboard(c *gin.Context) {
 	list, err := clipboardDB.ListClipboard()
 	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "Failed to list clipboard: "+err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, "Failed to list clipboard: "+err.Error())
 		return
 	}
-	api.RespondSuccess(c, list)
+	resp.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 {
-		api.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
+		resp.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
 		return
 	}
 	if err := clipboardDB.CreateClipboard(&req); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "Failed to create clipboard: "+err.Error())
+		resp.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")
-	api.RespondSuccess(c, req)
+	resp.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 {
-		api.RespondError(c, http.StatusBadRequest, "Invalid ID")
+		resp.RespondError(c, http.StatusBadRequest, "Invalid ID")
 		return
 	}
 	var fields map[string]interface{}
 	if err := c.ShouldBindJSON(&fields); err != nil {
-		api.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
+		resp.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
 		return
 	}
 	if err := clipboardDB.UpdateClipboardFields(id, fields); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "Failed to update clipboard: "+err.Error())
+		resp.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")
-	api.RespondSuccess(c, nil)
+	resp.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 {
-		api.RespondError(c, http.StatusBadRequest, "Invalid ID")
+		resp.RespondError(c, http.StatusBadRequest, "Invalid ID")
 		return
 	}
 	if err := clipboardDB.DeleteClipboard(id); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "Failed to delete clipboard: "+err.Error())
+		resp.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")
-	api.RespondSuccess(c, nil)
+	resp.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 {
-		api.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
+		resp.RespondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
 		return
 	}
 	if len(req.IDs) == 0 {
-		api.RespondError(c, http.StatusBadRequest, "IDs cannot be empty")
+		resp.RespondError(c, http.StatusBadRequest, "IDs cannot be empty")
 		return
 	}
 	if err := clipboardDB.DeleteClipboardBatch(req.IDs); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "Failed to batch delete clipboard: "+err.Error())
+		resp.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")
-	api.RespondSuccess(c, nil)
+	resp.RespondSuccess(c, nil)
 }

internal/api_v1/admin/download.go

@@ -0,0 +1,210 @@
+package admin
+
+import (
+	"archive/zip"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+	"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"
+)
+
+// copyFile 复制单个文件到目标路径（会确保父目录存在）
+func copyFile(srcPath, destPath string) error {
+	if err := os.MkdirAll(filepath.Dir(destPath), 0o755); err != nil {
+		return fmt.Errorf("failed to create parent directory: %v", err)
+	}
+
+	src, err := os.Open(srcPath)
+	if err != nil {
+		return fmt.Errorf("failed to open source file: %v", err)
+	}
+	defer src.Close()
+
+	dest, err := os.Create(destPath)
+	if err != nil {
+		return fmt.Errorf("failed to create destination file: %v", err)
+	}
+	defer dest.Close()
+
+	if _, err = io.Copy(dest, src); err != nil {
+		return fmt.Errorf("failed to copy file: %v", err)
+	}
+	return nil
+}
+
+// copyDataToTempExcludingDB 将 ./data 下除了 .db/.db-wal/.db-shm 之外的所有文件复制到临时目录
+func copyDataToTempExcludingDB(tempDir string) error {
+	dataRoot := "./data"
+
+	// 如果 data 目录不存在，视为无文件可复制
+	if stat, err := os.Stat(dataRoot); err != nil {
+		if os.IsNotExist(err) {
+			return nil
+		}
+		return fmt.Errorf("stat data dir: %v", err)
+	} else if !stat.IsDir() {
+		return fmt.Errorf("%s is not a directory", dataRoot)
+	}
+
+	return filepath.Walk(dataRoot, func(p string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		rel, err := filepath.Rel(dataRoot, p)
+		if err != nil {
+			return err
+		}
+		if rel == "." {
+			return nil
+		}
+
+		// 跳过数据库相关文件
+		name := info.Name()
+		if strings.HasSuffix(strings.ToLower(name), ".db") ||
+			strings.HasSuffix(strings.ToLower(name), ".db-wal") ||
+			strings.HasSuffix(strings.ToLower(name), ".db-shm") {
+			return nil
+		}
+
+		dst := filepath.Join(tempDir, rel)
+		if info.IsDir() {
+			return os.MkdirAll(dst, 0o755)
+		}
+		return copyFile(p, dst)
+	})
+}
+
+// backupSQLiteTo 使用 SQLite VACUUM INTO 将当前数据库一致性备份到指定路径
+func backupSQLiteTo(destDBPath string) error {
+	if err := os.MkdirAll(filepath.Dir(destDBPath), 0o755); err != nil {
+		return fmt.Errorf("failed to create parent directory for db: %v", err)
+	}
+
+	db := dbcore.GetDBInstance()
+	sqlDB, err := db.DB()
+	if err != nil {
+		return fmt.Errorf("failed to get underlying database connection: %v", err)
+	}
+
+	safePath := strings.ReplaceAll(destDBPath, "'", "''")
+	vacuumSQL := fmt.Sprintf("VACUUM INTO '%s'", safePath)
+	if _, err = sqlDB.Exec(vacuumSQL); err != nil {
+		return fmt.Errorf("sqlite VACUUM INTO failed: %v", err)
+	}
+	return nil
+}
+
+// DownloadBackup 用于打包 ./data 目录及数据库文件为 zip 并通过 HTTP 下载
+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))
+		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))
+		return
+	}
+
+	// 3) 处理数据库备份 -> 临时目录/komari.db
+	destDB := filepath.Join(tempDir, "komari.db")
+	dbFilePath := conf.Conf.Database.DatabaseFile
+
+	if conf.Conf.Database.DatabaseType == "sqlite" || conf.Conf.Database.DatabaseType == "" {
+		if err := backupSQLiteTo(destDB); err != nil {
+			resp.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))
+				return
+			}
+		} else if !os.IsNotExist(err) {
+			resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error stating database file: %v", err))
+			return
+		}
+	}
+
+	// 4) 开始写出 ZIP（以临时目录为根）
+	backupFileName := fmt.Sprintf("backup-%d.zip", time.Now().UnixMicro())
+	c.Writer.Header().Set("Content-Type", "application/zip")
+	c.Writer.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", backupFileName))
+
+	zipWriter := zip.NewWriter(c.Writer)
+	defer zipWriter.Close()
+
+	// 写入临时目录里的内容
+	err = filepath.Walk(tempDir, func(p string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		rel, err := filepath.Rel(tempDir, p)
+		if err != nil {
+			return err
+		}
+		if rel == "." {
+			return nil
+		}
+		// zip 内路径统一正斜杠
+		zipPath := filepath.ToSlash(rel)
+		if info.IsDir() {
+			_, err := zipWriter.CreateHeader(&zip.FileHeader{
+				Name:     zipPath + "/",
+				Method:   zip.Deflate,
+				Modified: info.ModTime(),
+			})
+			return err
+		}
+		f, err := os.Open(p)
+		if err != nil {
+			return err
+		}
+		defer f.Close()
+		w, err := zipWriter.CreateHeader(&zip.FileHeader{
+			Name:     zipPath,
+			Method:   zip.Deflate,
+			Modified: info.ModTime(),
+		})
+		if err != nil {
+			return err
+		}
+		_, err = io.Copy(w, f)
+		return err
+	})
+	if err != nil {
+		resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error archiving temp folder: %v", err))
+		return
+	}
+
+	// 5) 追加备份标记文件（放在 zip 根目录）
+	markupContent := "此文件为 Komari 备份标记文件，请勿删除。\nThis is a Komari backup markup file, please do not delete.\n\n备份时间 / Backup Time: " + time.Now().Format(time.RFC3339)
+	markupWriter, err := zipWriter.CreateHeader(&zip.FileHeader{
+		Name:     "komari-backup-markup",
+		Method:   zip.Deflate,
+		Modified: time.Now(),
+	})
+	if err != nil {
+		resp.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))
+		return
+	}
+}

internal/api_v1/admin/exec.go

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

internal/api_v1/admin/log/log.go

@@ -4,9 +4,9 @@ import (
 	"strconv"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/dbcore"
-	"github.com/komari-monitor/komari/database/models"
+	"github.com/komari-monitor/komari/internal/api_v1/resp"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/dbcore"
 )
 
 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 {
-		api.RespondError(c, 400, "Invalid limit: "+limit)
+		resp.RespondError(c, 400, "Invalid limit: "+limit)
 		return
 	}
 	pageInt, err := strconv.Atoi(page)
 	if err != nil || pageInt <= 0 {
-		api.RespondError(c, 400, "Invalid page: "+page)
+		resp.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 {
-		api.RespondError(c, 500, "Failed to count logs: "+err.Error())
+		resp.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 {
-		api.RespondError(c, 500, "Failed to retrieve logs: "+err.Error())
+		resp.RespondError(c, 500, "Failed to retrieve logs: "+err.Error())
 		return
 	}
-	api.RespondSuccess(c, gin.H{"logs": logs, "total": total})
+	resp.RespondSuccess(c, gin.H{"logs": logs, "total": total})
 }

internal/api_v1/admin/messageSender.go

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

internal/api_v1/admin/notification/load.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/notification"
+	"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"
 )
 
 // 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 {
-		api.RespondError(c, http.StatusBadRequest, err.Error())
+		resp.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
 	if req.Interval > 4*60 || req.Interval <= 0 {
-		api.RespondError(c, http.StatusBadRequest, "Interval must be between 1 and 240 minutes")
+		resp.RespondError(c, http.StatusBadRequest, "Interval must be between 1 and 240 minutes")
 		return
 	}
 	if req.Ratio <= 0 || req.Ratio > 1 {
-		api.RespondError(c, http.StatusBadRequest, "Ratio must be between 0 and 1")
+		resp.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 {
-		api.RespondError(c, http.StatusInternalServerError, err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
-		api.RespondSuccess(c, gin.H{"task_id": taskID})
+		resp.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 {
-		api.RespondError(c, http.StatusBadRequest, err.Error())
+		resp.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
 	if err := notification.DeleteLoadNotification(req.ID); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
-		api.RespondSuccess(c, nil)
+		resp.RespondSuccess(c, nil)
 	}
 }
 
@@ -65,26 +65,26 @@ func EditLoadNotification(c *gin.Context) {
 	}
 
 	if err := c.ShouldBindJSON(&req); err != nil {
-		api.RespondError(c, http.StatusBadRequest, "Invalid request data")
+		resp.RespondError(c, http.StatusBadRequest, "Invalid request data")
 		return
 	}
 
 	if err := notification.EditLoadNotification(req.Notifications); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
 		// for _, notification := range req.Notifications {
 		// 	notification.DeleteLoadNotification([]uint{notification.Id})
 		// }
-		api.RespondSuccess(c, nil)
+		resp.RespondSuccess(c, nil)
 	}
 }
 
 func GetAllLoadNotifications(c *gin.Context) {
 	notifications, err := notification.GetAllLoadNotifications()
 	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, err.Error())
 		return
 	}
 
-	api.RespondSuccess(c, notifications)
+	resp.RespondSuccess(c, notifications)
 }

internal/api_v1/admin/notification/offline.go

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

internal/api_v1/admin/oauth.go

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

internal/api_v1/admin/ping.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/tasks"
+	"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"
 )
 
 // POST body: clients []string, target, task_type string, interval int
@@ -20,14 +20,14 @@ func AddPingTask(c *gin.Context) {
 	}
 
 	if err := c.ShouldBindJSON(&req); err != nil {
-		api.RespondError(c, http.StatusBadRequest, err.Error())
+		resp.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
 	if taskID, err := tasks.AddPingTask(req.Clients, req.Name, req.Target, req.TaskType, req.Interval); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
-		api.RespondSuccess(c, gin.H{"task_id": taskID})
+		resp.RespondSuccess(c, gin.H{"task_id": taskID})
 	}
 }
 
@@ -37,14 +37,14 @@ func DeletePingTask(c *gin.Context) {
 		ID []uint `json:"id" binding:"required"`
 	}
 	if err := c.ShouldBindJSON(&req); err != nil {
-		api.RespondError(c, http.StatusBadRequest, err.Error())
+		resp.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
 	if err := tasks.DeletePingTask(req.ID); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
-		api.RespondSuccess(c, nil)
+		resp.RespondSuccess(c, nil)
 	}
 }
 
@@ -55,26 +55,26 @@ func EditPingTask(c *gin.Context) {
 	}
 
 	if err := c.ShouldBindJSON(&req); err != nil {
-		api.RespondError(c, http.StatusBadRequest, "Invalid request data")
+		resp.RespondError(c, http.StatusBadRequest, "Invalid request data")
 		return
 	}
 
 	if err := tasks.EditPingTask(req.Tasks); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, err.Error())
 	} else {
 		// for _, task := range req.Tasks {
 		// 	tasks.DeletePingRecords([]uint{task.Id})
 		// }
-		api.RespondSuccess(c, nil)
+		resp.RespondSuccess(c, nil)
 	}
 }
 
 func GetAllPingTasks(c *gin.Context) {
 	tasks, err := tasks.GetAllPingTasks()
 	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, err.Error())
 		return
 	}
 
-	api.RespondSuccess(c, tasks)
+	resp.RespondSuccess(c, tasks)
 }

internal/api_v1/admin/sessions.go

@@ -1,9 +1,9 @@
 package admin
 
 import (
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/auditlog"
+	"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/gin-gonic/gin"
 )
@@ -12,7 +12,7 @@ func GetSessions(c *gin.Context) {
 
 	ss, err := accounts.GetAllSessions()
 	if err != nil {
-		api.RespondError(c, 500, "Failed to retrieve sessions: "+err.Error())
+		resp.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 {
-		api.RespondError(c, 400, "Invalid request: "+err.Error())
+		resp.RespondError(c, 400, "Invalid request: "+err.Error())
 		return
 	}
 	err := accounts.DeleteSession(req.Session)
 	if err != nil {
-		api.RespondError(c, 500, "Failed to delete session: "+err.Error())
+		resp.RespondError(c, 500, "Failed to delete session: "+err.Error())
 		return
 	}
 	uuid, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), uuid.(string), "delete session", "info")
-	api.RespondSuccess(c, nil)
+	resp.RespondSuccess(c, nil)
 }
 
 func DeleteAllSession(c *gin.Context) {
 
 	err := accounts.DeleteAllSessions()
 	if err != nil {
-		api.RespondError(c, 500, "Failed to delete all sessions: "+err.Error())
+		resp.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")
-	api.RespondSuccess(c, nil)
+	resp.RespondSuccess(c, nil)
 }

internal/api_v1/admin/settings.go

@@ -3,26 +3,25 @@ package admin
 import (
 	"database/sql"
 
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/records"
-	"github.com/komari-monitor/komari/database/tasks"
+	"github.com/komari-monitor/komari/internal/api_v1/resp"
+	"github.com/komari-monitor/komari/internal/conf"
+	"github.com/komari-monitor/komari/internal/database/auditlog"
+	"github.com/komari-monitor/komari/internal/database/records"
+	"github.com/komari-monitor/komari/internal/database/tasks"
 
 	"github.com/gin-gonic/gin"
 )
 
 // GetSettings 获取自定义配置
 func GetSettings(c *gin.Context) {
-	cst, err := config.Get()
+	cst, err := conf.GetWithV1Format()
 	if err != nil {
 		if err == sql.ErrNoRows {
 			//override
-			cst = models.Config{Sitename: "Komari"}
+			cst = conf.V1Struct{Sitename: "Komari"}
 			cst.ID = 1
-			config.Save(cst)
-			api.RespondSuccess(c, cst)
+			conf.Save(cst)
+			resp.RespondSuccess(c, cst)
 			return
 		}
 		c.JSON(500, gin.H{
@@ -30,20 +29,20 @@ func GetSettings(c *gin.Context) {
 			"message": "Internal Server Error: " + err.Error(),
 		})
 	}
-	api.RespondSuccess(c, cst)
+	resp.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())
+		resp.RespondError(c, 400, "Invalid or missing request body: "+err.Error())
 		return
 	}
 
 	cfg["id"] = 1 // Only one record
-	if err := config.Update(cfg); err != nil {
-		api.RespondError(c, 500, "Failed to update settings: "+err.Error())
+	if err := conf.Update(cfg); err != nil {
+		resp.RespondError(c, 500, "Failed to update settings: "+err.Error())
 		return
 	}
 
@@ -60,7 +59,7 @@ func EditSettings(c *gin.Context) {
 		message = message[:len(message)-2]
 	}
 	auditlog.Log(c.ClientIP(), uuid.(string), message, "info")
-	api.RespondSuccess(c, nil)
+	resp.RespondSuccess(c, nil)
 }
 
 func contains(slice []string, item string) bool {
@@ -77,5 +76,5 @@ func ClearAllRecords(c *gin.Context) {
 	tasks.DeleteAllPingRecords()
 	uuid, _ := c.Get("uuid")
 	auditlog.Log(c.ClientIP(), uuid.(string), "clear all records", "info")
-	api.RespondSuccess(c, nil)
+	resp.RespondSuccess(c, nil)
 }

internal/api_v1/admin/task.go

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

internal/api_v1/admin/test/test.go

@@ -0,0 +1,50 @@
+package test
+
+import (
+	"net"
+
+	"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/geoip"
+	"github.com/komari-monitor/komari/internal/messageSender"
+)
+
+func TestSendMessage(c *gin.Context) {
+	err := messageSender.SendEvent(models.EventMessage{
+		Event:   "Test",
+		Message: "This is a test message from Komari.",
+	})
+	if err != nil {
+		resp.RespondError(c, 500, "Failed to send message: "+err.Error())
+		return
+	}
+	resp.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()
+		}
+	}
+	conf, err := conf.GetWithV1Format()
+	if err != nil {
+		resp.RespondError(c, 500, "Failed to get configuration: "+err.Error())
+		return
+	}
+	if !conf.GeoIpEnabled {
+		resp.RespondError(c, 400, "GeoIP is not enabled in the configuration.")
+		return
+	}
+	GeoIpRecord, err := geoip.GetGeoInfo(net.ParseIP(ip))
+	if err != nil {
+		resp.RespondError(c, 500, "Failed to get GeoIP record: "+err.Error())
+		return
+	}
+	resp.RespondSuccess(c, GeoIpRecord)
+}

internal/api_v1/admin/theme.go

@@ -13,9 +13,10 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/api"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/database/models"
+	"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"
 )
 
 // UploadTheme 上传主题
@@ -23,32 +24,32 @@ func UploadTheme(c *gin.Context) {
 	// 读取上传的文件内容
 	data, err := io.ReadAll(c.Request.Body)
 	if err != nil || len(data) == 0 {
-		api.RespondError(c, http.StatusBadRequest, "请选择要上传的主题文件")
+		resp.RespondError(c, http.StatusBadRequest, "请选择要上传的主题文件")
 		return
 	}
 
 	// 临时文件名
 	tempFile := filepath.Join(os.TempDir(), "uploaded_theme.zip")
 	if err := os.WriteFile(tempFile, data, 0644); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "保存文件失败: "+err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, "保存文件失败: "+err.Error())
 		return
 	}
 	defer os.Remove(tempFile)
 
 	// 检查文件扩展名（这里假定上传的就是zip）
 	if !strings.HasSuffix(strings.ToLower(tempFile), ".zip") {
-		api.RespondError(c, http.StatusBadRequest, "只支持ZIP格式的主题文件")
+		resp.RespondError(c, http.StatusBadRequest, "只支持ZIP格式的主题文件")
 		return
 	}
 
 	// 解压ZIP文件并验证
 	themeInfo, err := extractAndValidateTheme(tempFile)
 	if err != nil {
-		api.RespondError(c, http.StatusBadRequest, err.Error())
+		resp.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
-	api.RespondSuccessMessage(c, "主题上传成功", themeInfo)
+	resp.RespondSuccessMessage(c, "主题上传成功", themeInfo)
 }
 
 // ListThemes 列出所有主题
@@ -57,13 +58,13 @@ func ListThemes(c *gin.Context) {
 
 	// 确保主题目录存在
 	if _, err := os.Stat(dataDir); os.IsNotExist(err) {
-		api.RespondSuccess(c, []models.Theme{})
+		resp.RespondSuccess(c, []models.Theme{})
 		return
 	}
 
 	entries, err := os.ReadDir(dataDir)
 	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "读取主题目录失败: "+err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, "读取主题目录失败: "+err.Error())
 		return
 	}
 
@@ -77,7 +78,7 @@ func ListThemes(c *gin.Context) {
 		}
 	}
 
-	api.RespondSuccess(c, themes)
+	resp.RespondSuccess(c, themes)
 }
 
 // DeleteTheme 删除主题
@@ -87,12 +88,12 @@ func DeleteTheme(c *gin.Context) {
 	}
 
 	if err := c.ShouldBindJSON(&req); err != nil {
-		api.RespondError(c, http.StatusBadRequest, "参数错误: "+err.Error())
+		resp.RespondError(c, http.StatusBadRequest, "参数错误: "+err.Error())
 		return
 	}
 
 	if req.Short == "default" {
-		api.RespondError(c, http.StatusBadRequest, "默认主题不能删除")
+		resp.RespondError(c, http.StatusBadRequest, "默认主题不能删除")
 		return
 	}
 
@@ -100,24 +101,24 @@ func DeleteTheme(c *gin.Context) {
 
 	// 检查主题是否存在
 	if _, err := os.Stat(themeDir); os.IsNotExist(err) {
-		api.RespondError(c, http.StatusNotFound, "主题不存在")
+		resp.RespondError(c, http.StatusNotFound, "主题不存在")
 		return
 	}
 
 	// 删除主题目录
 	if err := os.RemoveAll(themeDir); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "删除主题失败: "+err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, "删除主题失败: "+err.Error())
 		return
 	}
 
-	api.RespondSuccessMessage(c, "主题删除成功", nil)
+	resp.RespondSuccessMessage(c, "主题删除成功", nil)
 }
 
 // SetTheme 设置主题
 func SetTheme(c *gin.Context) {
 	themeName := c.Query("theme")
 	if themeName == "" {
-		api.RespondError(c, http.StatusBadRequest, "主题名称不能为空")
+		resp.RespondError(c, http.StatusBadRequest, "主题名称不能为空")
 		return
 	}
 
@@ -127,7 +128,7 @@ func SetTheme(c *gin.Context) {
 		themeConfigPath := filepath.Join(themeDir, "komari-theme.json")
 
 		if _, err := os.Stat(themeConfigPath); os.IsNotExist(err) {
-			api.RespondError(c, http.StatusNotFound, "主题不存在")
+			resp.RespondError(c, http.StatusNotFound, "主题不存在")
 			return
 		}
 	}
@@ -137,12 +138,12 @@ func SetTheme(c *gin.Context) {
 		"theme": themeName,
 	}
 
-	if err := config.Update(updateData); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "更新主题设置失败: "+err.Error())
+	if err := conf.Update(updateData); err != nil {
+		resp.RespondError(c, http.StatusInternalServerError, "更新主题设置失败: "+err.Error())
 		return
 	}
 
-	api.RespondSuccessMessage(c, "主题设置成功", gin.H{"theme": themeName})
+	resp.RespondSuccessMessage(c, "主题设置成功", gin.H{"theme": themeName})
 }
 
 // extractAndValidateTheme 解压并验证主题
@@ -430,7 +431,7 @@ func UpdateTheme(c *gin.Context) {
 	}
 
 	if err := c.ShouldBindJSON(&req); err != nil {
-		api.RespondError(c, http.StatusBadRequest, "参数错误: "+err.Error())
+		resp.RespondError(c, http.StatusBadRequest, "参数错误: "+err.Error())
 		return
 	}
 
@@ -439,14 +440,14 @@ func UpdateTheme(c *gin.Context) {
 	themeConfigPath := filepath.Join(themeDir, "komari-theme.json")
 
 	if _, err := os.Stat(themeConfigPath); os.IsNotExist(err) {
-		api.RespondError(c, http.StatusNotFound, "主题不存在")
+		resp.RespondError(c, http.StatusNotFound, "主题不存在")
 		return
 	}
 
 	// 加载现有主题配置
 	themeInfo, err := loadThemeConfig(themeConfigPath)
 	if err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "读取主题配置失败: "+err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, "读取主题配置失败: "+err.Error())
 		return
 	}
 
@@ -493,14 +494,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 {
-				api.RespondError(c, http.StatusBadRequest, "从GitHub获取下载链接失败: "+err.Error())
+				resp.RespondError(c, http.StatusBadRequest, "从GitHub获取下载链接失败: "+err.Error())
 				return
 			}
 
 			// 使用获取到的链接下载主题
 			themeData, err = downloadThemeFromURL(gitHubURL)
 			if err != nil {
-				api.RespondError(c, http.StatusBadRequest, "从GitHub下载主题失败: "+err.Error())
+				resp.RespondError(c, http.StatusBadRequest, "从GitHub下载主题失败: "+err.Error())
 				return
 			}
 			// 保存下载链接，稍后更新到主题配置中
@@ -514,14 +515,14 @@ func UpdateTheme(c *gin.Context) {
 				// 这里也应用了自动检测GitHub仓库并下载最新release的功能
 				gitHubURL, err := getGitHubReleaseDownloadURL(owner, repo)
 				if err != nil {
-					api.RespondError(c, http.StatusBadRequest, "从GitHub获取下载链接失败: "+err.Error())
+					resp.RespondError(c, http.StatusBadRequest, "从GitHub获取下载链接失败: "+err.Error())
 					return
 				}
 
 				// 使用获取到的链接下载主题
 				themeData, err = downloadThemeFromURL(gitHubURL)
 				if err != nil {
-					api.RespondError(c, http.StatusBadRequest, "从GitHub下载主题失败: "+err.Error())
+					resp.RespondError(c, http.StatusBadRequest, "从GitHub下载主题失败: "+err.Error())
 					return
 				}
 				// 保存GitHub仓库URL，而不是release下载链接，以便将来可以获取最新版本
@@ -532,7 +533,7 @@ func UpdateTheme(c *gin.Context) {
 				// 新URL不是GitHub仓库地址，直接尝试下载
 				themeData, err = downloadThemeFromURL(req.URL)
 				if err != nil {
-					api.RespondError(c, http.StatusBadRequest, "从新URL下载主题失败: "+err.Error())
+					resp.RespondError(c, http.StatusBadRequest, "从新URL下载主题失败: "+err.Error())
 					return
 				}
 				// downloadURL = req.URL
@@ -542,7 +543,7 @@ func UpdateTheme(c *gin.Context) {
 
 	// 如果没有成功下载主题数据
 	if themeData == nil || len(themeData) == 0 {
-		api.RespondError(c, http.StatusBadRequest, "无法下载主题，请提供有效的URL或GitHub仓库信息")
+		resp.RespondError(c, http.StatusBadRequest, "无法下载主题，请提供有效的URL或GitHub仓库信息")
 		return
 	}
 
@@ -555,7 +556,7 @@ func UpdateTheme(c *gin.Context) {
 	// 临时文件名
 	tempFile := filepath.Join(os.TempDir(), "downloaded_theme.zip")
 	if err := os.WriteFile(tempFile, themeData, 0644); err != nil {
-		api.RespondError(c, http.StatusInternalServerError, "保存文件失败: "+err.Error())
+		resp.RespondError(c, http.StatusInternalServerError, "保存文件失败: "+err.Error())
 		return
 	}
 	defer os.Remove(tempFile)
@@ -563,7 +564,7 @@ func UpdateTheme(c *gin.Context) {
 	// 解压ZIP文件并验证
 	updatedThemeInfo, err := extractAndValidateTheme(tempFile)
 	if err != nil {
-		api.RespondError(c, http.StatusBadRequest, err.Error())
+		resp.RespondError(c, http.StatusBadRequest, err.Error())
 		return
 	}
 
@@ -575,15 +576,44 @@ func UpdateTheme(c *gin.Context) {
 	// 	updatedConfigPath := filepath.Join("./data/theme", updatedThemeInfo.Short, "komari-theme.json")
 	// 	updatedConfigData, err := json.MarshalIndent(updatedThemeInfo, "", "  ")
 	// 	if err != nil {
-	// 		api.RespondError(c, http.StatusInternalServerError, "生成主题配置失败: "+err.Error())
+	// 		resp.RespondError(c, http.StatusInternalServerError, "生成主题配置失败: "+err.Error())
 	// 		return
 	// 	}
 
 	// 	if err := os.WriteFile(updatedConfigPath, updatedConfigData, 0644); err != nil {
-	// 		api.RespondError(c, http.StatusInternalServerError, "更新主题配置文件失败: "+err.Error())
+	// 		resp.RespondError(c, http.StatusInternalServerError, "更新主题配置文件失败: "+err.Error())
 	// 		return
 	// 	}
 	// }
 
-	api.RespondSuccessMessage(c, "主题更新成功", updatedThemeInfo)
+	resp.RespondSuccessMessage(c, "主题更新成功", updatedThemeInfo)
+}
+
+func UpdateThemeSettings(c *gin.Context) {
+	theme := c.Query("theme")
+	if theme == "" || theme == "default" {
+		resp.RespondError(c, http.StatusBadRequest, "主题名称不能为空或不能是默认主题")
+		return
+	}
+
+	var req map[string]any
+
+	err := c.ShouldBindJSON(&req)
+	if err != nil {
+		resp.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())
+		return
+	}
+
+	var themeCfg models.ThemeConfiguration
+	db.Where("short = ?", theme).
+		Assign(models.ThemeConfiguration{Short: theme, Data: string(data)}).
+		FirstOrCreate(&themeCfg)
+	resp.RespondSuccess(c, nil)
 }

internal/api_v1/admin/update/favicon.go

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

internal/api_v1/admin/update/geoip.go

@@ -0,0 +1,18 @@
+package update
+
+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/geoip"
+)
+
+func UpdateMmdbGeoIP(c *gin.Context) {
+	if err := geoip.UpdateDatabase(); err != nil {
+		resp.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")
+	resp.RespondSuccess(c, nil)
+}

internal/api_v1/admin/update/user.go

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

internal/api_v1/admin/upload.go

@@ -0,0 +1,125 @@
+package admin
+
+import (
+	"archive/zip"
+	"fmt"
+	"io"
+	"log"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/internal/api_v1/resp"
+)
+
+// 只有一个备份恢复操作在进行
+var restoreMutex sync.Mutex
+
+// UploadBackup 用于接收上传的备份文件并将其内容恢复到原始位置
+func UploadBackup(c *gin.Context) {
+	// 尝试获取锁，如果已有恢复操作在进行，则立即返回错误
+	if !restoreMutex.TryLock() {
+		resp.RespondError(c, http.StatusConflict, "Another restore operation is already in progress")
+		return
+	}
+	defer restoreMutex.Unlock()
+
+	// 获取上传的文件
+	file, header, err := c.Request.FormFile("backup")
+	if err != nil {
+		resp.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")
+		return
+	}
+
+	// 确保data目录存在
+	if err := os.MkdirAll("./data", 0755); err != nil {
+		resp.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))
+		return
+	}
+	tempFilePath := tempFile.Name()
+	defer os.Remove(tempFilePath) // 确保临时文件最终被删除
+
+	// 将上传的文件内容复制到临时文件
+	_, err = io.Copy(tempFile, file)
+	if err != nil {
+		tempFile.Close()
+		resp.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error saving uploaded file: %v", err))
+		return
+	}
+	tempFile.Close() // 关闭文件以便后续操作
+
+	// 基础校验：检查是否包含标记文件
+	if zr, err := zip.OpenReader(tempFilePath); err == nil {
+		hasMarkup := false
+		for _, f := range zr.File {
+			if f.Name == "komari-backup-markup" {
+				hasMarkup = true
+				break
+			}
+		}
+		zr.Close()
+		if !hasMarkup {
+			resp.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))
+		return
+	}
+
+	// 将校验通过的临时文件移动到固定路径 ./data/backup.zip
+	finalPath := filepath.Join(".", "data", "backup.zip")
+	// 如存在旧文件，先删除
+	_ = os.Remove(finalPath)
+	if err := os.Rename(tempFilePath, finalPath); err != nil {
+		// fallback：拷贝
+		in, err2 := os.Open(tempFilePath)
+		if err2 != nil {
+			resp.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))
+			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))
+			return
+		}
+		out.Close()
+	}
+
+	// 返回：已保存备份，重启后将自动恢复
+	c.JSON(http.StatusOK, gin.H{
+		"status":  "success",
+		"message": "Backup uploaded successfully. The service will restart and apply the backup.",
+		"path":    "./data/backup.zip",
+	})
+
+	go func() {
+		log.Println("Backup uploaded, restarting service in 2 seconds to apply on startup...")
+		time.Sleep(2 * time.Second)
+		os.Exit(0)
+	}()
+}

internal/api_v1/client/autoDiscovery.go

@@ -0,0 +1,47 @@
+package client
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/gookit/event"
+	"github.com/komari-monitor/komari/internal/api_v1/resp"
+	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/pkg/utils"
+)
+
+func RegisterClient(c *gin.Context) {
+	auth := c.GetHeader("Authorization")
+	if auth == "" {
+		resp.RespondError(c, 403, "Invalid AutoDiscovery Key")
+		return
+	}
+	cfg, err := conf.GetWithV1Format()
+	if err != nil {
+		resp.RespondError(c, 500, "Failed to get configuration: "+err.Error())
+		return
+	}
+
+	if cfg.AutoDiscoveryKey == "" ||
+		len(cfg.AutoDiscoveryKey) < 12 ||
+		"Bearer "+cfg.AutoDiscoveryKey != auth {
+
+		resp.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 {
+		resp.RespondError(c, 500, "Failed to create client: "+err.Error())
+		return
+	}
+	event.Trigger(eventType.ClientCreated, event.M{
+		"client": uuid,
+		"token":  token,
+	})
+	resp.RespondSuccess(c, gin.H{"uuid": uuid, "token": token})
+}

internal/api_v1/client/report.go

@@ -0,0 +1,231 @@
+package client
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"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/patrickmn/go-cache"
+)
+
+const (
+	// 如果超过这个时间没有收到任何消息，则认为连接已死
+	// 因为目前server没有存agent的信息上报间隔。只有写一个默认的
+	readWait = 11 * time.Second
+)
+
+func UploadReport(c *gin.Context) {
+	bodyBytes, err := io.ReadAll(c.Request.Body)
+	if err != nil {
+		log.Println("Failed to read request body:", err)
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
+		return
+	}
+
+	var data map[string]interface{}
+	err = json.Unmarshal(bodyBytes, &data)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
+		return
+	}
+	// Save report to database
+	var report common.Report
+	err = json.Unmarshal(bodyBytes, &report)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
+		return
+	}
+	report.UpdatedAt = time.Now()
+	err = SaveClientReport(report.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)
+
+	c.Request.Body = io.NopCloser(bytes.NewBuffer(bodyBytes)) // Restore the body for further use
+	c.JSON(200, gin.H{"status": "success"})
+}
+
+func WebSocketReport(c *gin.Context) {
+	// 升级ws
+	if !websocket.IsWebSocketUpgrade(c.Request) {
+		c.JSON(http.StatusBadRequest, gin.H{"status": "error", "error": "Require WebSocket upgrade"})
+		return
+	}
+	upgrader := websocket.Upgrader{
+		CheckOrigin: func(r *http.Request) bool {
+			return true // 被控
+		},
+	}
+	// 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"})
+		return
+	}
+	conn := ws.NewSafeConn(unsafeConn)
+	defer conn.Close()
+
+	_, message, err := conn.ReadMessage()
+	if err != nil {
+		log.Println("Error reading message:", err)
+		return
+	}
+
+	// 第一次数据拿token
+	data := map[string]interface{}{}
+	err = json.Unmarshal(message, &data)
+	if err != nil {
+		conn.WriteJSON(gin.H{"status": "error", "error": "Invalid JSON"})
+		return
+	}
+	// it should ok,token was verfied in the middleware
+	token := ""
+	var errMsg string
+
+	// 优先检查查询参数中的 token
+	token = c.Query("token")
+
+	// 如果 token 为空，返回错误
+	if token == "" {
+		conn.WriteJSON(gin.H{"status": "error", "error": errMsg})
+		return
+	}
+
+	uuid, err := clients.GetClientUUIDByToken(token)
+	if err != nil {
+		conn.WriteJSON(gin.H{"status": "error", "error": errMsg})
+		return
+	}
+
+	// 接受新连接，并处理旧连接
+	if oldConn, exists := ws.GetConnectedClients()[uuid]; exists {
+		log.Printf("Client %s is reconnecting. Closing the old connection.", uuid)
+
+		// 强制关闭旧连接。这将导致旧连接的 ReadMessage() 循环出错退出。
+		go oldConn.Close()
+	}
+	ws.SetConnectedClients(uuid, conn)
+	//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)
+
+	for {
+		conn.SetReadDeadline(time.Now().Add(readWait))
+
+		_, message, err := conn.ReadMessage()
+		if err != nil {
+			if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
+				log.Printf("Client %s connection error: %v", uuid, err)
+			}
+			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,
+	})
+}
+
+// 将消息处理逻辑提取到一个函数中，方便复用
+func processMessage(conn *ws.SafeConn, message []byte, uuid string) {
+	type MessageType struct {
+		Type string `json:"type"`
+	}
+	var msgType MessageType
+	err := json.Unmarshal(message, &msgType)
+	if err != nil {
+		conn.WriteJSON(gin.H{"status": "error", "error": "Invalid JSON"})
+		return
+	}
+
+	switch msgType.Type {
+	case "", "report":
+		report := common.Report{}
+		err = json.Unmarshal(message, &report)
+		if err != nil {
+			conn.WriteJSON(gin.H{"status": "error", "error": "Invalid report format"})
+			return
+		}
+		report.UpdatedAt = time.Now()
+		err = SaveClientReport(uuid, report)
+		if err != nil {
+			conn.WriteJSON(gin.H{"status": "error", "error": fmt.Sprintf("%v", err)})
+			return
+		}
+		ws.SetLatestReport(uuid, &report)
+	case "ping_result":
+		var reqBody struct {
+			PingTaskID uint      `json:"task_id"`
+			PingResult int       `json:"value"`
+			PingType   string    `json:"ping_type"`
+			FinishedAt time.Time `json:"finished_at"`
+		}
+		err = json.Unmarshal(message, &reqBody)
+		if err != nil {
+			conn.WriteJSON(gin.H{"status": "error", "error": "Invalid ping result format"})
+			return
+		}
+		pingResult := models.PingRecord{
+			Client: uuid,
+			TaskId: reqBody.PingTaskID,
+			Value:  reqBody.PingResult,
+			Time:   models.FromTime(reqBody.FinishedAt),
+		}
+		tasks.SavePingRecord(pingResult)
+	default:
+		log.Printf("Unknown message type: %s", msgType.Type)
+		conn.WriteJSON(gin.H{"status": "error", "error": "Unknown message type"})
+	}
+}
+
+func SaveClientReport(uuid string, report common.Report) error {
+	reports, _ := vars.Records.Get(uuid)
+	if reports == nil {
+		reports = []common.Report{}
+	}
+	if report.CPU.Usage < 0.01 {
+		report.CPU.Usage = 0.01
+	}
+	reports = append(reports.([]common.Report), report)
+	vars.Records.Set(uuid, reports, cache.DefaultExpiration)
+
+	return nil
+}

internal/api_v1/client/task.go

@@ -4,9 +4,11 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/models"
-	"github.com/komari-monitor/komari/database/tasks"
+	"github.com/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"
 )
 
 func TaskResult(c *gin.Context) {
@@ -33,4 +35,9 @@ 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,
+	})
 }

internal/api_v1/client/terminal.go

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

internal/api_v1/client/uploadBasicInfo.go

@@ -3,13 +3,27 @@ package client
 import (
 	"net"
 
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/utils/geoip"
+	"github.com/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/gin-gonic/gin"
 )
 
+func getClientIPType(ip net.IP) int {
+	// 0:ipv4 1:ipv6 -1:错误的输入
+	if ip == nil {
+		return -1
+	}
+	if ip.To4() == nil {
+		return 1
+	} else {
+		return 0
+	}
+}
+
 func UploadBasicInfo(c *gin.Context) {
 	var cbi = map[string]interface{}{}
 	if err := c.ShouldBindJSON(&cbi); err != nil {
@@ -26,7 +40,29 @@ func UploadBasicInfo(c *gin.Context) {
 
 	cbi["uuid"] = uuid
 
-	if cfg, err := config.Get(); err == nil && cfg.GeoIpEnabled {
+	if (func() bool {
+		if v4, ok := cbi["ipv4"].(string); !ok || v4 == "" {
+			if v6, ok := cbi["ipv6"].(string); !ok || v6 == "" {
+				return true
+			}
+		}
+		return false
+	})() {
+		ipStr := c.ClientIP()
+		ip := net.ParseIP(ipStr)
+		ipType := getClientIPType(ip)
+
+		switch ipType {
+		case 0:
+			cbi["ipv4"] = ip
+		case 1:
+			cbi["ipv6"] = ip
+		default:
+			break
+		}
+	}
+
+	if cfg, err := conf.GetWithV1Format(); err == nil && cfg.GeoIpEnabled {
 		if ipv4, ok := cbi["ipv4"].(string); ok && ipv4 != "" {
 			ip4 := net.ParseIP(ipv4)
 			ip4_record, _ := geoip.GetGeoInfo(ip4)
@@ -42,10 +78,15 @@ func UploadBasicInfo(c *gin.Context) {
 		}
 	}
 
-	if err := clients.SaveClientInfo(cbi); err != nil {
+	if err := clients.PartialUpdate(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"})
+
 }

internal/api_v1/init.go

@@ -0,0 +1,200 @@
+package api_v1
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/gookit/event"
+	"github.com/komari-monitor/komari/internal/api_v1/admin"
+	"github.com/komari-monitor/komari/internal/api_v1/admin/clipboard"
+	log_api "github.com/komari-monitor/komari/internal/api_v1/admin/log"
+	"github.com/komari-monitor/komari/internal/api_v1/admin/notification"
+	"github.com/komari-monitor/komari/internal/api_v1/admin/test"
+	"github.com/komari-monitor/komari/internal/api_v1/admin/update"
+	"github.com/komari-monitor/komari/internal/api_v1/client"
+	"github.com/komari-monitor/komari/internal/api_v1/record"
+	"github.com/komari-monitor/komari/internal/api_v1/resp"
+	"github.com/komari-monitor/komari/internal/api_v1/task"
+	"github.com/komari-monitor/komari/internal/api_v1/terminal"
+	"github.com/komari-monitor/komari/internal/conf"
+	"github.com/komari-monitor/komari/internal/eventType"
+)
+
+func init() {
+	event.On(eventType.ServerInitializeStart, event.ListenerFunc(func(e event.Event) error {
+		r := e.Get("engine").(*gin.Engine)
+		config, _ := conf.GetWithV1Format()
+		LoadApiV1Routes(r, config)
+		return nil
+	}), event.Normal+5)
+
+	event.On(eventType.SchedulerEveryMinute, event.ListenerFunc(func(e event.Event) error {
+		SaveClientReportToDB()
+		return nil
+	}))
+}
+
+func LoadApiV1Routes(r *gin.Engine, conf conf.V1Struct) {
+	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.Use(PrivateSiteMiddleware())
+
+	r.Any("/ping", func(c *gin.Context) {
+		c.String(200, "pong")
+	})
+	// #region 公开路由
+	r.POST("/api/login", Login)
+	r.GET("/api/me", GetMe)
+	r.GET("/api/clients", GetClients)
+	r.GET("/api/nodes", GetNodesInformation)
+	r.GET("/api/public", GetPublicSettings)
+	r.GET("/api/oauth", OAuth)
+	r.GET("/api/oauth_callback", OAuthCallback)
+	r.GET("/api/logout", Logout)
+	r.GET("/api/version", resp.GetVersion)
+	r.GET("/api/recent/:uuid", GetClientRecentRecords)
+	r.GET("/api/records/load", record.GetRecordsByUUID)
+	r.GET("/api/records/ping", record.GetPingRecords)
+	r.GET("/api/task/ping", task.GetPublicPingTasks)
+
+	// #region Agent
+	r.POST("/api/clients/register", client.RegisterClient)
+	tokenAuthrized := r.Group("/api/clients", TokenAuthMiddleware())
+	{
+		tokenAuthrized.GET("/report", client.WebSocketReport) // websocket
+		tokenAuthrized.POST("/uploadBasicInfo", client.UploadBasicInfo)
+		tokenAuthrized.POST("/report", client.UploadReport)
+		tokenAuthrized.GET("/terminal", client.EstablishConnection)
+		tokenAuthrized.POST("/task/result", client.TaskResult)
+	}
+	// #region 管理员
+	r.Use(AdminAuthMiddleware())
+	adminAuthrized := r.Group("/api/admin")
+	{
+		adminAuthrized.GET("/download/backup", admin.DownloadBackup)
+		adminAuthrized.POST("/upload/backup", admin.UploadBackup)
+		// test
+		testGroup := adminAuthrized.Group("/test")
+		{
+			testGroup.GET("/geoip", test.TestGeoIp)
+			testGroup.POST("/sendMessage", test.TestSendMessage)
+		}
+		// update
+		updateGroup := adminAuthrized.Group("/update")
+		{
+			updateGroup.POST("/mmdb", update.UpdateMmdbGeoIP)
+			updateGroup.POST("/user", update.UpdateUser)
+			updateGroup.PUT("/favicon", update.UploadFavicon)
+			updateGroup.POST("/favicon", update.DeleteFavicon)
+		}
+		// tasks
+		taskGroup := adminAuthrized.Group("/task")
+		{
+			taskGroup.GET("/all", admin.GetTasks)
+			taskGroup.POST("/exec", admin.Exec)
+			taskGroup.GET("/:task_id", admin.GetTaskById)
+			taskGroup.GET("/:task_id/result", admin.GetTaskResultsByTaskId)
+			taskGroup.GET("/:task_id/result/:uuid", admin.GetSpecificTaskResult)
+			taskGroup.GET("/client/:uuid", admin.GetTasksByClientId)
+		}
+		// settings
+		settingsGroup := adminAuthrized.Group("/settings")
+		{
+			settingsGroup.GET("/", admin.GetSettings)
+			settingsGroup.POST("/", admin.EditSettings)
+			settingsGroup.POST("/oidc", admin.SetOidcProvider)
+			settingsGroup.GET("/oidc", admin.GetOidcProvider)
+			settingsGroup.POST("/message-sender", admin.SetMessageSenderProvider)
+			settingsGroup.GET("/message-sender", admin.GetMessageSenderProvider)
+		}
+		// themes
+		themeGroup := adminAuthrized.Group("/theme")
+		{
+			themeGroup.PUT("/upload", admin.UploadTheme)
+			themeGroup.GET("/list", admin.ListThemes)
+			themeGroup.POST("/delete", admin.DeleteTheme)
+			themeGroup.GET("/set", admin.SetTheme)
+			themeGroup.POST("/update", admin.UpdateTheme)
+			themeGroup.POST("/settings", admin.UpdateThemeSettings)
+		}
+		// clients
+		clientGroup := adminAuthrized.Group("/client")
+		{
+			clientGroup.POST("/add", admin.AddClient)
+			clientGroup.GET("/list", admin.ListClients)
+			clientGroup.GET("/:uuid", admin.GetClient)
+			clientGroup.POST("/:uuid/edit", admin.EditClient)
+			clientGroup.POST("/:uuid/remove", admin.RemoveClient)
+			clientGroup.GET("/:uuid/token", admin.GetClientToken)
+			clientGroup.POST("/order", admin.OrderWeight)
+			// client terminal
+			clientGroup.GET("/:uuid/terminal", 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)
+
+		}
+
+	}
+}

internal/api_v1/latestRecord.go

@@ -0,0 +1,46 @@
+package api_v1
+
+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"
+)
+
+func GetClientRecentRecords(c *gin.Context) {
+	uuid := c.Param("uuid")
+
+	if uuid == "" {
+		resp.RespondError(c, 400, "UUID is required")
+		return
+	}
+
+	// 登录状态检查
+	isLogin := false
+	session, _ := c.Cookie("session_token")
+	_, err := accounts.GetUserBySession(session)
+	if err == nil {
+		isLogin = true
+	}
+
+	// 仅在未登录时需要 Hidden 信息做过滤
+	hiddenMap := map[string]bool{}
+	if !isLogin {
+		var hiddenClients []models.Client
+		db := dbcore.GetDBInstance()
+		_ = db.Select("uuid").Where("hidden = ?", true).Find(&hiddenClients).Error
+		for _, cli := range hiddenClients {
+			hiddenMap[cli.UUID] = true
+		}
+
+		if hiddenMap[uuid] {
+			resp.RespondError(c, 400, "UUID is required") //防止未登录用户获取隐藏客户端数据
+			return
+		}
+	}
+
+	records, _ := vars.Records.Get(uuid)
+	resp.RespondSuccess(c, records)
+}

internal/api_v1/login.go

@@ -0,0 +1,106 @@
+package api_v1
+
+import (
+	"encoding/json"
+	"io"
+	"net/http"
+
+	"github.com/gookit/event"
+	"github.com/komari-monitor/komari/internal/api_v1/resp"
+	"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/gin-gonic/gin"
+)
+
+type LoginRequest struct {
+	Username string `json:"username"`
+	Password string `json:"password"`
+	TwoFa    string `json:"2fa_code"`
+}
+
+func Login(c *gin.Context) {
+	conf, _ := conf.GetWithV1Format()
+	if conf.DisablePasswordLogin {
+		resp.RespondError(c, http.StatusForbidden, "Password login is disabled")
+		return
+	}
+
+	bodyBytes, err := io.ReadAll(c.Request.Body)
+	if err != nil {
+		resp.RespondError(c, http.StatusBadRequest, "Invalid request body: "+err.Error())
+		return
+	}
+	var data LoginRequest
+	err = json.Unmarshal(bodyBytes, &data)
+	if err != nil {
+		resp.RespondError(c, http.StatusBadRequest, "Invalid request body: "+err.Error())
+		return
+	}
+	if data.Username == "" || data.Password == "" {
+		resp.RespondError(c, http.StatusBadRequest, "Invalid request body: Username and password are required")
+		return
+	}
+
+	uuid, success := accounts.CheckPassword(data.Username, data.Password)
+	if !success {
+		resp.RespondError(c, http.StatusUnauthorized, "Invalid credentials")
+		event.Trigger(eventType.LoginFailed, event.M{
+			"username": data.Username,
+			"method":   "password",
+			"ip":       c.ClientIP(),
+			"ua":       c.Request.UserAgent(),
+			"header":   c.Request.Header,
+			"referrer": c.Request.Referer(),
+			"host":     c.Request.Host,
+		})
+		return
+	}
+	// 2FA
+	user, _ := accounts.GetUserByUUID(uuid)
+	if user.TwoFactor != "" { // 开启了2FA
+		if data.TwoFa == "" {
+			resp.RespondError(c, http.StatusUnauthorized, "2FA code is required")
+			return
+		}
+		if ok, err := accounts.Verify2Fa(uuid, data.TwoFa); err != nil || !ok {
+			resp.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 {
+		resp.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")
+	resp.RespondSuccess(c, gin.H{"set-cookie": gin.H{"session_token": session}})
+	event.Trigger(eventType.UserLogin, event.M{
+		"username": data.Username,
+		"method":   "password",
+		"ip":       c.ClientIP(),
+		"ua":       c.Request.UserAgent(),
+		"header":   c.Request.Header,
+		"referrer": c.Request.Referer(),
+		"host":     c.Request.Host,
+	})
+}
+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")
+	event.Trigger(eventType.UserLogout, event.M{
+		"ip":       c.ClientIP(),
+		"ua":       c.Request.UserAgent(),
+		"header":   c.Request.Header,
+		"referrer": c.Request.Referer(),
+		"host":     c.Request.Host,
+	})
+	c.Redirect(302, "/")
+
+}

internal/api_v1/login_test.go

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

internal/api_v1/me.go

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

internal/api_v1/me_test.go

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

internal/api_v1/nodes.go

@@ -0,0 +1,40 @@
+package api_v1
+
+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"
+)
+
+func GetNodesInformation(c *gin.Context) {
+	clientList, err := clients.GetAllClientBasicInfo()
+	if err != nil {
+		resp.RespondError(c, 500, "Failed to retrieve client information: "+err.Error())
+		return
+	}
+	isLogin := false
+	session, _ := c.Cookie("session_token")
+	_, err = accounts.GetUserBySession(session)
+	if err == nil {
+		isLogin = true
+	}
+
+	// 过滤掉 Hidden 的客户端，并清理需要隐藏的字段
+	j := 0
+	for i := 0; i < len(clientList); i++ {
+		if clientList[i].Hidden && !isLogin { // 不返回 Hidden 客户端
+			continue
+		}
+		clientList[i].IPv4 = ""
+		clientList[i].IPv6 = ""
+		clientList[i].Remark = "" // 私有备注不展示
+		clientList[i].Version = ""
+		clientList[i].Token = ""
+		clientList[j] = clientList[i]
+		j++
+	}
+	clientList = clientList[:j]
+
+	resp.RespondSuccess(c, clientList)
+}

internal/api_v1/oauth.go

@@ -1,19 +1,22 @@
-package api
+package api_v1
 
 import (
 	"fmt"
+	"slices"
 
 	"github.com/gin-gonic/gin"
-	"github.com/komari-monitor/komari/database/accounts"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/config"
-	"github.com/komari-monitor/komari/utils"
-	"github.com/komari-monitor/komari/utils/oauth"
+	"github.com/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"
 )
 
 // /api/oauth
 func OAuth(c *gin.Context) {
-	cfg, _ := config.Get()
+	cfg, _ := conf.GetWithV1Format()
 	if !cfg.OAuthEnabled {
 		c.JSON(403, gin.H{"status": "error", "error": "OAuth is not enabled"})
 		return
@@ -28,16 +31,18 @@ func OAuth(c *gin.Context) {
 
 // /api/oauth_callback
 func OAuthCallback(c *gin.Context) {
+
 	// 验证state防止CSRF攻击
 	state, _ := c.Cookie("oauth_state")
 	c.SetCookie("oauth_state", "", -1, "/", "", false, true)
-	
+
 	// 获取当前OAuth提供商名称
 	providerName := oauth.CurrentProvider().GetName()
-	
-	// 对于QQ登录，由于是通过QQ聚合登录平台中转，state可能会不匹配
-	// 但我们仍然需要验证state的存在性（不能是空的）
-	if providerName == "qq" {
+
+	providersSkipStateCheck := []string{"qq"}
+	if slices.Contains(providersSkipStateCheck, providerName) {
+		// 对于QQ登录，由于是通过QQ聚合登录平台中转，state可能会不匹配
+		// 但我们仍然需要验证state的存在性（不能是空的）
 		if state == "" {
 			c.JSON(400, gin.H{"status": "error", "error": "Invalid state"})
 			return
@@ -56,7 +61,7 @@ func OAuthCallback(c *gin.Context) {
 			queries[key] = values[0]
 		}
 	}
-	oidcUser, err := oauth.CurrentProvider().OnCallback(c.Request.Context(), state, queries, utils.GetCallbackURL(c))
+	oidcUser, err := oauth.CurrentProvider().OnCallback(c, state, queries, utils.GetCallbackURL(c))
 	if err != nil {
 		c.JSON(500, gin.H{"status": "error", "error": "Failed to get user info: " + err.Error()})
 		return
@@ -83,7 +88,12 @@ func OAuthCallback(c *gin.Context) {
 			return
 		}
 		auditlog.Log(c.ClientIP(), user.UUID, "bound external account (OAuth)"+fmt.Sprintf(",sso_id: %s", sso_id), "login")
-		c.Redirect(302, "/manage")
+		event.Trigger(eventType.UserOidcBound, event.M{
+			"user":   user.UUID,
+			"sso_id": sso_id,
+		})
+		c.Redirect(302, "/admin")
+
 		return
 	}
 
@@ -94,6 +104,17 @@ 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
 	}
 
@@ -101,11 +122,32 @@ 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")
-}
+
+}

internal/api_v1/public.go

@@ -0,0 +1,16 @@
+package api_v1
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/internal/api_v1/resp"
+	"github.com/komari-monitor/komari/internal/database"
+)
+
+func GetPublicSettings(c *gin.Context) {
+	p, e := database.GetPublicInfo()
+	if e != nil {
+		resp.RespondError(c, 500, e.Error())
+		return
+	}
+	resp.RespondSuccess(c, p)
+}

internal/api_v1/record/record.go

@@ -0,0 +1,447 @@
+package record
+
+import (
+	"slices"
+	"strconv"
+	"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"
+)
+
+func GetRecordsByUUID(c *gin.Context) {
+	uuid := c.Query("uuid")
+	loadType := c.Query("load_type")
+
+	// 登录状态检查
+	isLogin := false
+	session, _ := c.Cookie("session_token")
+	_, err := accounts.GetUserBySession(session)
+	if err == nil {
+		isLogin = true
+	}
+
+	// 仅在未登录时需要 Hidden 信息做过滤
+	hiddenMap := map[string]bool{}
+	if !isLogin {
+		var hiddenClients []models.Client
+		db := dbcore.GetDBInstance()
+		_ = db.Select("uuid").Where("hidden = ?", true).Find(&hiddenClients).Error
+		for _, cli := range hiddenClients {
+			hiddenMap[cli.UUID] = true
+		}
+
+		if hiddenMap[uuid] {
+			resp.RespondError(c, 400, "UUID is required") //防止未登录用户获取隐藏客户端数据
+			return
+		}
+	}
+
+	hours := c.Query("hours")
+	if uuid == "" {
+		resp.RespondError(c, 400, "UUID is required")
+		return
+	}
+	if hours == "" {
+		hours = "4"
+	}
+
+	hoursInt, err := strconv.Atoi(hours)
+	if err != nil {
+		resp.RespondError(c, 400, "Invalid hours parameter")
+		return
+	}
+
+	// 验证 load_type 参数
+	validLoadTypes := map[string]bool{
+		"cpu": true, "ram": true, "swap": true,
+		"load": true, "temp": true, "disk": true, "network": true,
+		"process": true, "connections": true, "all": true, "": true,
+	}
+
+	if !validLoadTypes[loadType] {
+		resp.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())
+		return
+	}
+
+	// 准备基本响应
+	response := gin.H{
+		"records": clientRecords,
+		"count":   len(clientRecords),
+	}
+
+	// 如果有load_type过滤，应用过滤
+	if loadType != "" && loadType != "all" {
+		filteredRecords := filterRecordsByLoadType(clientRecords, loadType)
+		response = gin.H{
+			"records":   filteredRecords,
+			"count":     len(filteredRecords),
+			"load_type": loadType,
+		}
+	}
+
+	// 自动检测是否有GPU数据并附加到响应中
+	if loadType == "" || loadType == "all" || loadType == "gpu" {
+		gpuRecords, err := records.GetGPURecordsByClientAndTime(uuid, time.Now().Add(-time.Duration(hoursInt)*time.Hour), time.Now())
+		if err == nil && len(gpuRecords) > 0 {
+			// 按设备索引分组数据，构建简化的设备结构
+			gpuDevices := make(map[string]interface{})
+
+			for _, record := range gpuRecords {
+				deviceKey := strconv.Itoa(record.DeviceIndex)
+
+				// 如果设备还没有初始化，创建设备信息
+				if gpuDevices[deviceKey] == nil {
+					gpuDevices[deviceKey] = gin.H{
+						"device_index": record.DeviceIndex,
+						"device_name":  record.DeviceName,
+						"records":      []models.GPURecord{},
+					}
+				}
+
+				// 添加记录到设备
+				device := gpuDevices[deviceKey].(gin.H)
+				records := device["records"].([]models.GPURecord)
+				device["records"] = append(records, record)
+				gpuDevices[deviceKey] = device
+			}
+
+			// 添加优化后的GPU数据结构到响应
+			response["gpu_devices"] = gpuDevices
+			response["has_gpu_data"] = true
+		} else {
+			response["has_gpu_data"] = false
+		}
+	}
+
+	resp.RespondSuccess(c, response)
+}
+
+// filterRecordsByLoadType 根据 load_type 过滤记录，只返回相关字段
+func filterRecordsByLoadType(records []models.Record, loadType string) []gin.H {
+	filteredRecords := make([]gin.H, 0, len(records))
+
+	for _, r := range records {
+		record := gin.H{
+			"client": r.Client,
+			"time":   r.Time,
+		}
+
+		switch loadType {
+		case "cpu":
+			record["cpu"] = r.Cpu
+		case "gpu":
+			record["gpu"] = r.Gpu
+		case "ram":
+			record["ram"] = r.Ram
+			record["ram_total"] = r.RamTotal
+			if r.RamTotal > 0 {
+				record["ram_percent"] = float32(r.Ram) / float32(r.RamTotal) * 100
+			}
+		case "swap":
+			record["swap"] = r.Swap
+			record["swap_total"] = r.SwapTotal
+			if r.SwapTotal > 0 {
+				record["swap_percent"] = float32(r.Swap) / float32(r.SwapTotal) * 100
+			}
+		case "load":
+			record["load"] = r.Load
+		case "temp":
+			record["temp"] = r.Temp
+		case "disk":
+			record["disk"] = r.Disk
+			record["disk_total"] = r.DiskTotal
+			if r.DiskTotal > 0 {
+				record["disk_percent"] = float32(r.Disk) / float32(r.DiskTotal) * 100
+			}
+		case "network":
+			record["net_in"] = r.NetIn
+			record["net_out"] = r.NetOut
+			record["net_total_up"] = r.NetTotalUp
+			record["net_total_down"] = r.NetTotalDown
+		case "process":
+			record["process"] = r.Process
+		case "connections":
+			record["connections"] = r.Connections
+			record["connections_udp"] = r.ConnectionsUdp
+			record["connections_tcp"] = r.Connections - r.ConnectionsUdp
+		}
+
+		filteredRecords = append(filteredRecords, record)
+	}
+
+	return filteredRecords
+}
+
+// GET query: uuid string, task_id int, hours int
+// 支持三种查询模式：
+// 1. 仅 uuid - 获取该客户端的所有 ping 任务记录
+// 2. 仅 task_id - 获取该任务的所有客户端记录
+// 3. uuid + task_id - 获取特定客户端在特定任务的记录
+func GetPingRecords(c *gin.Context) {
+	uuid := c.Query("uuid")
+	taskIdStr := c.Query("task_id")
+
+	// 必须提供 uuid 或 task_id 其中至少一个
+	if uuid == "" && taskIdStr == "" {
+		resp.RespondError(c, 400, "UUID or task_id is required")
+		return
+	}
+
+	// 登录状态检查
+	isLogin := false
+	session, _ := c.Cookie("session_token")
+	_, err := accounts.GetUserBySession(session)
+	if err == nil {
+		isLogin = true
+	}
+
+	type RecordsResp struct {
+		TaskId uint   `json:"task_id,omitempty"`
+		Time   string `json:"time"`
+		Value  int    `json:"value"`
+		Client string `json:"client,omitempty"`
+	}
+	type ClientBasicInfo struct {
+		Client string  `json:"client"`
+		Loss   float64 `json:"loss"`
+		Min    int     `json:"min"`
+		Max    int     `json:"max"`
+	}
+	type Resp struct {
+		Count     int               `json:"count"`
+		BasicInfo []ClientBasicInfo `json:"basic_info,omitempty"`
+		Records   []RecordsResp     `json:"records"`
+		Tasks     []gin.H           `json:"tasks,omitempty"`
+	}
+	var records []models.PingRecord
+	hiddenMap := map[string]bool{}
+	response := &Resp{
+		Count:   0,
+		Records: []RecordsResp{},
+	}
+
+	// 仅在未登录时需要 Hidden 信息做过滤
+	if !isLogin {
+		var hiddenClients []models.Client
+		db := dbcore.GetDBInstance()
+		_ = db.Select("uuid").Where("hidden = ?", true).Find(&hiddenClients).Error
+		for _, cli := range hiddenClients {
+			hiddenMap[cli.UUID] = true
+		}
+		if uuid != "" {
+			if hiddenMap[uuid] {
+				resp.RespondSuccess(c, response) // 对于尝试获取隐藏uuid一键哈气
+				return
+			}
+		}
+	}
+
+	hours := c.Query("hours")
+
+	if hours == "" {
+		hours = "4"
+	}
+
+	hoursInt, err := strconv.Atoi(hours)
+	if err != nil {
+		hoursInt = 4
+	}
+
+	endTime := time.Now()
+	startTime := endTime.Add(-time.Duration(hoursInt) * time.Hour)
+
+	// 解析 task_id，支持同时传入 uuid 和 task_id
+	taskId := -1
+	if taskIdStr != "" {
+		taskId, err = strconv.Atoi(taskIdStr)
+		if err != nil {
+			resp.RespondError(c, 400, "Invalid task_id parameter")
+			return
+		}
+	}
+
+	// 查询记录，现在支持 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())
+		return
+	}
+
+	// 用于统计每个客户端的信息（按 task_id 查询时使用）
+	clientStats := make(map[string]struct {
+		total int
+		loss  int
+		min   int
+		max   int
+	})
+
+	for _, r := range records {
+		if r.Client != "" && !isLogin {
+			if hiddenMap[r.Client] {
+				continue // 跳过隐藏的节点
+			}
+		}
+		toTime := r.Time.ToTime()
+		rec := RecordsResp{
+			Time:  toTime.Format(time.RFC3339),
+			Value: r.Value,
+		}
+		rec.Client = r.Client
+		stats := clientStats[r.Client]
+		stats.total++
+
+		if r.Value < 0 {
+			stats.loss++
+		} else {
+			if stats.min == 0 || r.Value < stats.min {
+				stats.min = r.Value
+			}
+			if r.Value > stats.max {
+				stats.max = r.Value
+			}
+		}
+		clientStats[r.Client] = stats
+		rec.TaskId = r.TaskId
+
+		response.Records = append(response.Records, rec)
+	}
+
+	// 返回 BasicInfo - 按客户端分组的统计信息
+	// 在以下情况下特别有用：
+	// 1. 仅 task_id 查询 - 查看该任务下所有客户端的表现
+	// 2. uuid + task_id 查询 - 查看特定客户端在特定任务的表现
+	if len(clientStats) > 0 {
+		response.BasicInfo = make([]ClientBasicInfo, 0, len(clientStats))
+		for client, stats := range clientStats {
+			if client != "" && !isLogin {
+				if hiddenMap[client] {
+					continue // 跳过隐藏的节点
+				}
+			}
+			loss := float64(0)
+			if stats.total > 0 {
+				loss = float64(stats.loss) / float64(stats.total) * 100
+			}
+			response.BasicInfo = append(response.BasicInfo, ClientBasicInfo{
+				Client: client,
+				Loss:   loss,
+				Min:    stats.min,
+				Max:    stats.max,
+			})
+		}
+
+		// 如果同时指定了 uuid 和 task_id，BasicInfo 应该只有一条记录
+		// 这种情况下可以在响应中标记查询模式
+		if uuid != "" && taskId != -1 && len(response.BasicInfo) == 1 {
+			// 这是精确查询模式
+		}
+	}
+
+	// 优化后的任务信息返回逻辑
+	// 1. uuid != "" - 返回该客户端参与的所有任务信息
+	// 2. uuid != "" && taskId != -1 - 返回该客户端在指定任务的信息
+	// 3. taskId != -1 && uuid == "" - 返回该任务的所有客户端统计（通过 BasicInfo）
+	if uuid != "" || taskId != -1 {
+		// 获取所有 pingTasks
+		pingTasks, err := tasks.GetAllPingTasks()
+		if err != nil {
+			resp.RespondError(c, 500, "Failed to fetch ping tasks: "+err.Error())
+			return
+		}
+
+		tasksList := make([]gin.H, 0, len(pingTasks))
+		for _, t := range pingTasks {
+			// 如果指定了 taskId，只处理该任务
+			if taskId != -1 {
+				if t.Id != uint(taskId) {
+					continue
+				}
+			}
+
+			// 如果指定了 uuid，检查任务是否分配给该客户端
+			if uuid != "" {
+				found := slices.Contains(t.Clients, uuid)
+				if !found {
+					continue
+				}
+			}
+
+			// 计算该任务的丢包率和延迟统计
+			totalCount := 0
+			lossCount := 0
+			minLatency := 0
+			maxLatency := 0
+			avgLatency := 0
+			sumLatency := 0
+			validCount := 0
+
+			for _, r := range records {
+				// 根据查询模式过滤记录
+				if r.TaskId != t.Id {
+					continue
+				}
+				// 如果同时指定了 uuid 和 task_id，只统计该客户端的记录
+				if uuid != "" && r.Client != uuid {
+					continue
+				}
+
+				totalCount++
+				if r.Value < 0 {
+					lossCount++
+				} else {
+					validCount++
+					sumLatency += r.Value
+					if minLatency == 0 || r.Value < minLatency {
+						minLatency = r.Value
+					}
+					if r.Value > maxLatency {
+						maxLatency = r.Value
+					}
+				}
+			}
+
+			var lossRate float64 = 0
+			if totalCount > 0 {
+				lossRate = float64(lossCount) / float64(totalCount) * 100
+			}
+			if validCount > 0 {
+				avgLatency = sumLatency / validCount
+			}
+
+			taskInfo := gin.H{
+				"id":       t.Id,
+				"name":     t.Name,
+				"type":     t.Type,
+				"interval": t.Interval,
+				"loss":     lossRate,
+				"min":      minLatency,
+				"max":      maxLatency,
+				"avg":      avgLatency,
+				"total":    totalCount,
+			}
+
+			// 如果是仅 task_id 查询，添加客户端列表信息
+			if uuid == "" && taskId != -1 {
+				taskInfo["clients"] = t.Clients
+			}
+
+			tasksList = append(tasksList, taskInfo)
+		}
+		response.Tasks = tasksList
+	}
+
+	response.Count = len(response.Records) // 计算最后结果保持计数一致
+	resp.RespondSuccess(c, response)
+}

internal/api_v1/resp/resp.go

@@ -0,0 +1,40 @@
+package resp
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/internal/conf"
+)
+
+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)
+}
+func GetVersion(c *gin.Context) {
+	RespondSuccess(c, gin.H{
+		"version": conf.Version,
+		"hash":    conf.CommitHash,
+	})
+}

internal/api_v1/task/ping.go

@@ -0,0 +1,38 @@
+package task
+
+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"
+)
+
+type PublicPingTask struct {
+	Id       uint     `json:"id"`
+	Name     string   `json:"name"`
+	Clients  []string `json:"clients"`
+	Type     string   `json:"type"`
+	Interval int      `json:"interval"`
+}
+
+func GetPublicPingTasks(c *gin.Context) {
+	tasks, err := tasks.GetAllPingTasks()
+	if err != nil {
+		resp.RespondError(c, http.StatusInternalServerError, err.Error())
+		return
+	}
+
+	publicTasks := make([]PublicPingTask, len(tasks))
+	for i, task := range tasks {
+		publicTasks[i] = PublicPingTask{
+			Id:       task.Id,
+			Name:     task.Name,
+			Clients:  task.Clients,
+			Type:     task.Type,
+			Interval: task.Interval,
+		}
+	}
+
+	resp.RespondSuccess(c, publicTasks)
+}

internal/api_v1/terminal/terminal.go

@@ -1,18 +1,32 @@
-package api
+package terminal
 
 import (
+	"sync"
+
 	"log"
 	"net/http"
 	"time"
 
-	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"github.com/komari-monitor/komari/database/auditlog"
-	"github.com/komari-monitor/komari/database/clients"
-	"github.com/komari-monitor/komari/utils"
-	"github.com/komari-monitor/komari/ws"
+
+	"github.com/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"
 )
 
+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")

internal/api_v1/vars/vars.go

@@ -0,0 +1,11 @@
+package vars
+
+import (
+	"time"
+
+	"github.com/patrickmn/go-cache"
+)
+
+var (
+	Records = cache.New(1*time.Minute, 1*time.Minute)
+)

internal/api_v1/ws.go

@@ -0,0 +1,122 @@
+package api_v1
+
+import (
+	"net/http"
+	"strings"
+
+	"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"
+)
+
+func GetClients(c *gin.Context) {
+	// 升级到ws
+	if !websocket.IsWebSocketUpgrade(c.Request) {
+		c.JSON(http.StatusBadRequest, gin.H{"status": "error", "error": "Require WebSocket upgrade"})
+		return
+	}
+	cfg, _ := conf.GetWithV1Format()
+	upgrader := websocket.Upgrader{
+		CheckOrigin: func(r *http.Request) bool {
+			if cfg.AllowCors {
+				return true
+			}
+			return ws.CheckOrigin(r)
+		},
+	}
+	// 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"})
+		return
+	}
+	defer conn.Close()
+
+	// 初始化用户信息
+	var (
+		isLogin    = false
+		hiddenMap  = map[string]bool{}
+		session, _ = c.Cookie("session_token")
+	)
+
+	// 登录状态检查
+	_, err = accounts.GetUserBySession(session)
+	if err == nil {
+		isLogin = true
+	}
+
+	// 仅在未登录时需要 Hidden 信息做过滤
+	if !isLogin {
+		var hiddenClients []models.Client
+		db := dbcore.GetDBInstance()
+		_ = db.Select("uuid").Where("hidden = ?", true).Find(&hiddenClients).Error
+		for _, cli := range hiddenClients {
+			hiddenMap[cli.UUID] = true
+		}
+	}
+
+	// 请求
+	for {
+		var resp struct {
+			Online []string                 `json:"online"` // 已建立连接的客户端uuid列表
+			Data   map[string]common.Report `json:"data"`   // 最后上报的数据
+		}
+
+		resp.Online = []string{}
+		resp.Data = map[string]common.Report{}
+
+		_, data, err := conn.ReadMessage()
+		if err != nil {
+			//log.Println("Error reading message:", err)
+			return
+		}
+		message := string(data)
+
+		uuID := ""
+		if message != "get" { // 非请求全部内容
+			if strings.HasPrefix(message, "get ") {
+				uuID = strings.TrimSpace(strings.TrimPrefix(message, "get "))
+			} else {
+				conn.WriteJSON(gin.H{"status": "error", "error": "Invalid message"})
+				continue
+			}
+		}
+
+		// 在线客户端uuid列表（WebSocket 与非 WebSocket）
+		for _, key := range ws.GetAllOnlineUUIDs() {
+			if !isLogin && hiddenMap[key] {
+				continue
+			}
+			if uuID != "" && key != uuID {
+				continue
+			}
+			resp.Online = append(resp.Online, key)
+		}
+
+		//过往节点数据信息
+		for key, report := range ws.GetLatestReport() {
+			if !isLogin && hiddenMap[key] {
+				continue
+			}
+			if uuID != "" && key != uuID {
+				continue
+			}
+
+			report.UUID = "" // 不暴露 uuid
+			if report.CPU.Usage == 0 {
+				report.CPU.Usage = 0.01
+			}
+			resp.Data[key] = *report
+		}
+
+		err = conn.WriteJSON(gin.H{"status": "success", "data": resp})
+		if err != nil {
+			return
+		}
+	}
+}

internal/app/app.go

@@ -0,0 +1,287 @@
+package app
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"os/signal"
+	"sort"
+	"syscall"
+	"time"
+)
+
+type Hooks struct {
+	Init  any
+	Start any
+	Stop  any
+}
+
+// Module is the single, explicit lifecycle unit.
+//
+//   - Provide registers DI providers (optional; return nil if none).
+//   - Hooks returns optional hook functions; dependencies are expressed as
+//     parameters and injected by the container.
+//
+// Hook function shapes:
+//
+//	func(context.Context, ...deps) error
+//	func(...deps) error
+//	func(context.Context, ...deps)
+//	func(...deps)
+type Module interface {
+	Name() string
+	Depends() []string
+	Provide(r Registry) error
+	Hooks() Hooks
+}
+
+type App struct {
+	container       *container
+	shutdownTimeout time.Duration
+	started         bool
+	regErr          error
+	modules         map[string]Module
+	moduleList      []Module
+	order           []string
+	startedOrder    []string
+}
+
+func New() *App {
+	return &App{container: newContainer("root"), shutdownTimeout: 5 * time.Second, modules: make(map[string]Module)}
+}
+
+func (a *App) With(mod Module) *App {
+	if a.regErr != nil {
+		return a
+	}
+	if a.container == nil {
+		a.container = newContainer("root")
+	}
+	a.regErr = a.register(mod)
+	if a.regErr == nil {
+		a.moduleList = append(a.moduleList, mod)
+		a.ensureDeps(mod, map[string]bool{})
+	}
+	return a
+}
+
+func (a *App) WithShutdownTimeout(d time.Duration) *App {
+	if d > 0 {
+		a.shutdownTimeout = d
+	}
+	return a
+}
+
+func (a *App) Start(ctx context.Context) error {
+	if a.regErr != nil {
+		return a.regErr
+	}
+	if a.container == nil {
+		a.container = newContainer("root")
+	}
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	ctx = withContainerInContext(ctx, a.container)
+
+	// Register providers before hooks.
+	for _, mod := range a.moduleList {
+		if err := mod.Provide(a.container); err != nil {
+			return fmt.Errorf("provide module %s: %w", mod.Name(), err)
+		}
+	}
+
+	order, err := a.resolveOrder()
+	if err != nil {
+		return err
+	}
+
+	// Init hooks.
+	for _, name := range order {
+		h := a.modules[name].Hooks()
+		if h.Init == nil {
+			continue
+		}
+		if err := a.container.Invoke(ctx, h.Init); err != nil {
+			return fmt.Errorf("init module %s: %w", name, err)
+		}
+	}
+
+	// Start hooks.
+	a.startedOrder = a.startedOrder[:0]
+	for _, name := range order {
+		h := a.modules[name].Hooks()
+		if h.Start == nil {
+			a.startedOrder = append(a.startedOrder, name)
+			continue
+		}
+		if err := a.container.Invoke(ctx, h.Start); err != nil {
+			_ = a.stopHooks(ctx)
+			return fmt.Errorf("start module %s: %w", name, err)
+		}
+		a.startedOrder = append(a.startedOrder, name)
+	}
+	a.started = true
+	return nil
+}
+
+func (a *App) Stop(ctx context.Context) error {
+	if !a.started {
+		return nil
+	}
+	stopCtx := ctx
+	cancel := func() {}
+	if stopCtx == nil {
+		stopCtx, cancel = context.WithTimeout(context.Background(), a.shutdownTimeout)
+	} else {
+		stopCtx, cancel = context.WithTimeout(stopCtx, a.shutdownTimeout)
+	}
+	defer cancel()
+	if stopCtx == nil {
+		stopCtx = context.Background()
+	}
+	stopCtx = withContainerInContext(stopCtx, a.container)
+	err := a.stopHooks(stopCtx)
+	_ = a.container.Shutdown(stopCtx)
+	a.started = false
+	return err
+}
+
+// RunWith starts the app, executes fn, then stops the app.
+func (a *App) RunWith(ctx context.Context, fn func(context.Context) error) error {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	ctx = withContainerInContext(ctx, a.container)
+	if err := a.Start(ctx); err != nil {
+		_ = a.Stop(context.Background())
+		return err
+	}
+	defer func() { _ = a.Stop(context.Background()) }()
+	if fn == nil {
+		return nil
+	}
+	return fn(ctx)
+}
+
+// RunUntilSignal starts the app and blocks until ctx cancellation or SIGINT/SIGTERM.
+func (a *App) RunUntilSignal(ctx context.Context) error {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	ctx = withContainerInContext(ctx, a.container)
+	if err := a.Start(ctx); err != nil {
+		_ = a.Stop(context.Background())
+		return err
+	}
+	defer func() { _ = a.Stop(context.Background()) }()
+
+	quit := make(chan os.Signal, 1)
+	signal.Notify(quit, os.Interrupt, syscall.SIGTERM)
+	defer signal.Stop(quit)
+
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case <-quit:
+		return nil
+	}
+}
+
+func (a *App) register(mod Module) error {
+	if mod == nil {
+		return fmt.Errorf("module is nil")
+	}
+	name := mod.Name()
+	if name == "" {
+		return fmt.Errorf("module name is empty")
+	}
+	if _, exists := a.modules[name]; exists {
+		return fmt.Errorf("duplicate module name: %s", name)
+	}
+	a.modules[name] = mod
+	a.order = nil
+	return nil
+}
+
+func (a *App) has(name string) bool {
+	_, ok := a.modules[name]
+	return ok
+}
+
+func (a *App) resolveOrder() ([]string, error) {
+	if a.order != nil {
+		return a.order, nil
+	}
+
+	inDegree := make(map[string]int, len(a.modules))
+	deps := make(map[string][]string, len(a.modules))
+	reverse := make(map[string][]string, len(a.modules))
+
+	for name, mod := range a.modules {
+		inDegree[name] = 0
+		deps[name] = append([]string(nil), mod.Depends()...)
+	}
+
+	for name := range a.modules {
+		for _, dep := range deps[name] {
+			if _, ok := a.modules[dep]; !ok {
+				return nil, fmt.Errorf("module %s depends on missing module %s", name, dep)
+			}
+			inDegree[name]++
+			reverse[dep] = append(reverse[dep], name)
+		}
+	}
+
+	q := make([]string, 0, len(a.modules))
+	for name, d := range inDegree {
+		if d == 0 {
+			q = append(q, name)
+		}
+	}
+	sort.Strings(q)
+
+	order := make([]string, 0, len(a.modules))
+	for len(q) > 0 {
+		n := q[0]
+		q = q[1:]
+		order = append(order, n)
+		for _, child := range reverse[n] {
+			inDegree[child]--
+			if inDegree[child] == 0 {
+				q = append(q, child)
+			}
+		}
+		sort.Strings(q)
+	}
+
+	if len(order) != len(a.modules) {
+		remaining := make([]string, 0)
+		for name, d := range inDegree {
+			if d != 0 {
+				remaining = append(remaining, name)
+			}
+		}
+		sort.Strings(remaining)
+		return nil, fmt.Errorf("dependency cycle detected among: %v", remaining)
+	}
+
+	a.order = order
+	return order, nil
+}
+
+func (a *App) stopHooks(ctx context.Context) error {
+	var firstErr error
+	for i := len(a.startedOrder) - 1; i >= 0; i-- {
+		name := a.startedOrder[i]
+		h := a.modules[name].Hooks()
+		if h.Stop == nil {
+			continue
+		}
+		if err := a.container.Invoke(ctx, h.Stop); err != nil && firstErr == nil {
+			firstErr = fmt.Errorf("stop module %s: %w", name, err)
+		}
+	}
+	a.startedOrder = a.startedOrder[:0]
+	return firstErr
+}

internal/app/di.go

@@ -0,0 +1,355 @@
+package app
+
+import (
+	"context"
+	"fmt"
+	"reflect"
+	"sync"
+)
+
+type containerCtxKey struct{}
+
+func withContainerInContext(ctx context.Context, c *container) context.Context {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	if c == nil {
+		return ctx
+	}
+	return context.WithValue(ctx, containerCtxKey{}, c)
+}
+
+func containerFromContext(ctx context.Context) (*container, bool) {
+	if ctx == nil {
+		return nil, false
+	}
+	c, ok := ctx.Value(containerCtxKey{}).(*container)
+	return c, ok && c != nil
+}
+
+// Resolve is an explicit escape hatch for the rare cases where passing
+// dependencies via hook parameters is not ergonomic.
+//
+// Prefer declaring dependencies on hook function parameters instead.
+func Resolve[T any](ctx context.Context) (T, error) {
+	var zero T
+	c, ok := containerFromContext(ctx)
+	if !ok {
+		return zero, fmt.Errorf("no container in context")
+	}
+
+	t := reflect.TypeOf((*T)(nil)).Elem()
+	v, err := c.resolve(ctx, key{t: t})
+	if err != nil {
+		return zero, err
+	}
+	return v.Interface().(T), nil
+}
+
+// ResolveNamed resolves a named registration from ctx.
+func ResolveNamed[T any](ctx context.Context, name string) (T, error) {
+	var zero T
+	c, ok := containerFromContext(ctx)
+	if !ok {
+		return zero, fmt.Errorf("no container in context")
+	}
+
+	t := reflect.TypeOf((*T)(nil)).Elem()
+	v, err := c.resolve(ctx, key{t: t, name: name})
+	if err != nil {
+		return zero, err
+	}
+	return v.Interface().(T), nil
+}
+
+// Registry is the minimal surface a module needs to register providers.
+//
+// It intentionally does NOT expose resolution, so modules can't turn DI into a
+// service locator.
+type Registry interface {
+	Provide(fn any, opts ...ProvideOption) error
+}
+
+type key struct {
+	t    reflect.Type
+	name string
+}
+
+// container is a lightweight DI container with optional named registrations and scopes.
+//
+// It supports:
+// - Singleton instances per-scope.
+// - Providers declared as functions with injectable parameters.
+// - Scopes for plugin hot-plug (child container inherits parent providers/values).
+// - Optional shutdown hooks for providers (for scope disposal).
+//
+// Provider function shapes:
+// - func(...) T
+// - func(...) (T, error)
+// - func(...) (T, func(context.Context) error)
+// - func(...) (T, func(context.Context) error, error)
+//
+// Injectable parameters:
+// - context.Context: passed through from Invoke.
+// - any provided type (resolved recursively).
+//
+// Notes:
+// - For multiple implementations, use Named registrations.
+// - Cycles are detected during resolution.
+type container struct {
+	name   string
+	parent *container
+
+	mu        sync.Mutex
+	values    map[key]reflect.Value
+	providers map[key]provider
+	resolving map[key]bool
+	closers   []func(context.Context) error
+	closed    bool
+}
+
+type provider struct {
+	fn          reflect.Value
+	outKey      key
+	hasErr      bool
+	hasCloser   bool
+	closerIndex int
+}
+
+func newContainer(name string) *container {
+	return &container{
+		name:      name,
+		values:    make(map[key]reflect.Value),
+		providers: make(map[key]provider),
+		resolving: make(map[key]bool),
+	}
+}
+
+type ProvideOption func(*provideOptions)
+
+type provideOptions struct {
+	name string
+}
+
+func Named(name string) ProvideOption {
+	return func(o *provideOptions) { o.name = name }
+}
+
+func (c *container) Provide(fn any, opts ...ProvideOption) error {
+	if fn == nil {
+		return fmt.Errorf("provider is nil")
+	}
+	var o provideOptions
+	for _, opt := range opts {
+		if opt != nil {
+			opt(&o)
+		}
+	}
+
+	v := reflect.ValueOf(fn)
+	t := v.Type()
+	if t.Kind() != reflect.Func {
+		return fmt.Errorf("provider must be a func, got %s", t.Kind())
+	}
+	if t.NumOut() < 1 || t.NumOut() > 3 {
+		return fmt.Errorf("provider must return 1..3 values, got %d", t.NumOut())
+	}
+
+	outT := t.Out(0)
+	p := provider{fn: v, outKey: key{t: outT, name: o.name}, closerIndex: -1}
+
+	switch t.NumOut() {
+	case 1:
+		// T
+	case 2:
+		// (T, error) or (T, closer)
+		if isErrorType(t.Out(1)) {
+			p.hasErr = true
+		} else if isCloserType(t.Out(1)) {
+			p.hasCloser = true
+			p.closerIndex = 1
+		} else {
+			return fmt.Errorf("provider second return must be error or func(context.Context) error")
+		}
+	case 3:
+		// (T, closer, error)
+		if !isCloserType(t.Out(1)) || !isErrorType(t.Out(2)) {
+			return fmt.Errorf("provider must return (T, func(context.Context) error, error)")
+		}
+		p.hasCloser = true
+		p.closerIndex = 1
+		p.hasErr = true
+	}
+
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	if c.closed {
+		return fmt.Errorf("container %s is closed", c.name)
+	}
+	if _, exists := c.providers[p.outKey]; exists {
+		return fmt.Errorf("duplicate provider for %s (name=%q)", outT, o.name)
+	}
+	c.providers[p.outKey] = p
+	return nil
+}
+
+func (c *container) Invoke(ctx context.Context, fn any) error {
+	if fn == nil {
+		return fmt.Errorf("invoke fn is nil")
+	}
+	v := reflect.ValueOf(fn)
+	if v.Kind() != reflect.Func {
+		return fmt.Errorf("invoke target must be func")
+	}
+	args, err := c.buildArgs(ctx, v.Type())
+	if err != nil {
+		return err
+	}
+	outs := v.Call(args)
+	if len(outs) == 0 {
+		return nil
+	}
+	last := outs[len(outs)-1]
+	if isErrorType(last.Type()) && !last.IsNil() {
+		return last.Interface().(error)
+	}
+	return nil
+}
+
+func (c *container) Shutdown(ctx context.Context) error {
+	c.mu.Lock()
+	if c.closed {
+		c.mu.Unlock()
+		return nil
+	}
+	closers := append([]func(context.Context) error(nil), c.closers...)
+	c.closed = true
+	c.mu.Unlock()
+
+	var firstErr error
+	for i := len(closers) - 1; i >= 0; i-- {
+		if err := closers[i](ctx); err != nil && firstErr == nil {
+			firstErr = err
+		}
+	}
+	return firstErr
+}
+
+func (c *container) resolve(ctx context.Context, k key) (reflect.Value, error) {
+	// Fast path: check local cache.
+	c.mu.Lock()
+	if v, ok := c.values[k]; ok {
+		c.mu.Unlock()
+		return v, nil
+	}
+	if c.resolving[k] {
+		c.mu.Unlock()
+		return reflect.Value{}, fmt.Errorf("dependency cycle resolving %s (name=%q)", k.t, k.name)
+	}
+	p, ok := c.providers[k]
+	if !ok {
+		parent := c.parent
+		c.mu.Unlock()
+		if parent != nil {
+			return parent.resolve(ctx, k)
+		}
+		return reflect.Value{}, fmt.Errorf("no provider for %s (name=%q)", k.t, k.name)
+	}
+	c.resolving[k] = true
+	c.mu.Unlock()
+
+	// Build args and call provider.
+	args, err := c.buildArgs(ctx, p.fn.Type())
+	if err != nil {
+		c.mu.Lock()
+		delete(c.resolving, k)
+		c.mu.Unlock()
+		return reflect.Value{}, err
+	}
+	outs := p.fn.Call(args)
+
+	var outV reflect.Value
+	var closerFn reflect.Value
+	var errV reflect.Value
+
+	switch len(outs) {
+	case 1:
+		outV = outs[0]
+	case 2:
+		outV = outs[0]
+		if p.hasErr {
+			errV = outs[1]
+		} else if p.hasCloser {
+			closerFn = outs[1]
+		}
+	case 3:
+		outV = outs[0]
+		closerFn = outs[1]
+		errV = outs[2]
+	}
+
+	if p.hasErr && !errV.IsNil() {
+		err := errV.Interface().(error)
+		c.mu.Lock()
+		delete(c.resolving, k)
+		c.mu.Unlock()
+		return reflect.Value{}, err
+	}
+
+	c.mu.Lock()
+	delete(c.resolving, k)
+	// Another goroutine could have resolved it while we were building; keep singleton semantics.
+	if existing, ok := c.values[k]; ok {
+		c.mu.Unlock()
+		return existing, nil
+	}
+	c.values[k] = outV
+	if p.hasCloser {
+		cf := closerFn
+		if cf.IsValid() && !cf.IsNil() {
+			c.closers = append(c.closers, func(ctx context.Context) error {
+				outs := cf.Call([]reflect.Value{reflect.ValueOf(ctx)})
+				if len(outs) == 1 && !outs[0].IsNil() {
+					return outs[0].Interface().(error)
+				}
+				return nil
+			})
+		}
+	}
+	c.mu.Unlock()
+
+	return outV, nil
+}
+
+func (c *container) buildArgs(ctx context.Context, fnType reflect.Type) ([]reflect.Value, error) {
+	in := fnType.NumIn()
+	args := make([]reflect.Value, 0, in)
+
+	ctxType := reflect.TypeOf((*context.Context)(nil)).Elem()
+
+	for i := 0; i < in; i++ {
+		paramT := fnType.In(i)
+		switch {
+		case paramT == ctxType:
+			args = append(args, reflect.ValueOf(ctx))
+		default:
+			v, err := c.resolve(ctx, key{t: paramT})
+			if err != nil {
+				return nil, err
+			}
+			args = append(args, v)
+		}
+	}
+
+	return args, nil
+}
+
+func isErrorType(t reflect.Type) bool {
+	errT := reflect.TypeOf((*error)(nil)).Elem()
+	return t == errT
+}
+
+func isCloserType(t reflect.Type) bool {
+	closerT := reflect.TypeOf((func(context.Context) error)(nil))
+	return t == closerT
+}

internal/app/registry.go

@@ -0,0 +1,76 @@
+package app
+
+import (
+	"fmt"
+	"sync"
+)
+
+var (
+	factoryMu sync.RWMutex
+	factories = make(map[string]func() Module)
+)
+
+// RegisterModuleFactory registers a factory used by App to auto-materialize missing dependencies.
+// Intended for core modules (config/db) and plugin-provided modules.
+func RegisterModuleFactory(name string, factory func() Module) {
+	if name == "" || factory == nil {
+		return
+	}
+	factoryMu.Lock()
+	factories[name] = factory
+	factoryMu.Unlock()
+}
+
+func getModuleFactory(name string) (func() Module, bool) {
+	factoryMu.RLock()
+	f, ok := factories[name]
+	factoryMu.RUnlock()
+	return f, ok
+}
+
+func (a *App) ensureDeps(mod Module, visiting map[string]bool) {
+	if a.regErr != nil {
+		return
+	}
+	if mod == nil {
+		a.regErr = fmt.Errorf("module is nil")
+		return
+	}
+
+	name := mod.Name()
+	if visiting[name] {
+		a.regErr = fmt.Errorf("dependency cycle while materializing: %s", name)
+		return
+	}
+	visiting[name] = true
+	defer func() { visiting[name] = false }()
+
+	for _, dep := range mod.Depends() {
+		if dep == "" {
+			continue
+		}
+		if a.has(dep) {
+			continue
+		}
+		f, ok := getModuleFactory(dep)
+		if !ok {
+			a.regErr = fmt.Errorf("missing module %q (no factory registered)", dep)
+			return
+		}
+		depMod := f()
+		if depMod == nil {
+			a.regErr = fmt.Errorf("module factory for %q returned nil", dep)
+			return
+		}
+		// Register dependency module and its dependencies recursively.
+		a.regErr = a.register(depMod)
+		if a.regErr != nil {
+			return
+		}
+		a.moduleList = append(a.moduleList, depMod)
+		a.ensureDeps(depMod, visiting)
+		if a.regErr != nil {
+			return
+		}
+	}
+}

internal/client/client.go

@@ -0,0 +1,178 @@
+package client
+
+import (
+	"math"
+	"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"
+
+	"fmt"
+
+	"github.com/google/uuid"
+)
+
+func DeleteClient(clientUuid string) error {
+	db := dbcore.GetDBInstance()
+	c := models.Client{}
+	err := db.Model(&models.Client{}).Where("uuid = ?", clientUuid).First(&c).Error
+	if err != nil {
+		return err
+	}
+	err = db.Delete(&models.Client{}, "uuid = ?", clientUuid).Error
+	if err != nil {
+		return err
+	}
+	event.Trigger(eventType.ClientDeleted, event.M{
+		"client": c})
+	return nil
+}
+
+func PartialUpdate(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")
+	}
+
+	c := models.Client{}
+	err := db.Model(&models.Client{}).Where("uuid = ?", clientUUID).First(&c).Error
+	if err != nil {
+		return err
+	}
+
+	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
+	}
+
+	new_c := models.Client{}
+	err = db.Model(&models.Client{}).Where("uuid = ?", clientUUID).First(&new_c).Error
+	if err != nil {
+		return err
+	}
+
+	event.Trigger(eventType.ClientUpdated, event.M{
+		"old": c,
+		"new": new_c,
+	})
+	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
+	}
+
+	event.Trigger(eventType.ClientCreated, event.M{
+		"client": client,
+	})
+	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
+	}
+	event.Trigger(eventType.ClientCreated, event.M{
+		"client": client,
+	})
+	return clientUUID, token, 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
+}
+
+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
+}

internal/client/report.go

@@ -0,0 +1,219 @@
+package client
+
+import (
+	"fmt"
+	"math"
+
+	"github.com/komari-monitor/komari/internal/common"
+	"github.com/komari-monitor/komari/internal/database/models"
+	"github.com/komari-monitor/komari/internal/dbcore"
+)
+
+func GetClientUUIDByToken(token string) (clientUUID string, err error) {
+	db := dbcore.GetDBInstance()
+	var client models.Client
+	err = db.Where("token = ?", token).First(&client).Error
+	if err != nil {
+		return "", err
+	}
+	return client.UUID, nil
+}
+
+// 检查数据防止异常数据导致数据库损坏
+func ReportVerify(report common.Report) error {
+	// 防止输入不合理范围
+	if report.CPU.Usage < 0 || report.CPU.Usage > 100 {
+		return fmt.Errorf("CPU.Usage must be between 0 and 100")
+	}
+
+	if report.Load.Load1 < 0 || report.Load.Load1 > 1000 {
+		return fmt.Errorf("Load.Load1 must be non-negative, got %.2f", report.Load.Load1)
+	}
+
+	checkFloat64 := func(name string, val float64) error {
+		if val > math.MaxFloat64-1 || val < -math.MaxFloat64+1 {
+			return fmt.Errorf("%s value exceeds float64 range: %g", name, val)
+		}
+		return nil
+	}
+
+	// [float64] 防止数据溢出
+	if err := checkFloat64("CPU.Usage", report.CPU.Usage); err != nil {
+		return err
+	}
+	if err := checkFloat64("Load.Load1", report.Load.Load1); err != nil {
+		return err
+	}
+
+	checkInt64 := func(name string, val int64) error {
+		if val < 0 {
+			return fmt.Errorf("%s must be non-negative, got %d", name, val)
+		}
+		if val > math.MaxInt64-1 {
+			return fmt.Errorf("%s exceeds int64 max limit: %d", name, val)
+		}
+		return nil
+	}
+
+	// [int64] 防止数据溢出
+	// Ram 验证
+	if err := checkInt64("Ram.Used", report.Ram.Used); err != nil {
+		return err
+	}
+	if err := checkInt64("Ram.Total", report.Ram.Total); err != nil {
+		return err
+	}
+	// Swap 验证
+	if err := checkInt64("Swap.Used", report.Swap.Used); err != nil {
+		return err
+	}
+	if err := checkInt64("Swap.Total", report.Swap.Total); err != nil {
+		return err
+	}
+	// Disk 验证
+	if err := checkInt64("Disk.Used", report.Disk.Used); err != nil {
+		return err
+	}
+	if err := checkInt64("Disk.Total", report.Disk.Total); err != nil {
+		return err
+	}
+	// Network 验证
+	if err := checkInt64("Network.Up", report.Network.Up); err != nil {
+		return err
+	}
+	if err := checkInt64("Network.Down", report.Network.Down); err != nil {
+		return err
+	}
+	if err := checkInt64("Network.TotalUp", report.Network.TotalUp); err != nil {
+		return err
+	}
+	if err := checkInt64("Network.TotalDown", report.Network.TotalDown); err != nil {
+		return err
+	}
+	// 拒绝所有负数Int
+	if report.Process < 0 {
+		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)
+	}
+	if report.Connections.UDP < 0 {
+		return fmt.Errorf("Connections.UDP must be non-negative: %d", report.Connections.UDP)
+	}
+	return nil
+}
+
+// // 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)
+// 	}
+
+// 	// 保存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)
+// 	}
+
+// 	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
+// 	})
+
+// 	if err != nil {
+// 		return err
+// 	}
+
+// 	return nil
+// }
+
+/*
+// getString 从 map 中获取字符串
+func getString(data map[string]interface{}, key string) string {
+	if val, ok := data[key]; ok {
+		if str, ok := val.(string); ok {
+			return str
+		}
+	}
+	return ""
+}
+
+// getInt 从 map 中获取整数
+func getInt(data map[string]interface{}, key string) int {
+	if val, ok := data[key]; ok {
+		if num, ok := val.(float64); ok {
+			return int(num)
+		}
+	}
+	return 0
+}
+
+// getInt64 从 map 中获取 int64
+func getInt64(data map[string]interface{}, key string) int64 {
+	if val, ok := data[key]; ok {
+		if num, ok := val.(float64); ok {
+			return int64(num)
+		}
+	}
+	return 0
+}
+
+// getFloat 从 map 中获取 float64
+func getFloat(data map[string]interface{}, key string) float64 {
+	if val, ok := data[key]; ok {
+		if num, ok := val.(float64); ok {
+			return num
+		}
+	}
+	return 0.0
+}
+*/