Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7bc0bf21
authored
Feb 22, 2026
by
CaIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(mjp): update billing log for failed tasks
parent
63edb57c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
6 deletions
+16
-6
controller/midjourney.go
+12
-2
relay/mjproxy_handler.go
+2
-2
service/midjourney.go
+2
-2
No files found.
controller/midjourney.go
View file @
7bc0bf21
...
@@ -181,8 +181,18 @@ func UpdateMidjourneyTaskBulk() {
...
@@ -181,8 +181,18 @@ func UpdateMidjourneyTaskBulk() {
if
err
!=
nil
{
if
err
!=
nil
{
logger
.
LogError
(
ctx
,
"fail to increase user quota: "
+
err
.
Error
())
logger
.
LogError
(
ctx
,
"fail to increase user quota: "
+
err
.
Error
())
}
}
logContent
:=
fmt
.
Sprintf
(
"构图失败 %s,补偿 %s"
,
task
.
MjId
,
logger
.
LogQuota
(
task
.
Quota
))
model
.
RecordTaskBillingLog
(
model
.
RecordTaskBillingLogParams
{
model
.
RecordLog
(
task
.
UserId
,
model
.
LogTypeSystem
,
logContent
)
UserId
:
task
.
UserId
,
LogType
:
model
.
LogTypeRefund
,
Content
:
""
,
ChannelId
:
task
.
ChannelId
,
ModelName
:
service
.
CovertMjpActionToModelName
(
task
.
Action
),
Quota
:
task
.
Quota
,
Other
:
map
[
string
]
interface
{}{
"task_id"
:
task
.
MjId
,
"reason"
:
"构图失败"
,
},
})
}
}
}
}
}
}
...
...
relay/mjproxy_handler.go
View file @
7bc0bf21
...
@@ -184,7 +184,7 @@ func RelaySwapFace(c *gin.Context, info *relaycommon.RelayInfo) *dto.MidjourneyR
...
@@ -184,7 +184,7 @@ func RelaySwapFace(c *gin.Context, info *relaycommon.RelayInfo) *dto.MidjourneyR
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"
)
}
}
modelName
:=
service
.
CoverActionToModelName
(
constant
.
MjActionSwapFace
)
modelName
:=
service
.
Cover
tMjp
ActionToModelName
(
constant
.
MjActionSwapFace
)
priceData
:=
helper
.
ModelPriceHelperPerCall
(
c
,
info
)
priceData
:=
helper
.
ModelPriceHelperPerCall
(
c
,
info
)
...
@@ -485,7 +485,7 @@ func RelayMidjourneySubmit(c *gin.Context, relayInfo *relaycommon.RelayInfo) *dt
...
@@ -485,7 +485,7 @@ func RelayMidjourneySubmit(c *gin.Context, relayInfo *relaycommon.RelayInfo) *dt
fullRequestURL
:=
fmt
.
Sprintf
(
"%s%s"
,
baseURL
,
requestURL
)
fullRequestURL
:=
fmt
.
Sprintf
(
"%s%s"
,
baseURL
,
requestURL
)
modelName
:=
service
.
CoverActionToModelName
(
midjRequest
.
Action
)
modelName
:=
service
.
Cover
tMjp
ActionToModelName
(
midjRequest
.
Action
)
priceData
:=
helper
.
ModelPriceHelperPerCall
(
c
,
relayInfo
)
priceData
:=
helper
.
ModelPriceHelperPerCall
(
c
,
relayInfo
)
...
...
service/midjourney.go
View file @
7bc0bf21
...
@@ -19,7 +19,7 @@ import (
...
@@ -19,7 +19,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin"
)
)
func
CoverActionToModelName
(
mjAction
string
)
string
{
func
Cover
tMjp
ActionToModelName
(
mjAction
string
)
string
{
modelName
:=
"mj_"
+
strings
.
ToLower
(
mjAction
)
modelName
:=
"mj_"
+
strings
.
ToLower
(
mjAction
)
if
mjAction
==
constant
.
MjActionSwapFace
{
if
mjAction
==
constant
.
MjActionSwapFace
{
modelName
=
"swap_face"
modelName
=
"swap_face"
...
@@ -70,7 +70,7 @@ func GetMjRequestModel(relayMode int, midjRequest *dto.MidjourneyRequest) (strin
...
@@ -70,7 +70,7 @@ func GetMjRequestModel(relayMode int, midjRequest *dto.MidjourneyRequest) (strin
return
""
,
MidjourneyErrorWrapper
(
constant
.
MjRequestError
,
"unknown_relay_action"
),
false
return
""
,
MidjourneyErrorWrapper
(
constant
.
MjRequestError
,
"unknown_relay_action"
),
false
}
}
}
}
modelName
:=
CoverActionToModelName
(
action
)
modelName
:=
Cover
tMjp
ActionToModelName
(
action
)
return
modelName
,
nil
,
true
return
modelName
,
nil
,
true
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment