feat: CNY localization, channel UX fixes, and JSON editor improvements

common/constants.go

@@ -38,7 +38,7 @@ func SetTheme(t string) {
 
 // var ChatLink = ""
 // var ChatLink2 = ""
-var QuotaPerUnit = 500 * 1000.0 // $0.002 / 1K tokens
+var QuotaPerUnit = 500 * 1000.0 // ¥0.002 / 1K tokens（人民币基准）
 // 保留旧变量以兼容历史逻辑，实际展示由 general_setting.quota_display_type 控制
 var DisplayInCurrencyEnabled = true
 var DisplayTokenStatEnabled = true

controller/billing.go

@@ -40,18 +40,17 @@ func GetSubscription(c *gin.Context) {
 	}
 	quota := remainQuota + usedQuota
 	amount := float64(quota)
-	// OpenAI 兼容接口中的 *_USD 字段含义保持“额度单位”对应值：
-	// 我们将其解释为以“站点展示类型”为准：
-	// - USD: 直接除以 QuotaPerUnit
-	// - CNY: 先转 USD 再乘汇率
+	// 计价基准为人民币：quota / QuotaPerUnit 直接得到 CNY
+	// - CNY: 直接除以 QuotaPerUnit
+	// - USD: 除以 QuotaPerUnit 再除以汇率
 	// - TOKENS: 直接使用 tokens 数量
 	switch operation_setting.GetQuotaDisplayType() {
 	case operation_setting.QuotaDisplayTypeCNY:
-		amount = amount / common.QuotaPerUnit * operation_setting.USDExchangeRate
+		amount = amount / common.QuotaPerUnit
 	case operation_setting.QuotaDisplayTypeTokens:
 		// amount 保持 tokens 数值
 	default:
-		amount = amount / common.QuotaPerUnit
+		amount = amount / common.QuotaPerUnit / operation_setting.USDExchangeRate
 	}
 	if token != nil && token.UnlimitedQuota {
 		amount = 100000000
@@ -93,11 +92,11 @@ func GetUsage(c *gin.Context) {
 	amount := float64(quota)
 	switch operation_setting.GetQuotaDisplayType() {
 	case operation_setting.QuotaDisplayTypeCNY:
-		amount = amount / common.QuotaPerUnit * operation_setting.USDExchangeRate
+		amount = amount / common.QuotaPerUnit
 	case operation_setting.QuotaDisplayTypeTokens:
 		// tokens 保持原值
 	default:
-		amount = amount / common.QuotaPerUnit
+		amount = amount / common.QuotaPerUnit / operation_setting.USDExchangeRate
 	}
 	usage := OpenAIUsageResponse{
 		Object:     "list",

docker-compose.dev.yml

@@ -1,9 +1,8 @@
-# Frontend Development - Backend built from local source
+# Frontend Development - Backend + Frontend in Docker
 #
 # Usage:
-#   1. docker compose -f docker-compose.dev.yml up -d
-#   2. cd web && bun install && bun run dev
-#   3. Open http://localhost:3001 (Rsbuild dev server, API auto-proxied to :3000)
+#   docker compose -f docker-compose.dev.yml up -d
+#   Open http://localhost:5173 (Rsbuild dev server, API auto-proxied to :3000)
 #
 # Rebuild backend after Go code changes:
 #   docker compose -f docker-compose.dev.yml up -d --build new-api
@@ -39,15 +38,33 @@ services:
     networks:
       - dev-network
 
+  frontend:
+    image: oven/bun:1
+    container_name: new-api-frontend
+    restart: unless-stopped
+    working_dir: /app
+    ports:
+      - "5173:3000"
+    volumes:
+      - ./web/default:/app
+      - frontend_node_modules:/app/node_modules
+    environment:
+      - VITE_REACT_APP_SERVER_URL=http://new-api-dev:3000
+    command: sh -c "bun install && bun run dev --host 0.0.0.0"
+    depends_on:
+      - new-api
+    networks:
+      - dev-network
+
   redis:
-    image: redis:7-alpine
+    image: redis:latest
     container_name: new-api-dev-redis
     restart: unless-stopped
     networks:
       - dev-network
 
   postgres:
-    image: postgres:15-alpine
+    image: postgres:15
     container_name: new-api-dev-pg
     restart: unless-stopped
     environment:
@@ -67,6 +84,7 @@ services:
 volumes:
   dev_data:
   dev_pg_data:
+  frontend_node_modules:
 
 networks:
   dev-network:

logger/logger.go

@@ -118,15 +118,14 @@ func logHelper(ctx context.Context, level string, msg string) {
 }
 
 func LogQuota(quota int) string {
-	// 新逻辑：根据额度展示类型输出
+	// 计价基准为人民币，直接除以 QuotaPerUnit 即为 CNY
 	q := float64(quota)
 	switch operation_setting.GetQuotaDisplayType() {
 	case operation_setting.QuotaDisplayTypeCNY:
-		usd := q / common.QuotaPerUnit
-		cny := usd * operation_setting.USDExchangeRate
+		cny := q / common.QuotaPerUnit
 		return fmt.Sprintf("¥%.6f 额度", cny)
 	case operation_setting.QuotaDisplayTypeCustom:
-		usd := q / common.QuotaPerUnit
+		base := q / common.QuotaPerUnit
 		rate := operation_setting.GetGeneralSetting().CustomCurrencyExchangeRate
 		symbol := operation_setting.GetGeneralSetting().CustomCurrencySymbol
 		if symbol == "" {
@@ -135,24 +134,24 @@ func LogQuota(quota int) string {
 		if rate <= 0 {
 			rate = 1
 		}
-		v := usd * rate
+		v := base * rate
 		return fmt.Sprintf("%s%.6f 额度", symbol, v)
 	case operation_setting.QuotaDisplayTypeTokens:
 		return fmt.Sprintf("%d 点额度", quota)
 	default: // USD
-		return fmt.Sprintf("＄%.6f 额度", q/common.QuotaPerUnit)
+		usd := q / common.QuotaPerUnit / operation_setting.USDExchangeRate
+		return fmt.Sprintf("＄%.6f 额度", usd)
 	}
 }
 
 func FormatQuota(quota int) string {
 	q := float64(quota)
 	switch operation_setting.GetQuotaDisplayType() {
 	case operation_setting.QuotaDisplayTypeCNY:
-		usd := q / common.QuotaPerUnit
-		cny := usd * operation_setting.USDExchangeRate
+		cny := q / common.QuotaPerUnit
 		return fmt.Sprintf("¥%.6f", cny)
 	case operation_setting.QuotaDisplayTypeCustom:
-		usd := q / common.QuotaPerUnit
+		base := q / common.QuotaPerUnit
 		rate := operation_setting.GetGeneralSetting().CustomCurrencyExchangeRate
 		symbol := operation_setting.GetGeneralSetting().CustomCurrencySymbol
 		if symbol == "" {
@@ -161,12 +160,13 @@ func FormatQuota(quota int) string {
 		if rate <= 0 {
 			rate = 1
 		}
-		v := usd * rate
+		v := base * rate
 		return fmt.Sprintf("%s%.6f", symbol, v)
 	case operation_setting.QuotaDisplayTypeTokens:
 		return fmt.Sprintf("%d", quota)
-	default:
-		return fmt.Sprintf("＄%.6f", q/common.QuotaPerUnit)
+	default: // USD
+		usd := q / common.QuotaPerUnit / operation_setting.USDExchangeRate
+		return fmt.Sprintf("＄%.6f", usd)
 	}
 }
 

model/log.go

@@ -246,8 +246,27 @@ func RecordConsumeLog(c *gin.Context, userId int, params RecordConsumeLogParams)
 		logger.LogError(c, "failed to record log: "+err.Error())
 	}
 	if common.DataExportEnabled {
+		// Extract cache token counts from the Other map before spawning goroutine
+		cacheTokens := 0
+		cacheCreationTokens := 0
+		if v, ok := params.Other["cache_tokens"]; ok {
+			switch n := v.(type) {
+			case int:
+				cacheTokens = n
+			case float64:
+				cacheTokens = int(n)
+			}
+		}
+		if v, ok := params.Other["cache_creation_tokens"]; ok {
+			switch n := v.(type) {
+			case int:
+				cacheCreationTokens = n
+			case float64:
+				cacheCreationTokens = int(n)
+			}
+		}
 		gopool.Go(func() {
-			LogQuotaData(userId, username, params.ModelName, params.Quota, common.GetTimestamp(), params.PromptTokens+params.CompletionTokens)
+			LogQuotaData(userId, username, params.ModelName, params.Quota, common.GetTimestamp(), params.PromptTokens+params.CompletionTokens, cacheTokens, cacheCreationTokens)
 		})
 	}
 }

model/usedata.go

@@ -11,14 +11,16 @@ import (
 
 // QuotaData 柱状图数据
 type QuotaData struct {
-	Id        int    `json:"id"`
-	UserID    int    `json:"user_id" gorm:"index"`
-	Username  string `json:"username" gorm:"index:idx_qdt_model_user_name,priority:2;size:64;default:''"`
-	ModelName string `json:"model_name" gorm:"index:idx_qdt_model_user_name,priority:1;size:64;default:''"`
-	CreatedAt int64  `json:"created_at" gorm:"bigint;index:idx_qdt_created_at,priority:2"`
-	TokenUsed int    `json:"token_used" gorm:"default:0"`
-	Count     int    `json:"count" gorm:"default:0"`
-	Quota     int    `json:"quota" gorm:"default:0"`
+	Id                  int    `json:"id"`
+	UserID              int    `json:"user_id" gorm:"index"`
+	Username            string `json:"username" gorm:"index:idx_qdt_model_user_name,priority:2;size:64;default:''"`
+	ModelName           string `json:"model_name" gorm:"index:idx_qdt_model_user_name,priority:1;size:64;default:''"`
+	CreatedAt           int64  `json:"created_at" gorm:"bigint;index:idx_qdt_created_at,priority:2"`
+	TokenUsed           int    `json:"token_used" gorm:"default:0"`
+	Count               int    `json:"count" gorm:"default:0"`
+	Quota               int    `json:"quota" gorm:"default:0"`
+	CacheTokens         int    `json:"cache_tokens" gorm:"default:0"`          // tokens read from cache (prompt cache hits)
+	CacheCreationTokens int    `json:"cache_creation_tokens" gorm:"default:0"` // tokens written to cache
 }
 
 func UpdateQuotaData() {
@@ -34,34 +36,38 @@ func UpdateQuotaData() {
 var CacheQuotaData = make(map[string]*QuotaData)
 var CacheQuotaDataLock = sync.Mutex{}
 
-func logQuotaDataCache(userId int, username string, modelName string, quota int, createdAt int64, tokenUsed int) {
+func logQuotaDataCache(userId int, username string, modelName string, quota int, createdAt int64, tokenUsed int, cacheTokens int, cacheCreationTokens int) {
 	key := fmt.Sprintf("%d-%s-%s-%d", userId, username, modelName, createdAt)
 	quotaData, ok := CacheQuotaData[key]
 	if ok {
 		quotaData.Count += 1
 		quotaData.Quota += quota
 		quotaData.TokenUsed += tokenUsed
+		quotaData.CacheTokens += cacheTokens
+		quotaData.CacheCreationTokens += cacheCreationTokens
 	} else {
 		quotaData = &QuotaData{
-			UserID:    userId,
-			Username:  username,
-			ModelName: modelName,
-			CreatedAt: createdAt,
-			Count:     1,
-			Quota:     quota,
-			TokenUsed: tokenUsed,
+			UserID:              userId,
+			Username:            username,
+			ModelName:           modelName,
+			CreatedAt:           createdAt,
+			Count:               1,
+			Quota:               quota,
+			TokenUsed:           tokenUsed,
+			CacheTokens:         cacheTokens,
+			CacheCreationTokens: cacheCreationTokens,
 		}
 	}
 	CacheQuotaData[key] = quotaData
 }
 
-func LogQuotaData(userId int, username string, modelName string, quota int, createdAt int64, tokenUsed int) {
+func LogQuotaData(userId int, username string, modelName string, quota int, createdAt int64, tokenUsed int, cacheTokens int, cacheCreationTokens int) {
 	// 只精确到小时
 	createdAt = createdAt - (createdAt % 3600)
 
 	CacheQuotaDataLock.Lock()
 	defer CacheQuotaDataLock.Unlock()
-	logQuotaDataCache(userId, username, modelName, quota, createdAt, tokenUsed)
+	logQuotaDataCache(userId, username, modelName, quota, createdAt, tokenUsed, cacheTokens, cacheCreationTokens)
 }
 
 func SaveQuotaDataCache() {
@@ -80,7 +86,7 @@ func SaveQuotaDataCache() {
 			//quotaDataDB.Count += quotaData.Count
 			//quotaDataDB.Quota += quotaData.Quota
 			//DB.Table("quota_data").Save(quotaDataDB)
-			increaseQuotaData(quotaData.UserID, quotaData.Username, quotaData.ModelName, quotaData.Count, quotaData.Quota, quotaData.CreatedAt, quotaData.TokenUsed)
+			increaseQuotaData(quotaData.UserID, quotaData.Username, quotaData.ModelName, quotaData.Count, quotaData.Quota, quotaData.CreatedAt, quotaData.TokenUsed, quotaData.CacheTokens, quotaData.CacheCreationTokens)
 		} else {
 			DB.Table("quota_data").Create(quotaData)
 		}
@@ -89,12 +95,14 @@ func SaveQuotaDataCache() {
 	common.SysLog(fmt.Sprintf("保存数据看板数据成功，共保存%d条数据", size))
 }
 
-func increaseQuotaData(userId int, username string, modelName string, count int, quota int, createdAt int64, tokenUsed int) {
+func increaseQuotaData(userId int, username string, modelName string, count int, quota int, createdAt int64, tokenUsed int, cacheTokens int, cacheCreationTokens int) {
 	err := DB.Table("quota_data").Where("user_id = ? and username = ? and model_name = ? and created_at = ?",
 		userId, username, modelName, createdAt).Updates(map[string]interface{}{
-		"count":      gorm.Expr("count + ?", count),
-		"quota":      gorm.Expr("quota + ?", quota),
-		"token_used": gorm.Expr("token_used + ?", tokenUsed),
+		"count":                gorm.Expr("count + ?", count),
+		"quota":                gorm.Expr("quota + ?", quota),
+		"token_used":           gorm.Expr("token_used + ?", tokenUsed),
+		"cache_tokens":         gorm.Expr("cache_tokens + ?", cacheTokens),
+		"cache_creation_tokens": gorm.Expr("cache_creation_tokens + ?", cacheCreationTokens),
 	}).Error
 	if err != nil {
 		common.SysLog(fmt.Sprintf("increaseQuotaData error: %s", err))
@@ -118,7 +126,7 @@ func GetQuotaDataByUserId(userId int, startTime int64, endTime int64) (quotaData
 func GetQuotaDataGroupByUser(startTime int64, endTime int64) (quotaData []*QuotaData, err error) {
 	var quotaDatas []*QuotaData
 	err = DB.Table("quota_data").
-		Select("username, created_at, sum(count) as count, sum(quota) as quota, sum(token_used) as token_used").
+		Select("username, created_at, sum(count) as count, sum(quota) as quota, sum(token_used) as token_used, sum(cache_tokens) as cache_tokens, sum(cache_creation_tokens) as cache_creation_tokens").
 		Where("created_at >= ? and created_at <= ?", startTime, endTime).
 		Group("username, created_at").
 		Find(&quotaDatas).Error
@@ -133,6 +141,6 @@ func GetAllQuotaDates(startTime int64, endTime int64, username string) (quotaDat
 	// 从quota_data表中查询数据
 	// only select model_name, sum(count) as count, sum(quota) as quota, model_name, created_at from quota_data group by model_name, created_at;
 	//err = DB.Table("quota_data").Where("created_at >= ? and created_at <= ?", startTime, endTime).Find(&quotaDatas).Error
-	err = DB.Table("quota_data").Select("model_name, sum(count) as count, sum(quota) as quota, sum(token_used) as token_used, created_at").Where("created_at >= ? and created_at <= ?", startTime, endTime).Group("model_name, created_at").Find(&quotaDatas).Error
+	err = DB.Table("quota_data").Select("model_name, sum(count) as count, sum(quota) as quota, sum(token_used) as token_used, sum(cache_tokens) as cache_tokens, sum(cache_creation_tokens) as cache_creation_tokens, created_at").Where("created_at >= ? and created_at <= ?", startTime, endTime).Group("model_name, created_at").Find(&quotaDatas).Error
 	return quotaDatas, err
 }

setting/operation_setting/general_setting.go

@@ -27,7 +27,7 @@ var generalSetting = GeneralSetting{
 	DocsLink:                   "https://docs.newapi.pro",
 	PingIntervalEnabled:        false,
 	PingIntervalSeconds:        60,
-	QuotaDisplayType:           QuotaDisplayTypeUSD,
+	QuotaDisplayType:           QuotaDisplayTypeCNY,
 	CustomCurrencySymbol:       "¤",
 	CustomCurrencyExchangeRate: 1.0,
 }

setting/ratio_setting/model_ratio.go

@@ -8,20 +8,16 @@ import (
 	"github.com/QuantumNous/new-api/types"
 )
 
-// from songquanpeng/one-api
+// 计价基准：人民币 (CNY)
 const (
-	USD2RMB = 7.3 // 暂定 1 USD = 7.3 RMB
-	USD     = 500 // $0.002 = 1 -> $1 = 500
-	RMB     = USD / USD2RMB
+	USD2RMB = 7.3             // 暂定 1 USD = 7.3 RMB
+	RMB     = 500             // ¥0.002 = 1 -> ¥1 = 500（基准货币）
+	USD     = RMB * USD2RMB   // $1 = 3650（由汇率换算，仅供参考）
 )
 
-// modelRatio
-// https://platform.openai.com/docs/models/model-endpoint-compatibility
-// https://cloud.baidu.com/doc/WENXINWORKSHOP/s/Blfmc9dlf
-// https://openai.com/pricing
-// TODO: when a new api is enabled, check the pricing here
-// 1 === $0.002 / 1K tokens
-// 1 === ￥0.014 / 1k tokens
+// modelRatio — 以人民币为基准
+// 1 === ¥0.002 / 1K tokens === ¥2 / 1M tokens
+// 1 === $0.000274 / 1K tokens（按 7.3 汇率换算）
 
 var defaultModelRatio = map[string]float64{
 	//"midjourney":                50,