From b7bc205b736f80e072292f296a79d6fc15455e9d Mon Sep 17 00:00:00 2001
From: CalciumIon <1808837298@qq.com>
Date: Sat, 27 Jul 2024 17:55:36 +0800
Subject: [PATCH] feat: print user id when error

---
 common/utils.go     | 4 ++--
 controller/relay.go | 3 +--
 middleware/utils.go | 5 +++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/utils.go b/common/utils.go
index 6a9a13d..3d95508 100644
--- a/common/utils.go
+++ b/common/utils.go
@@ -179,8 +179,8 @@ func Max(a int, b int) int {
 	}
 }
 
-func MessageWithRequestId(message string, id string, userId int) string {
-	return fmt.Sprintf("%s (request id: %s, user id: %d)", message, id, userId)
+func MessageWithRequestId(message string, id string) string {
+	return fmt.Sprintf("%s (request id: %s)", message, id)
 }
 
 func RandomSleep() {
diff --git a/controller/relay.go b/controller/relay.go
index f0b714a..bc951f7 100644
--- a/controller/relay.go
+++ b/controller/relay.go
@@ -82,8 +82,7 @@ func Relay(c *gin.Context) {
 		if openaiErr.StatusCode == http.StatusTooManyRequests {
 			openaiErr.Error.Message = "当前分组上游负载已饱和，请稍后再试"
 		}
-		userId := c.GetInt("id")
-		openaiErr.Error.Message = common.MessageWithRequestId(openaiErr.Error.Message, requestId, userId)
+		openaiErr.Error.Message = common.MessageWithRequestId(openaiErr.Error.Message, requestId)
 		c.JSON(openaiErr.StatusCode, gin.H{
 			"error": openaiErr.Error,
 		})
diff --git a/middleware/utils.go b/middleware/utils.go
index 52614c6..082f565 100644
--- a/middleware/utils.go
+++ b/middleware/utils.go
@@ -1,6 +1,7 @@
 package middleware
 
 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"one-api/common"
 )
@@ -9,12 +10,12 @@ func abortWithOpenAiMessage(c *gin.Context, statusCode int, message string) {
 	userId := c.GetInt("id")
 	c.JSON(statusCode, gin.H{
 		"error": gin.H{
-			"message": common.MessageWithRequestId(message, c.GetString(common.RequestIdKey), userId),
+			"message": common.MessageWithRequestId(message, c.GetString(common.RequestIdKey)),
 			"type":    "new_api_error",
 		},
 	})
 	c.Abort()
-	common.LogError(c.Request.Context(), message)
+	common.LogError(c.Request.Context(), fmt.Sprintf("user %d | %s", userId, message))
 }
 
 func abortWithMidjourneyMessage(c *gin.Context, statusCode int, code int, description string) {