update1.2

Author: aiprodcoder

VERSION

@@ -0,0 +1 @@
+v1.2

common/constants.go

@@ -18,8 +18,8 @@ var TopUpLink = ""
 
 // var ChatLink = ""
 // var ChatLink2 = ""
-var QuotaPerUnit = 500 * 1000.0 // $0.002 / 1K tokens
-var DisplayInCurrencyEnabled = true
+var QuotaPerUnit = 500 * 1000.0      // $0.002 / 1K tokens
+var DisplayInCurrencyEnabled = false // true
 var DisplayTokenStatEnabled = true
 var DrawingEnabled = true
 var TaskEnabled = true
@@ -71,6 +71,7 @@ var DebugEnabled bool
 var MemoryCacheEnabled bool
 
 var LogConsumeEnabled = true
+var LogUserInputEnabled = true
 
 var SMTPServer = ""
 var SMTPPort = 587

controller/channel_export.go

@@ -0,0 +1,97 @@
+package controller
+
+import (
+	"bytes"
+	"net/http"
+	"one-api/common"
+	"one-api/model"
+
+	"github.com/gin-gonic/gin"
+	"github.com/xuri/excelize/v2"
+)
+
+func ExportChannels(c *gin.Context) {
+	// 获取所有渠道数据
+	channels, err := model.GetAllChannels(0, 0, true, false)
+	if err != nil {
+		common.ApiError(c, err)
+		return
+	}
+
+	// 创建Excel文件
+	f := excelize.NewFile()
+	defer func() {
+		if err := f.Close(); err != nil {
+			common.SysError("Error closing Excel file: " + err.Error())
+		}
+	}()
+
+	// 创建工作表
+	sheetName := "Channels"
+	f.SetSheetName("Sheet1", sheetName)
+
+	// 设置表头
+	headers := []string{
+		"ID", "名称", "类型", "状态", "密钥", "组织", "测试模型",
+		"权重", "创建时间", "测试时间", "响应时间", "基础URL", "其他",
+		"余额", "余额更新时间", "模型", "分组", "已用配额",
+		"模型映射", "状态码映射", "优先级", "自动禁用", "标签", "额外设置", "参数覆盖",
+	}
+
+	for i, header := range headers {
+		cell, _ := excelize.CoordinatesToCellName(i+1, 1)
+		f.SetCellValue(sheetName, cell, header)
+	}
+
+	// 填充数据
+	for i, channel := range channels {
+		row := i + 2 // 从第二行开始填充数据
+		data := []interface{}{
+			channel.Id,
+			channel.Name,
+			channel.Type,
+			channel.Status,
+			channel.Key,
+			channel.OpenAIOrganization,
+			channel.TestModel,
+			channel.Weight,
+			channel.CreatedTime,
+			channel.TestTime,
+			channel.ResponseTime,
+			channel.BaseURL,
+			channel.Other,
+			channel.Balance,
+			channel.BalanceUpdatedTime,
+			channel.Models,
+			channel.Group,
+			channel.UsedQuota,
+			channel.ModelMapping,
+			channel.StatusCodeMapping,
+			channel.Priority,
+			channel.AutoBan,
+			channel.Tag,
+			channel.Setting,
+			channel.ParamOverride,
+		}
+
+		for j, value := range data {
+			cell, _ := excelize.CoordinatesToCellName(j+1, row)
+			f.SetCellValue(sheetName, cell, value)
+		}
+	}
+
+	// 设置响应头
+	c.Header("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	c.Header("Content-Disposition", "attachment; filename=channels.xlsx")
+	c.Header("Cache-Control", "no-cache")
+
+	// 将Excel文件写入缓冲区
+	var buf bytes.Buffer
+	if err := f.Write(&buf); err != nil {
+		common.ApiError(c, err)
+		return
+	}
+
+	// 返回Excel文件
+	c.Data(http.StatusOK, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", buf.Bytes())
+}

controller/channel_import.go

@@ -0,0 +1,216 @@
+package controller
+
+import (
+	"fmt"
+	"net/http"
+	"one-api/common"
+	"one-api/model"
+	"strconv"
+
+	// "strings"
+
+	"github.com/gin-gonic/gin"
+	"github.com/xuri/excelize/v2"
+)
+
+func ImportChannels(c *gin.Context) {
+	// 从请求中获取上传的文件
+	file, err := c.FormFile("file")
+	if err != nil {
+		common.ApiError(c, fmt.Errorf("failed to get file: %w", err))
+		return
+	}
+
+	// 打开文件
+	src, err := file.Open()
+	if err != nil {
+		common.ApiError(c, fmt.Errorf("failed to open file: %w", err))
+		return
+	}
+	defer src.Close()
+
+	// 读取Excel文件
+	f, err := excelize.OpenReader(src)
+	if err != nil {
+		common.ApiError(c, fmt.Errorf("failed to open Excel file: %w", err))
+		return
+	}
+	defer func() {
+		if err := f.Close(); err != nil {
+			common.SysError("Error closing Excel file: " + err.Error())
+		}
+	}()
+
+	// 获取第一个工作表
+	sheetName := f.GetSheetName(0)
+	if sheetName == "" {
+		common.ApiError(c, fmt.Errorf("no sheets found in Excel file"))
+		return
+	}
+
+	// 读取所有行
+	rows, err := f.GetRows(sheetName)
+	if err != nil {
+		common.ApiError(c, fmt.Errorf("failed to read rows: %w", err))
+		return
+	}
+
+	// 检查是否有数据
+	if len(rows) <= 1 {
+		common.ApiError(c, fmt.Errorf("no data found in Excel file"))
+		return
+	}
+
+	// 解析表头
+	headers := rows[0]
+	headerMap := make(map[string]int)
+	for i, header := range headers {
+		headerMap[header] = i
+	}
+
+	// 解析数据行
+	channels := make([]model.Channel, 0, len(rows)-1)
+	for i := 1; i < len(rows); i++ {
+		row := rows[i]
+		if len(row) == 0 {
+			continue
+		}
+
+		// 创建渠道对象
+		channel := model.Channel{}
+
+		// 根据表头映射填充数据
+		for header, colIndex := range headerMap {
+			if colIndex >= len(row) {
+				continue
+			}
+			value := row[colIndex]
+
+			switch header {
+			case "ID":
+				// ID由数据库自动生成，不需要设置
+			case "名称":
+				channel.Name = value
+			case "类型":
+				if v, err := strconv.Atoi(value); err == nil {
+					channel.Type = v
+				}
+			case "状态":
+				if v, err := strconv.Atoi(value); err == nil {
+					channel.Status = v
+				}
+			case "密钥":
+				channel.Key = value
+			case "组织":
+				if value != "" {
+					channel.OpenAIOrganization = &value
+				}
+			case "测试模型":
+				if value != "" {
+					channel.TestModel = &value
+				}
+			case "权重":
+				if value != "" {
+					if v, err := strconv.ParseUint(value, 10, 32); err == nil {
+						weight := uint(v)
+						channel.Weight = &weight
+					}
+				}
+			case "创建时间":
+				if v, err := strconv.ParseInt(value, 10, 64); err == nil {
+					channel.CreatedTime = v
+				}
+			case "测试时间":
+				if v, err := strconv.ParseInt(value, 10, 64); err == nil {
+					channel.TestTime = v
+				}
+			case "响应时间":
+				if v, err := strconv.Atoi(value); err == nil {
+					channel.ResponseTime = v
+				}
+			case "基础URL":
+				if value != "" {
+					channel.BaseURL = &value
+				}
+			case "其他":
+				channel.Other = value
+			case "余额":
+				if v, err := strconv.ParseFloat(value, 64); err == nil {
+					channel.Balance = v
+				}
+			case "余额更新时间":
+				if v, err := strconv.ParseInt(value, 10, 64); err == nil {
+					channel.BalanceUpdatedTime = v
+				}
+			case "模型":
+				channel.Models = value
+			case "分组":
+				channel.Group = value
+			case "已用配额":
+				if v, err := strconv.ParseInt(value, 10, 64); err == nil {
+					channel.UsedQuota = v
+				}
+			case "模型映射":
+				if value != "" {
+					channel.ModelMapping = &value
+				}
+			case "状态码映射":
+				if value != "" {
+					channel.StatusCodeMapping = &value
+				}
+			case "优先级":
+				if value != "" {
+					if v, err := strconv.ParseInt(value, 10, 64); err == nil {
+						channel.Priority = &v
+					}
+				}
+			case "自动禁用":
+				if value != "" {
+					if v, err := strconv.Atoi(value); err == nil {
+						channel.AutoBan = &v
+					}
+				}
+			case "标签":
+				if value != "" {
+					channel.Tag = &value
+				}
+			case "额外设置":
+				if value != "" {
+					channel.Setting = &value
+				}
+			case "参数覆盖":
+				if value != "" {
+					channel.ParamOverride = &value
+				}
+			}
+		}
+
+		// 设置默认值
+		if channel.CreatedTime == 0 {
+			channel.CreatedTime = common.GetTimestamp()
+		}
+
+		// 如果没有设置状态，默认为启用
+		if channel.Status == 0 {
+			channel.Status = 1
+		}
+
+		channels = append(channels, channel)
+	}
+
+	// 批量插入渠道
+	err = model.BatchInsertChannels(channels)
+	if err != nil {
+		common.ApiError(c, fmt.Errorf("failed to insert channels: %w", err))
+		return
+	}
+
+	// 初始化渠道缓存
+	model.InitChannelCache()
+
+	// 返回成功响应
+	c.JSON(http.StatusOK, gin.H{
+		"success": true,
+		"message": fmt.Sprintf("成功导入 %d 个渠道", len(channels)),
+	})
+}

controller/log.go

@@ -146,15 +146,30 @@ func GetLogsSelfStat(c *gin.Context) {
 }
 
 func DeleteHistoryLogs(c *gin.Context) {
-	targetTimestamp, _ := strconv.ParseInt(c.Query("target_timestamp"), 10, 64)
-	if targetTimestamp == 0 {
+	// 获取开始和结束时间戳参数
+	startTimestamp, _ := strconv.ParseInt(c.Query("start_timestamp"), 10, 64)
+	endTimestamp, _ := strconv.ParseInt(c.Query("end_timestamp"), 10, 64)
+	
+	// 兼容旧的target_timestamp参数
+	if startTimestamp == 0 && endTimestamp == 0 {
+		targetTimestamp, _ := strconv.ParseInt(c.Query("target_timestamp"), 10, 64)
+		if targetTimestamp != 0 {
+			// 如果只提供了target_timestamp，则将其作为结束时间，开始时间为0（删除该时间之前的所有日志）
+			endTimestamp = targetTimestamp
+		}
+	}
+	
+	// 验证参数
+	if startTimestamp == 0 && endTimestamp == 0 {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
-			"message": "target timestamp is required",
+			"message": "start timestamp or end timestamp is required",
 		})
 		return
 	}
-	count, err := model.DeleteOldLog(c.Request.Context(), targetTimestamp, 100)
+	
+	// 调用模型层函数删除日志
+	count, err := model.DeleteLogsByTimeRange(c.Request.Context(), startTimestamp, endTimestamp, 100)
 	if err != nil {
 		common.ApiError(c, err)
 		return