Merge pull request #31 from tbphp/feat-keys-export

feat: 密钥导出功能

internal/container/container.go

@@ -51,6 +51,9 @@ func BuildContainer() (*dig.Container, error) {
 	if err := container.Provide(services.NewKeyService); err != nil {
 		return nil, err
 	}
+	if err := container.Provide(services.NewLogService); err != nil {
+		return nil, err
+	}
 	if err := container.Provide(services.NewLogCleanupService); err != nil {
 		return nil, err
 	}

internal/handler/handler.go

@@ -23,6 +23,7 @@ type Server struct {
 	KeyManualValidationService *services.KeyManualValidationService
 	TaskService                *services.TaskService
 	KeyService                 *services.KeyService
+	LogService                 *services.LogService
 	CommonHandler              *CommonHandler
 }
 
@@ -36,6 +37,7 @@ type NewServerParams struct {
 	KeyManualValidationService *services.KeyManualValidationService
 	TaskService                *services.TaskService
 	KeyService                 *services.KeyService
+	LogService                 *services.LogService
 	CommonHandler              *CommonHandler
 }
 
@@ -49,6 +51,7 @@ func NewServer(params NewServerParams) *Server {
 		KeyManualValidationService: params.KeyManualValidationService,
 		TaskService:                params.TaskService,
 		KeyService:                 params.KeyService,
+		LogService:                 params.LogService,
 		CommonHandler:              params.CommonHandler,
 	}
 }

internal/handler/key_handler.go

