oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: initialize channel metadata in mjproxy and relay processing

Browse Source
This commit is contained in:
CaIon
2025-08-15 19:14:29 +08:00
parent c63b6b3ef8
commit f6a48434c1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controller/relay.go
View File

@@ -318,8 +318,6 @@ func RelayMidjourney(c *gin.Context) {
return return
} }
relayInfo.InitChannelMeta(c)
var mjErr *dto.MidjourneyResponse var mjErr *dto.MidjourneyResponse
switch relayInfo.RelayMode { switch relayInfo.RelayMode {
case relayconstant.RelayModeMidjourneyNotify: case relayconstant.RelayModeMidjourneyNotify:

5
relay/mjproxy_handler.go
View File

@@ -176,6 +176,9 @@ func RelaySwapFace(c *gin.Context, info *relaycommon.RelayInfo) *dto.MidjourneyR
if err != nil { if err != nil {
return service.MidjourneyErrorWrapper(constant.MjRequestError, "bind_request_body_failed") return service.MidjourneyErrorWrapper(constant.MjRequestError, "bind_request_body_failed")
} }
info.InitChannelMeta(c)
if swapFaceRequest.SourceBase64 == "" || swapFaceRequest.TargetBase64 == "" { if swapFaceRequest.SourceBase64 == "" || swapFaceRequest.TargetBase64 == "" {
return service.MidjourneyErrorWrapper(constant.MjRequestError, "sour_base64_and_target_base64_is_required") return service.MidjourneyErrorWrapper(constant.MjRequestError, "sour_base64_and_target_base64_is_required")
} }
@@ -370,6 +373,8 @@ func RelayMidjourneySubmit(c *gin.Context, relayInfo *relaycommon.RelayInfo) *dt
return service.MidjourneyErrorWrapper(constant.MjRequestError, "bind_request_body_failed") return service.MidjourneyErrorWrapper(constant.MjRequestError, "bind_request_body_failed")
} }
relayInfo.InitChannelMeta(c)
if relayInfo.RelayMode == relayconstant.RelayModeMidjourneyAction { // midjourney plus，需要从customId中获取任务信息 if relayInfo.RelayMode == relayconstant.RelayModeMidjourneyAction { // midjourney plus，需要从customId中获取任务信息
mjErr := service.CoverPlusActionToNormalAction(&midjRequest) mjErr := service.CoverPlusActionToNormalAction(&midjRequest)
if mjErr != nil { if mjErr != nil {