预付款退款退还已使用额度

common/constants.go

@@ -50,6 +50,7 @@ var WeChatAuthEnabled = false
 var TelegramOAuthEnabled = false
 var TurnstileCheckEnabled = false
 var RegisterEnabled = true
+var SingleDeviceLoginEnabled = true
 
 var EmailDomainRestrictionEnabled = false // 是否启用邮箱域名限制
 var EmailAliasRestrictionEnabled = false  // 是否启用邮箱别名限制
@@ -173,7 +174,7 @@ var (
 
 	CriticalRateLimitEnable   bool
 	CriticalRateLimitNum            = 20
-	CriticalRateLimitDuration int64 = 20 * 60
+	CriticalRateLimitDuration int64 = 60
 
 	UploadRateLimitNum            = 10
 	UploadRateLimitDuration int64 = 60

common/gin_log_writer_factory.go

@@ -0,0 +1,14 @@
+package common
+
+import (
+	"io"
+	"os"
+)
+
+// GinLogWriterFactory, when set by the host application (e.g. LynxtonAPI), is used by
+// logger.SetupLogger to build gin.DefaultWriter and gin.DefaultErrorWriter instead of the
+// default io.MultiWriter(stdout, file) / io.MultiWriter(stderr, file).
+//
+// Implementations should write human-readable legacy lines to logFile as needed and emit
+// structured logs separately (e.g. JSON on stdout) so container collectors see one format.
+var GinLogWriterFactory func(stdout io.Writer, logFile *os.File) (out io.Writer, errOut io.Writer)

common/init.go

@@ -120,7 +120,7 @@ func InitEnv() {
 
 	CriticalRateLimitEnable = GetEnvOrDefaultBool("CRITICAL_RATE_LIMIT_ENABLE", true)
 	CriticalRateLimitNum = GetEnvOrDefault("CRITICAL_RATE_LIMIT", 20)
-	CriticalRateLimitDuration = int64(GetEnvOrDefault("CRITICAL_RATE_LIMIT_DURATION", 20*60))
+	CriticalRateLimitDuration = int64(GetEnvOrDefault("CRITICAL_RATE_LIMIT_DURATION", 60))
 
 	SearchRateLimitEnable = GetEnvOrDefaultBool("SEARCH_RATE_LIMIT_ENABLE", true)
 	SearchRateLimitNum = GetEnvOrDefault("SEARCH_RATE_LIMIT", 10)

common/ops_hook.go

@@ -0,0 +1,7 @@
+package common
+
+import "context"
+
+// EmitAsyncBillingOpsLog is an optional hook set by Lynxton (after applog.Init) to emit structured JSON
+// for async task billing (worker has no *gin.Context). When nil, new-api stays silent on this channel.
+var EmitAsyncBillingOpsLog func(ctx context.Context, msg string, kv map[string]any)

common/verification.go

@@ -1,10 +1,13 @@
 package common
 
 import (
+	"context"
+	"errors"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/go-redis/redis/v8"
 	"github.com/google/uuid"
 )
 
@@ -23,6 +26,8 @@ var verificationMap map[string]verificationValue
 var verificationMapMaxSize = 10
 var VerificationValidMinutes = 10
 
+const verificationRedisKeyPrefix = "verification:"
+
 func GenerateVerificationCode(length int) string {
 	code := uuid.New().String()
 	code = strings.Replace(code, "-", "", -1)
@@ -33,6 +38,15 @@ func GenerateVerificationCode(length int) string {
 }
 
 func RegisterVerificationCodeWithKey(key string, code string, purpose string) {
+	key = normalizeVerificationKey(key)
+	if RedisEnabled && RDB != nil {
+		err := RDB.Set(context.Background(), verificationRedisKey(key, purpose), code, verificationTTL()).Err()
+		if err == nil {
+			return
+		}
+		SysLog("failed to save verification code to Redis, falling back to memory: " + err.Error())
+	}
+
 	verificationMutex.Lock()
 	defer verificationMutex.Unlock()
 	verificationMap[purpose+key] = verificationValue{
@@ -45,6 +59,19 @@ func RegisterVerificationCodeWithKey(key string, code string, purpose string) {
 }
 
 func VerifyCodeWithKey(key string, code string, purpose string) bool {
+	key = normalizeVerificationKey(key)
+	code = strings.TrimSpace(code)
+	if RedisEnabled && RDB != nil {
+		value, err := RDB.Get(context.Background(), verificationRedisKey(key, purpose)).Result()
+		if err == nil {
+			return code == value
+		}
+		if errors.Is(err, redis.Nil) {
+			return false
+		}
+		SysLog("failed to read verification code from Redis, falling back to memory: " + err.Error())
+	}
+
 	verificationMutex.Lock()
 	defer verificationMutex.Unlock()
 	value, okay := verificationMap[purpose+key]
@@ -56,6 +83,13 @@ func VerifyCodeWithKey(key string, code string, purpose string) bool {
 }
 
 func DeleteKey(key string, purpose string) {
+	key = normalizeVerificationKey(key)
+	if RedisEnabled && RDB != nil {
+		if err := RDB.Del(context.Background(), verificationRedisKey(key, purpose)).Err(); err != nil {
+			SysLog("failed to delete verification code from Redis: " + err.Error())
+		}
+	}
+
 	verificationMutex.Lock()
 	defer verificationMutex.Unlock()
 	delete(verificationMap, purpose+key)
@@ -71,6 +105,18 @@ func removeExpiredPairs() {
 	}
 }
 
+func verificationRedisKey(key string, purpose string) string {
+	return verificationRedisKeyPrefix + purpose + ":" + key
+}
+
+func verificationTTL() time.Duration {
+	return time.Duration(VerificationValidMinutes) * time.Minute
+}
+
+func normalizeVerificationKey(key string) string {
+	return strings.ToLower(strings.TrimSpace(key))
+}
+
 func init() {
 	verificationMutex.Lock()
 	defer verificationMutex.Unlock()

constant/api_type.go

@@ -12,6 +12,7 @@ const (
 	APITypeTencent
 	APITypeGemini
 	APITypeZhipuV4
+
 	APITypeOllama
 	APITypePerplexity
 	APITypeAws

constant/context_key.go

@@ -66,4 +66,15 @@ const (
 	// ContextKeyLanguage stores the user's language preference for i18n
 	ContextKeyLanguage ContextKey = "language"
 	ContextKeyIsStream ContextKey = "is_stream"
+
+	/* enterprise discount related keys */
+	ContextKeyOrgID           ContextKey = "org_id"
+	ContextKeyOrgDiscountRate ContextKey = "org_discount_rate"
+
+	// Ops billing snapshot (set by new-api/service before RecordConsumeLog; read by Lynxton relay_request_summary).
+	ContextKeyOpsBillingPromptTokens     ContextKey = "ops_billing_prompt_tokens"
+	ContextKeyOpsBillingCompletionTokens ContextKey = "ops_billing_completion_tokens"
+	ContextKeyOpsBillingTotalTokens      ContextKey = "ops_billing_total_tokens"
+	ContextKeyOpsBillingConsumeQuota     ContextKey = "ops_billing_consume_quota"
+	ContextKeyOpsBillingSnapshotFrom     ContextKey = "ops_billing_snapshot_from"
 )

controller/channel.go

@@ -68,6 +68,14 @@ func clearChannelInfo(channel *model.Channel) {
 	}
 }
 
+func normalizeChannelBaseURL(channel *model.Channel) {
+	if channel == nil || channel.BaseURL == nil {
+		return
+	}
+	normalized := strings.TrimRight(strings.TrimSpace(*channel.BaseURL), "/")
+	channel.BaseURL = &normalized
+}
+
 func GetAllChannels(c *gin.Context) {
 	pageInfo := common.GetPageQuery(c)
 	channelData := make([]*model.Channel, 0)
@@ -403,7 +411,7 @@ func GetChannelKey(c *gin.Context) {
 	}
 
 	// 记录操作日志
-	model.RecordLog(userId, model.LogTypeSystem, fmt.Sprintf("查看渠道密钥信息 (渠道ID: %d)", channelId))
+	model.RecordLog(userId, model.LogTypeSystem, fmt.Sprintf("查看渠道密钥信息 (渠道ID: %d)", channelId), 0)
 
 	// 返回渠道密钥
 	c.JSON(http.StatusOK, gin.H{
@@ -570,6 +578,7 @@ func AddChannel(c *gin.Context) {
 		common.ApiError(c, err)
 		return
 	}
+	normalizeChannelBaseURL(addChannelRequest.Channel)
 
 	// 使用统一的校验函数
 	if err := validateChannel(addChannelRequest.Channel, true); err != nil {
@@ -846,6 +855,7 @@ func UpdateChannel(c *gin.Context) {
 		common.ApiError(c, err)
 		return
 	}
+	normalizeChannelBaseURL(&channel.Channel)
 
 	// 使用统一的校验函数
 	if err := validateChannel(&channel.Channel, false); err != nil {

controller/checkin.go

@@ -61,7 +61,7 @@ func DoCheckin(c *gin.Context) {
 		})
 		return
 	}
-	model.RecordLog(userId, model.LogTypeSystem, fmt.Sprintf("用户签到，获得额度 %s", logger.LogQuota(checkin.QuotaAwarded)))
+	model.RecordLog(userId, model.LogTypeSystem, fmt.Sprintf("用户签到，获得额度 %s", logger.LogQuota(checkin.QuotaAwarded)), checkin.QuotaAwarded)
 	c.JSON(http.StatusOK, gin.H{
 		"success": true,
 		"message": "签到成功",

controller/model.go

@@ -141,6 +141,7 @@ func ListModels(c *gin.Context, modelType int) {
 			}
 			if oaiModel, ok := openAIModelsMap[allowModel]; ok {
 				oaiModel.SupportedEndpointTypes = model.GetModelSupportEndpointTypes(allowModel)
+				oaiModel.Modalities = ratio_setting.GetModelModalities(allowModel)
 				userOpenAiModels = append(userOpenAiModels, oaiModel)
 			} else {
 				userOpenAiModels = append(userOpenAiModels, dto.OpenAIModels{
@@ -149,6 +150,7 @@ func ListModels(c *gin.Context, modelType int) {
 					Created:                1626777600,
 					OwnedBy:                "custom",
 					SupportedEndpointTypes: model.GetModelSupportEndpointTypes(allowModel),
+					Modalities:             ratio_setting.GetModelModalities(allowModel),
 				})
 			}
 		}
@@ -189,6 +191,7 @@ func ListModels(c *gin.Context, modelType int) {
 			}
 			if oaiModel, ok := openAIModelsMap[modelName]; ok {
 				oaiModel.SupportedEndpointTypes = model.GetModelSupportEndpointTypes(modelName)
+				oaiModel.Modalities = ratio_setting.GetModelModalities(modelName)
 				userOpenAiModels = append(userOpenAiModels, oaiModel)
 			} else {
 				userOpenAiModels = append(userOpenAiModels, dto.OpenAIModels{
@@ -197,6 +200,7 @@ func ListModels(c *gin.Context, modelType int) {
 					Created:                1626777600,
 					OwnedBy:                "custom",
 					SupportedEndpointTypes: model.GetModelSupportEndpointTypes(modelName),
+					Modalities:             ratio_setting.GetModelModalities(modelName),
 				})
 			}
 		}
@@ -273,6 +277,8 @@ func RetrieveModel(c *gin.Context, modelType int) {
 				Type:        "model",
 			})
 		default:
+			aiModel.SupportedEndpointTypes = model.GetModelSupportEndpointTypes(modelId)
+			aiModel.Modalities = ratio_setting.GetModelModalities(modelId)
 			c.JSON(200, aiModel)
 		}
 	} else {
@@ -286,4 +292,4 @@ func RetrieveModel(c *gin.Context, modelType int) {
 			"error": openAIError,
 		})
 	}
-}
+}

controller/option.go

@@ -306,6 +306,30 @@ func UpdateOption(c *gin.Context) {
 			})
 			return
 		}
+	case "ModelDisplayName":
+		if err = ratio_setting.UpdateModelDisplayNameByJSONString(option.Value.(string)); err != nil {
+			c.JSON(http.StatusOK, gin.H{
+				"success": false,
+				"message": "模型显示名称设置失败: " + err.Error(),
+			})
+			return
+		}
+	case "ModelModalities":
+		if err = ratio_setting.UpdateModelModalitiesByJSONString(option.Value.(string)); err != nil {
+			c.JSON(http.StatusOK, gin.H{
+				"success": false,
+				"message": "模型输出类型设置失败: " + err.Error(),
+			})
+			return
+		}
+	case "ModelImg":
+		if err = ratio_setting.UpdateModelImgByJSONString(option.Value.(string)); err != nil {
+			c.JSON(http.StatusOK, gin.H{
+				"success": false,
+				"message": "模型图片设置失败: " + err.Error(),
+			})
+			return
+		}
 	}
 	err = model.UpdateOption(option.Key, option.Value.(string))
 	if err != nil {

controller/redemption.go

@@ -1,6 +1,7 @@
 package controller
 
 import (
+	"fmt"
 	"net/http"
 	"strconv"
 	"unicode/utf8"
@@ -84,9 +85,13 @@ func AddRedemption(c *gin.Context) {
 	var keys []string
 	for i := 0; i < redemption.Count; i++ {
 		key := common.GetUUID()
+		name := redemption.Name
+		if redemption.Count > 1 {
+			name = fmt.Sprintf("%s_%d", redemption.Name, i+1)
+		}
 		cleanRedemption := model.Redemption{
 			UserId:      c.GetInt("id"),
-			Name:        redemption.Name,
+			Name:        name,
 			Key:         key,
 			CreatedTime: common.GetTimestamp(),
 			Quota:       redemption.Quota,

controller/relay.go

@@ -568,6 +568,8 @@ func RelayTask(c *gin.Context) {
 		if settleErr := service.SettleBilling(c, relayInfo, result.Quota); settleErr != nil {
 			common.SysError("settle task billing error: " + settleErr.Error())
 		}
+		recordedQuota := service.NormalizeRecordedQuota(c, relayInfo, result.Quota)
+		relayInfo.PriceData.Quota = recordedQuota
 		service.LogTaskConsumption(c, relayInfo)
 
 		task := model.InitTask(result.Platform, relayInfo)
@@ -583,7 +585,7 @@ func RelayTask(c *gin.Context) {
 			OriginModelName: relayInfo.OriginModelName,
 			PerCallBilling:  common.StringsContains(constant.TaskPricePatches, relayInfo.OriginModelName) || relayInfo.PriceData.UsePrice,
 		}
-		task.Quota = result.Quota
+		task.Quota = recordedQuota
 		task.Data = result.TaskData
 		task.Action = relayInfo.Action
 		if insertErr := task.Insert(); insertErr != nil {

controller/secure_verification.go

@@ -127,7 +127,7 @@ func UniversalVerify(c *gin.Context) {
 	}
 
 	// 记录日志
-	model.RecordLog(userId, model.LogTypeSystem, fmt.Sprintf("通用安全验证成功 (验证方式: %s)", verifyMethod))
+	model.RecordLog(userId, model.LogTypeSystem, fmt.Sprintf("通用安全验证成功 (验证方式: %s)", verifyMethod), 0)
 
 	c.JSON(http.StatusOK, gin.H{
 		"success": true,

controller/topup.go

@@ -189,6 +189,9 @@ func getMinTopup() int64 {
 }
 
 func RequestEpay(c *gin.Context) {
+	if blockEnterpriseTopupForNonOwner(c) {
+		return
+	}
 	var req EpayRequest
 	err := c.ShouldBindJSON(&req)
 	if err != nil {

controller/topup_creem.go

@@ -141,6 +141,9 @@ func (*CreemAdaptor) RequestPay(c *gin.Context, req *CreemPayRequest) {
 }
 
 func RequestCreemPay(c *gin.Context) {
+	if blockEnterpriseTopupForNonOwner(c) {
+		return
+	}
 	var req CreemPayRequest
 
 	// 读取body内容用于打印，同时保留原始数据供后续使用