This commit is contained in:
laodaming 2023-10-20 14:36:16 +08:00
parent 396ef61206
commit 95fc072b0b
2 changed files with 13 additions and 11 deletions

View File

@ -13,8 +13,13 @@ func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, requestId,
if w.debug == nil { if w.debug == nil {
return return
} }
combineTakesTime := "cache" combineTakesTime := ""
uploadCombineImageTakesTime := "cache" uploadCombineImageTakesTime := ""
//开了缓存
if w.debug.IsCache != 0 {
combineTakesTime = "cache"
uploadCombineImageTakesTime = "cache"
}
if debugData != nil && debugData.DiffTimeLogoCombine > 0 { if debugData != nil && debugData.DiffTimeLogoCombine > 0 {
combineTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeLogoCombine) combineTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeLogoCombine)
} }

View File

@ -140,8 +140,6 @@ type (
LogoCombineRes struct { LogoCombineRes struct {
ResourceId string `json:"resource_id"` ResourceId string `json:"resource_id"`
ResourceUrl *string `json:"resource_url"` ResourceUrl *string `json:"resource_url"`
ResourceCache int64 `json:"resource_cache"`
Metadata *string `json:"metadata"` Metadata *string `json:"metadata"`
DebugData *auth.DebugData `json:"debug_data"` DebugData *auth.DebugData `json:"debug_data"`
} }
@ -180,7 +178,6 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
return &LogoCombineRes{ return &LogoCombineRes{
ResourceId: resourceId, ResourceId: resourceId,
ResourceUrl: resourceInfo.ResourceUrl, ResourceUrl: resourceInfo.ResourceUrl,
ResourceCache: 1,
}, nil }, nil
} }
} else { } else {