diff --git a/controller/relay-mj.go b/controller/relay-mj.go index 89b0f0c..778b455 100644 --- a/controller/relay-mj.go +++ b/controller/relay-mj.go @@ -327,7 +327,7 @@ func relayMidjourneySubmit(c *gin.Context, relayMode int) *MidjourneyResponse { //if c.Request.Header.Get("Authorization") != "" { // 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]) // print request header log.Printf("request header: %s", req.Header) diff --git a/controller/relay.go b/controller/relay.go index 1797084..1584731 100644 --- a/controller/relay.go +++ b/controller/relay.go @@ -315,7 +315,7 @@ func RelayMidjourney(c *gin.Context) { err.Result = "当前分组负载已饱和,请稍后再试,或升级账户以提升服务质量。" } c.JSON(400, gin.H{ - "error": err.Result, + "error": err.Description + " " + err.Result, }) } channelId := c.GetInt("channel_id") diff --git a/middleware/auth.go b/middleware/auth.go index 5b8670a..193e726 100644 --- a/middleware/auth.go +++ b/middleware/auth.go @@ -86,14 +86,14 @@ func TokenAuth() func(c *gin.Context) { return func(c *gin.Context) { key := c.Request.Header.Get("Authorization") 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 = strings.TrimPrefix(key, "Bearer ") key = strings.TrimPrefix(key, "sk-") parts := strings.Split(key, "-") key = parts[0] } else { - key = strings.TrimPrefix(key, "Bearer ") key = strings.TrimPrefix(key, "sk-") parts := strings.Split(key, "-") key = parts[0]