Merge branch 'upstream/main'

middleware/distributor.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	gutils "github.com/Laisky/go-utils/v4"
+	gutils "github.com/Laisky/go-utils/v5"
 	"github.com/gin-gonic/gin"
 	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/common/logger"

middleware/language.go

@@ -0,0 +1,25 @@
+package middleware
+
+import (
+	"strings"
+
+	"github.com/gin-gonic/gin"
+
+	"github.com/songquanpeng/one-api/common/i18n"
+)
+
+func Language() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		lang := c.GetHeader("Accept-Language")
+		if lang == "" {
+			lang = "en"
+		}
+		if strings.HasPrefix(strings.ToLower(lang), "zh") {
+			lang = "zh-CN"
+		} else {
+			lang = "en"
+		}
+		c.Set(i18n.ContextKey, lang)
+		c.Next()
+	}
+}

middleware/rate-limit.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/config"
 )
@@ -71,7 +72,7 @@ func memoryRateLimiter(c *gin.Context, maxRequestNum int, duration int64, mark s
 }
 
 func rateLimitFactory(maxRequestNum int, duration int64, mark string) func(c *gin.Context) {
-	if maxRequestNum == 0 {
+	if maxRequestNum == 0 || config.DebugEnabled {
 		return func(c *gin.Context) {
 			c.Next()
 		}