From c5bec1670357e7920adfa60a4af5473b8a1d9c70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98Liu?= <‘liuchunk08@gmail.com’>
Date: Tue, 16 Jan 2024 17:21:08 +0800
Subject: [PATCH] merge 5.12

---
 controller/relay.go | 2 +-
 router/dashboard.go | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/controller/relay.go b/controller/relay.go
index 6adf053a..ef5a4bbb 100644
--- a/controller/relay.go
+++ b/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,
diff --git a/router/dashboard.go b/router/dashboard.go
index 06b55bcd..f0900d8f 100644
--- a/router/dashboard.go
+++ b/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())