merge 5.12

controller/relay.go

@@ -66,7 +66,7 @@ func Relay(c *gin.Context) {
 				err.Error.Message = "当前分组上游负载已饱和，请稍后再试"
 			}
 
-			err.OpenAIError.Message = common.MessageWithRequestId("Request From https://api.adamchatbot.chat Error", requestId)
+			err.Error.Message = common.MessageWithRequestId("Request From https://api.adamchatbot.chat Error", requestId)
 
 			c.JSON(err.StatusCode, gin.H{
 				"error": err.Error,

router/dashboard.go

@@ -9,8 +9,9 @@ import (
 )
 
 func SetDashboardRouter(router *gin.Engine) {
-	router.Use(middleware.CORS())
+
 	apiRouter := router.Group("/")
+	apiRouter.Use(middleware.CORS())
 	apiRouter.Use(gzip.Gzip(gzip.DefaultCompression))
 	apiRouter.Use(middleware.GlobalAPIRateLimit())
 	apiRouter.Use(middleware.TokenAuth())