fix mj submit bug

controller/relay-mj.go

@@ -327,7 +327,7 @@ func relayMidjourneySubmit(c *gin.Context, relayMode int) *MidjourneyResponse {
 	//if c.Request.Header.Get("Authorization") != "" {
 	//if c.Request.Header.Get("Authorization") != "" {
 	//	mjToken = strings.Split(c.Request.Header.Get("Authorization"), " ")[1]
 	//	mjToken = strings.Split(c.Request.Header.Get("Authorization"), " ")[1]
 	//}
 	//}
-	req.Header.Set("Authorization", "Bearer midjourney-proxy")
+	//req.Header.Set("Authorization", "Bearer midjourney-proxy")
 	req.Header.Set("mj-api-secret", strings.Split(c.Request.Header.Get("Authorization"), " ")[1])
 	req.Header.Set("mj-api-secret", strings.Split(c.Request.Header.Get("Authorization"), " ")[1])
 	// print request header
 	// print request header
 	log.Printf("request header: %s", req.Header)
 	log.Printf("request header: %s", req.Header)

controller/relay.go

@@ -315,7 +315,7 @@ func RelayMidjourney(c *gin.Context) {
 				err.Result = "当前分组负载已饱和，请稍后再试，或升级账户以提升服务质量。"
 				err.Result = "当前分组负载已饱和，请稍后再试，或升级账户以提升服务质量。"
 			}
 			}
 			c.JSON(400, gin.H{
 			c.JSON(400, gin.H{
-				"error": err.Result,
+				"error": err.Description + " " + err.Result,
 			})
 			})
 		}
 		}
 		channelId := c.GetInt("channel_id")
 		channelId := c.GetInt("channel_id")

middleware/auth.go

@@ -86,14 +86,14 @@ func TokenAuth() func(c *gin.Context) {
 	return func(c *gin.Context) {
 	return func(c *gin.Context) {
 		key := c.Request.Header.Get("Authorization")
 		key := c.Request.Header.Get("Authorization")
 		parts := make([]string, 0)
 		parts := make([]string, 0)
-		if key == "" {
+		key = strings.TrimPrefix(key, "Bearer ")
+		if key == "" || key == "midjourney-proxy" {
 			key = c.Request.Header.Get("mj-api-secret")
 			key = c.Request.Header.Get("mj-api-secret")
 			key = strings.TrimPrefix(key, "Bearer ")
 			key = strings.TrimPrefix(key, "Bearer ")
 			key = strings.TrimPrefix(key, "sk-")
 			key = strings.TrimPrefix(key, "sk-")
 			parts := strings.Split(key, "-")
 			parts := strings.Split(key, "-")
 			key = parts[0]
 			key = parts[0]
 		} else {
 		} else {
-			key = strings.TrimPrefix(key, "Bearer ")
 			key = strings.TrimPrefix(key, "sk-")
 			key = strings.TrimPrefix(key, "sk-")
 			parts := strings.Split(key, "-")
 			parts := strings.Split(key, "-")
 			key = parts[0]
 			key = parts[0]