@@ -5,6 +5,7 @@ import (
 	app_errors "gpt-load/internal/errors"
 	"gpt-load/internal/models"
 	"gpt-load/internal/response"
+	"log"
 	"strconv"
 	"strings"
 
@@ -301,3 +302,38 @@ func (s *Server) ClearAllInvalidKeys(c *gin.Context) {
 
 	response.Success(c, gin.H{"message": fmt.Sprintf("%d invalid keys cleared.", rowsAffected)})
 }
+
+// ExportKeys handles exporting keys to a text file.
+func (s *Server) ExportKeys(c *gin.Context) {
+	groupID, err := validateGroupIDFromQuery(c)
+	if err != nil {
+		response.Error(c, app_errors.NewAPIError(app_errors.ErrBadRequest, err.Error()))
+		return
+	}
+
+	statusFilter := c.Query("status")
+	if statusFilter == "" {
+		statusFilter = "all"
+	}
+
+	switch statusFilter {
+	case "all", models.KeyStatusActive, models.KeyStatusInvalid:
+	default:
+		response.Error(c, app_errors.NewAPIError(app_errors.ErrValidation, "Invalid status filter"))
+		return
+	}
+
+	group, ok := s.findGroupByID(c, groupID)
+	if !ok {
+		return
+	}
+
+	filename := fmt.Sprintf("keys-%s-%s.txt", group.Name, statusFilter)
+	c.Header("Content-Disposition", "attachment; filename="+filename)
+	c.Header("Content-Type", "text/plain; charset=utf-8")
+
+	err = s.KeyService.StreamKeysToWriter(groupID, statusFilter, c.Writer)
+	if err != nil {
+		log.Printf("Failed to stream keys: %v", err)
+	}
+}

internal/handler/log_handler.go

@@ -1,13 +1,12 @@
 package handler
 
 import (
-	"strconv"
+	"fmt"
-	"time"
-
-	"gpt-load/internal/db"
 	app_errors "gpt-load/internal/errors"
 	"gpt-load/internal/models"
 	"gpt-load/internal/response"
+	"log"
+	"time"
 
 	"github.com/gin-gonic/gin"
 )
@@ -17,43 +16,9 @@ type LogResponse struct {
 	models.RequestLog
 }
 
-// GetLogs Get request logs
+// GetLogs handles fetching request logs with filtering and pagination.
-func GetLogs(c *gin.Context) {
+func (s *Server) GetLogs(c *gin.Context) {
-	query := db.DB.Model(&models.RequestLog{})
+	query := s.LogService.GetLogsQuery(c)
-
-	if groupName := c.Query("group_name"); groupName != "" {
-		query = query.Where("group_name LIKE ?", "%"+groupName+"%")
-	}
-	if keyValue := c.Query("key_value"); keyValue != "" {
-		likePattern := "%" + keyValue[1:len(keyValue)-1] + "%"
-		query = query.Where("key_value LIKE ?", likePattern)
-	}
-	if isSuccessStr := c.Query("is_success"); isSuccessStr != "" {
-		if isSuccess, err := strconv.ParseBool(isSuccessStr); err == nil {
-			query = query.Where("is_success = ?", isSuccess)
-		}
-	}
-	if statusCodeStr := c.Query("status_code"); statusCodeStr != "" {
-		if statusCode, err := strconv.Atoi(statusCodeStr); err == nil {
-			query = query.Where("status_code = ?", statusCode)
-		}
-	}
-	if sourceIP := c.Query("source_ip"); sourceIP != "" {
-		query = query.Where("source_ip = ?", sourceIP)
-	}
-	if errorContains := c.Query("error_contains"); errorContains != "" {
-		query = query.Where("error_message LIKE ?", "%"+errorContains+"%")
-	}
-	if startTimeStr := c.Query("start_time"); startTimeStr != "" {
-		if startTime, err := time.Parse(time.RFC3339, startTimeStr); err == nil {
-			query = query.Where("timestamp >= ?", startTime)
-		}
-	}
-	if endTimeStr := c.Query("end_time"); endTimeStr != "" {
-		if endTime, err := time.Parse(time.RFC3339, endTimeStr); err == nil {
-			query = query.Where("timestamp <= ?", endTime)
-		}
-	}
 
 	var logs []models.RequestLog
 	query = query.Order("timestamp desc")
@@ -66,3 +31,18 @@ func GetLogs(c *gin.Context) {
 	pagination.Items = logs
 	response.Success(c, pagination)
 }
+
+// ExportLogs handles exporting filtered log keys to a CSV file.
+func (s *Server) ExportLogs(c *gin.Context) {
+	filename := fmt.Sprintf("log_keys_export_%s.csv", time.Now().Format("20060102150405"))
+	c.Header("Content-Disposition", "attachment; filename="+filename)
+	c.Header("Content-Type", "text/csv; charset=utf-8")
+
+	// Stream the response
+	err := s.LogService.StreamLogKeysToCSV(c, c.Writer)
+	if err != nil {
+		log.Printf("Failed to stream log keys to CSV: %v", err)
+		c.JSON(500, gin.H{"error": "Failed to export logs"})
+		return
+	}
+}

internal/middleware/middleware.go

@@ -135,7 +135,7 @@ func Auth(
 
 		if strings.HasPrefix(path, "/api") {
 			// Handle backend API authentication
-			key = extractBearerKey(c)
+			key = extractApiKey(c)
 		} else if strings.HasPrefix(path, "/proxy/") {
 			// Handle proxy authentication
 			key, err = extractProxyKey(c, groupManager, channelFactory)
@@ -228,7 +228,7 @@ func isMonitoringEndpoint(path string) bool {
 }
 
 // extractBearerKey extracts a key from the "Authorization: Bearer <key>" header.
-func extractBearerKey(c *gin.Context) string {
+func extractApiKey(c *gin.Context) string {
 	authHeader := c.GetHeader("Authorization")
 	if authHeader != "" {
 		const bearerPrefix = "Bearer "
@@ -236,6 +236,12 @@ func extractBearerKey(c *gin.Context) string {
 			return authHeader[len(bearerPrefix):]
 		}
 	}
+
+	authKey := c.Query("auth_key")
+	if authKey != "" {
+		return authKey
+	}
+
 	return ""
 }
 

internal/router/router.go

@@ -121,6 +121,7 @@ func registerProtectedAPIRoutes(api *gin.RouterGroup, serverHandler *handler.Ser
 	keys := api.Group("/keys")
 	{
 		keys.GET("", serverHandler.ListKeysInGroup)
+		keys.GET("/export", serverHandler.ExportKeys)
 		keys.POST("/add-multiple", serverHandler.AddMultipleKeys)
 		keys.POST("/delete-multiple", serverHandler.DeleteMultipleKeys)
 		keys.POST("/restore-multiple", serverHandler.RestoreMultipleKeys)
@@ -141,7 +142,11 @@ func registerProtectedAPIRoutes(api *gin.RouterGroup, serverHandler *handler.Ser
 	}
 
 	// 日志
-	api.GET("/logs", handler.GetLogs)
+	logs := api.Group("/logs")
+	{
+		logs.GET("", serverHandler.GetLogs)
+		logs.GET("/export", serverHandler.ExportLogs)
+	}
 
 	// 设置
 	settings := api.Group("/settings")

internal/services/key_service.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"gpt-load/internal/keypool"
 	"gpt-load/internal/models"
+	"io"
 	"regexp"
 	"strings"
 
@@ -306,3 +307,28 @@ func (s *KeyService) TestMultipleKeys(group *models.Group, keysText string) ([]k
 
 	return allResults, nil
 }
+
+// StreamKeysToWriter fetches keys from the database in batches and writes them to the provided writer.
+func (s *KeyService) StreamKeysToWriter(groupID uint, statusFilter string, writer io.Writer) error {
+	query := s.DB.Model(&models.APIKey{}).Where("group_id = ?", groupID).Select("id, key_value")
+
+	switch statusFilter {
+	case models.KeyStatusActive, models.KeyStatusInvalid:
+		query = query.Where("status = ?", statusFilter)
+	case "all":
+	default:
+		return fmt.Errorf("invalid status filter: %s", statusFilter)
+	}
+
+	var keys []models.APIKey
+	err := query.FindInBatches(&keys, chunkSize, func(tx *gorm.DB, batch int) error {
+		for _, key := range keys {
+			if _, err := writer.Write([]byte(key.KeyValue + "\n")); err != nil {
+				return err
+			}
+		}
+		return nil
+	}).Error
+
+	return err
+}

internal/services/log_service.go

@@ -0,0 +1,134 @@
+package services
+
+import (
+	"encoding/csv"
+	"fmt"
+	"gpt-load/internal/models"
+	"io"
+	"strconv"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+// ExportableLogKey defines the structure for the data to be exported to CSV.
+type ExportableLogKey struct {
+	KeyValue   string `gorm:"column:key_value"`
+	GroupName  string `gorm:"column:group_name"`
+	StatusCode int    `gorm:"column:status_code"`
+}
+
+// LogService provides services related to request logs.
+type LogService struct {
+	DB *gorm.DB
+}
+
+// NewLogService creates a new LogService.
+func NewLogService(db *gorm.DB) *LogService {
+	return &LogService{DB: db}
+}
+
+// logFiltersScope returns a GORM scope function that applies filters from the Gin context.
+func logFiltersScope(c *gin.Context) func(db *gorm.DB) *gorm.DB {
+	return func(db *gorm.DB) *gorm.DB {
+		if groupName := c.Query("group_name"); groupName != "" {
+			db = db.Where("group_name LIKE ?", "%"+groupName+"%")
+		}
+		if keyValue := c.Query("key_value"); keyValue != "" {
+			// 安全地处理 keyValue，避免越界错误
+			var likePattern string
+			if len(keyValue) > 2 {
+				likePattern = "%" + keyValue[1:len(keyValue)-1] + "%"
+			} else {
+				likePattern = "%" + keyValue + "%"
+			}
+			db = db.Where("key_value LIKE ?", likePattern)
+		}
+		if isSuccessStr := c.Query("is_success"); isSuccessStr != "" {
+			if isSuccess, err := strconv.ParseBool(isSuccessStr); err == nil {
+				db = db.Where("is_success = ?", isSuccess)
+			}
+		}
+		if statusCodeStr := c.Query("status_code"); statusCodeStr != "" {
+			if statusCode, err := strconv.Atoi(statusCodeStr); err == nil {
+				db = db.Where("status_code = ?", statusCode)
+			}
+		}
+		if sourceIP := c.Query("source_ip"); sourceIP != "" {
+			db = db.Where("source_ip = ?", sourceIP)
+		}
+		if errorContains := c.Query("error_contains"); errorContains != "" {
+			db = db.Where("error_message LIKE ?", "%"+errorContains+"%")
+		}
+		if startTimeStr := c.Query("start_time"); startTimeStr != "" {
+			if startTime, err := time.Parse(time.RFC3339, startTimeStr); err == nil {
+				db = db.Where("timestamp >= ?", startTime)
+			}
+		}
+		if endTimeStr := c.Query("end_time"); endTimeStr != "" {
+			if endTime, err := time.Parse(time.RFC3339, endTimeStr); err == nil {
+				db = db.Where("timestamp <= ?", endTime)
+			}
+		}
+		return db
+	}
+}
+
+// GetLogsQuery returns a GORM query for fetching logs with filters.
+func (s *LogService) GetLogsQuery(c *gin.Context) *gorm.DB {
+	return s.DB.Model(&models.RequestLog{}).Scopes(logFiltersScope(c))
+}
+
+// StreamLogKeysToCSV fetches unique keys from logs based on filters and streams them as a CSV.
+func (s *LogService) StreamLogKeysToCSV(c *gin.Context, writer io.Writer) error {
+	// Create a CSV writer
+	csvWriter := csv.NewWriter(writer)
+	defer csvWriter.Flush()
+
+	// Write CSV header
+	header := []string{"key_value", "group_name", "status_code"}
+	if err := csvWriter.Write(header); err != nil {
+		return fmt.Errorf("failed to write CSV header: %w", err)
+	}
+
+	var results []ExportableLogKey
+
+	baseQuery := s.DB.Model(&models.RequestLog{}).Scopes(logFiltersScope(c))
+
+	// 使用窗口函数获取每个key_value的最新记录
+	err := s.DB.Raw(`
+		SELECT
+			key_value,
+			group_name,
+			status_code
+		FROM (
+			SELECT
+				key_value,
+				group_name,
+				status_code,
+				ROW_NUMBER() OVER (PARTITION BY key_value ORDER BY timestamp DESC) as rn
+			FROM (?) as filtered_logs
+		) ranked
+		WHERE rn = 1
+		ORDER BY key_value
+	`, baseQuery).Scan(&results).Error
+
+	if err != nil {
+		return fmt.Errorf("failed to fetch log keys: %w", err)
+	}
+
+	// 写入CSV数据
+	for _, record := range results {
+		csvRecord := []string{
+			record.KeyValue,
+			record.GroupName,
+			strconv.Itoa(record.StatusCode),
+		}
+		if err := csvWriter.Write(csvRecord); err != nil {
+			return fmt.Errorf("failed to write CSV record: %w", err)
+		}
+	}
+
+	return nil
+}

web/src/api/keys.ts

@@ -140,17 +140,26 @@ export const keysApi = {
 
   // 导出密钥
   exportKeys(groupId: number, status: "all" | "active" | "invalid" = "all") {
-    let url = `${http.defaults.baseURL}/groups/${groupId}/keys/export`;
+    const authKey = localStorage.getItem("authKey");
-    if (status !== "all") {
+    if (!authKey) {
-      url += `?status=${status}`;
+      window.$message.error("未找到认证信息，无法导出");
+      return;
     }
 
-    // 创建隐藏的 a 标签实现下载
+    const params = new URLSearchParams({
+      group_id: groupId.toString(),
+      auth_key: authKey,
+    });
+
+    if (status !== "all") {
+      params.append("status", status);
+    }
+
+    const url = `${http.defaults.baseURL}/keys/export?${params.toString()}`;
+
     const link = document.createElement("a");
     link.href = url;
-    link.download = `group-${groupId}-keys-${status}.txt`;
+    link.setAttribute("download", `keys-group_${groupId}-${status}-${Date.now()}.txt`);
-    link.style.display = "none";
-
     document.body.appendChild(link);
     link.click();
     document.body.removeChild(link);

web/src/api/logs.ts

@@ -11,4 +11,35 @@ export const logApi = {
   getGroups: (): Promise<ApiResponse<Group[]>> => {
     return http.get("/groups");
   },
+
+  // 导出日志
+  exportLogs: (params: Omit<LogFilter, "page" | "page_size">) => {
+    const authKey = localStorage.getItem("authKey");
+    if (!authKey) {
+      window.$message.error("未找到认证信息，无法导出");
+      return;
+    }
+
+    const queryParams = new URLSearchParams(
+      Object.entries(params).reduce(
+        (acc, [key, value]) => {
+          if (value !== undefined && value !== null && value !== "") {
+            acc[key] = String(value);
+          }
+          return acc;
+        },
+        {} as Record<string, string>
+      )
+    );
+    queryParams.append("auth_key", authKey);
+
+    const url = `${http.defaults.baseURL}/logs/export?${queryParams.toString()}`;
+
+    const link = document.createElement("a");
+    link.href = url;
+    link.setAttribute("download", `logs-${Date.now()}.csv`);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  },
 };

web/src/components/keys/KeyTable.vue

@@ -59,9 +59,9 @@ const statusOptions = [
 
 // 更多操作下拉菜单选项
 const moreOptions = [
-  // { label: "导出所有密钥", key: "copyAll" },
+  { label: "导出所有密钥", key: "copyAll" },
-  // { label: "导出有效密钥", key: "copyValid" },
+  { label: "导出有效密钥", key: "copyValid" },
-  // { label: "导出无效密钥", key: "copyInvalid" },
+  { label: "导出无效密钥", key: "copyInvalid" },
   { type: "divider" },
   { label: "恢复所有无效密钥", key: "restoreAll" },
   { label: "清空所有无效密钥", key: "clearInvalid", props: { style: { color: "#d03050" } } },

web/src/components/logs/LogTable.vue

@@ -2,7 +2,7 @@
 import { logApi } from "@/api/logs";
 import type { LogFilter, RequestLog } from "@/types/models";
 import { maskKey } from "@/utils/display";
-import { EyeOffOutline, EyeOutline, Search } from "@vicons/ionicons5";
+import { DownloadOutline, EyeOffOutline, EyeOutline, Search } from "@vicons/ionicons5";
 import {
   NButton,
   NDataTable,
@@ -10,7 +10,6 @@ import {
   NEllipsis,
   NIcon,
   NInput,
-  NInputGroup,
   NSelect,
   NSpace,
   NSpin,
@@ -206,6 +205,20 @@ const resetFilters = () => {
   handleSearch();
 };
 
+const exportLogs = () => {
+  const params: Omit<LogFilter, "page" | "page_size"> = {
+    group_name: filters.group_name || undefined,
+    key_value: filters.key_value || undefined,
+    is_success: filters.is_success === "" ? undefined : filters.is_success === "true",
+    status_code: filters.status_code ? parseInt(filters.status_code, 10) : undefined,
+    source_ip: filters.source_ip || undefined,
+    error_contains: filters.error_contains || undefined,
+    start_time: filters.start_time ? new Date(filters.start_time).toISOString() : undefined,
+    end_time: filters.end_time ? new Date(filters.end_time).toISOString() : undefined,
+  };
+  logApi.exportLogs(params);
+};
+
 function changePage(page: number) {
   currentPage.value = page;
 }
@@ -221,70 +234,98 @@ function changePageSize(size: number) {
     <n-space vertical>
       <!-- 工具栏 -->
       <div class="toolbar">
-        <div class="toolbar-left">
+        <div class="filter-section">
-          <n-space>
+          <!-- 第一行：基础筛选 -->
-            <n-select
+          <div class="filter-row">
-              v-model:value="filters.is_success"
+            <div class="filter-group">
-              :options="successOptions"
+              <n-date-picker
-              size="small"
+                v-model:value="filters.start_time"
-              style="width: 80px"
+                type="datetime"
-              @update:value="handleSearch"
+                clearable
-            />
+                size="small"
-            <n-date-picker
+                placeholder="开始时间"
-              v-model:value="filters.start_time"
+                style="width: 180px"
-              type="datetime"
+              />
-              clearable
+            </div>
-              size="small"
+            <div class="filter-group">
-              placeholder="开始时间"
+              <n-date-picker
-              style="width: 180px"
+                v-model:value="filters.end_time"
-            />
+                type="datetime"
-            <n-date-picker
+                clearable
-              v-model:value="filters.end_time"
+                size="small"
-              type="datetime"
+                placeholder="结束时间"
-              clearable
+                style="width: 180px"
-              size="small"
+              />
-              placeholder="结束时间"
+            </div>
-              style="width: 180px"
+            <div class="filter-group">
-            />
+              <n-select
-            <n-input
+                v-model:value="filters.is_success"
-              v-model:value="filters.status_code"
+                :options="successOptions"
-              placeholder="状态码"
+                size="small"
-              size="small"
+                style="width: 166px"
-              clearable
+                @update:value="handleSearch"
-              style="width: 90px"
+              />
-              @keyup.enter="handleSearch"
+            </div>
-            />
+            <div class="filter-group">
-            <n-input
+              <n-input
-              v-model:value="filters.group_name"
+                v-model:value="filters.status_code"
-              placeholder="分组名"
+                placeholder="状态码"
-              size="small"
+                size="small"
-              clearable
+                clearable
-              style="width: 120px"
+                style="width: 166px"
-              @keyup.enter="handleSearch"
+                @keyup.enter="handleSearch"
-            />
+              />
-            <n-input
+            </div>
-              v-model:value="filters.key_value"
+            <div class="filter-group">
-              placeholder="密钥"
+              <n-input
-              size="small"
+                v-model:value="filters.group_name"
-              clearable
+                placeholder="分组名"
-              style="width: 180px"
+                size="small"
-              @keyup.enter="handleSearch"
+                clearable
-            />
+                style="width: 166px"
-            <n-input-group>
+                @keyup.enter="handleSearch"
+              />
+            </div>
+            <div class="filter-group">
+              <n-input
+                v-model:value="filters.key_value"
+                placeholder="密钥"
+                size="small"
+                clearable
+                style="width: 166px"
+                @keyup.enter="handleSearch"
+              />
+            </div>
+          </div>
+
+          <!-- 第二行：详细筛选和操作 -->
+          <div class="filter-row">
+            <div class="filter-group">
               <n-input
                 v-model:value="filters.error_contains"
                 placeholder="错误信息"
                 size="small"
                 clearable
-                style="width: 150px"
+                style="width: 384px"
                 @keyup.enter="handleSearch"
               />
+            </div>
+            <div class="filter-actions">
               <n-button ghost size="small" :disabled="loading" @click="handleSearch">
-                <n-icon :component="Search" />
+                <template #icon>
+                  <n-icon :component="Search" />
+                </template>
+                搜索
               </n-button>
-            </n-input-group>
+              <n-button size="small" @click="resetFilters">重置</n-button>
-            <n-button size="small" @click="resetFilters">重置</n-button>
+              <n-button size="small" type="primary" ghost @click="exportLogs">
-          </n-space>
+                <template #icon>
+                  <n-icon :component="DownloadOutline" />
+                </template>
+                导出密钥
+              </n-button>
+            </div>
+          </div>
         </div>
       </div>
       <div class="table-main">
@@ -347,12 +388,62 @@ function changePageSize(size: number) {
 .toolbar {
   background: white;
   border-radius: 8px;
-  display: flex;
+  padding: 16px;
-  justify-content: left;
-  align-items: center;
-  padding: 12px;
   border-bottom: 1px solid #f0f0f0;
 }
+
+.filter-section {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.filter-row {
+  display: flex;
+  align-items: center;
+  gap: 24px;
+  flex-wrap: wrap;
+}
+
+.filter-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.filter-label {
+  font-size: 13px;
+  color: #666;
+  white-space: nowrap;
+  min-width: 50px;
+}
+
+.filter-separator {
+  font-size: 12px;
+  color: #999;
+  margin: 0 4px;
+}
+
+.filter-actions {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-left: auto;
+}
+
+@media (max-width: 1200px) {
+  .filter-row {
+    gap: 16px;
+  }
+
+  .filter-group {
+    min-width: auto;
+  }
+
+  .filter-actions {
+    margin-left: 0;
+  }
+}
 .table-main {
   background: white;
   border-radius: 8px;