From 94e15c1c19101f41c57220f334d64a09cd6daa48 Mon Sep 17 00:00:00 2001 From: Hiven Date: Fri, 11 Aug 2023 15:28:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/resource/etc/resource.yaml | 4 ++-- server/resource/internal/logic/logocombinelogic.go | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/server/resource/etc/resource.yaml b/server/resource/etc/resource.yaml index 8e70bf17..cc596ed4 100644 --- a/server/resource/etc/resource.yaml +++ b/server/resource/etc/resource.yaml @@ -16,5 +16,5 @@ AWS: Token: BLMService: LogoCombine: - #Url: "http://192.168.1.7:45678/LogoCombine" - Url: "http://18.119.109.254:8999/LogoCombine" \ No newline at end of file + Url: "http://192.168.1.7:8999/LogoCombine" + #Url: "http://18.119.109.254:8999/LogoCombine" \ No newline at end of file diff --git a/server/resource/internal/logic/logocombinelogic.go b/server/resource/internal/logic/logocombinelogic.go index 71fca87d..b392a138 100644 --- a/server/resource/internal/logic/logocombinelogic.go +++ b/server/resource/internal/logic/logocombinelogic.go @@ -2,6 +2,7 @@ package logic import ( "encoding/json" + "errors" "fusenapi/model/gmodel" "fusenapi/utils/auth" "fusenapi/utils/basic" @@ -17,6 +18,7 @@ import ( "fusenapi/server/resource/internal/types" "github.com/zeromicro/go-zero/core/logx" + "gorm.io/gorm" ) type LogoCombineLogic struct { @@ -75,8 +77,10 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth }) } else { if err != nil { - logx.Error(err) - return resp.SetStatus(basic.CodeDbSqlErr, "LogoCombine error") + if !errors.Is(err, gorm.ErrRecordNotFound) { + logx.Error(err) + return resp.SetStatus(basic.CodeDbSqlErr, "LogoCombine error") + } } } @@ -134,8 +138,9 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth logx.Error(err) return resp.SetStatus(basic.CodeFileLogoCombineErr, "service read fail") } + ress := string(b) - if string(b) == "Internal Server Error" { + if ress == "Internal Server Error" { return resp.SetStatus(basic.CodeFileLogoCombineErr, "service read fail") }