xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-09-22 02:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix mj submit bug

Browse Source
This commit is contained in:
CaIon 2023-11-28 23:15:17 +08:00
parent 10ca1e6146
commit 7ffc2e34a6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/relay-mj.go
View File

@ -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)

2
controller/relay.go
View File

@ -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")

4
middleware/auth.go
View File

@ -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]