From b89fd9638b9b0e5cdf47bb3e1adab58097e80803 Mon Sep 17 00:00:00 2001 From: wangxinyu Date: Mon, 23 Dec 2024 17:18:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=9B=BE=E7=89=87=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/errcode/errcode.go | 2 -- app/mix/service/logic/image.go | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/api/errcode/errcode.go b/api/errcode/errcode.go index 14f55c0d..cf872162 100644 --- a/api/errcode/errcode.go +++ b/api/errcode/errcode.go @@ -636,6 +636,4 @@ const ( ErrCodeRavenIQTestVisitSrvFail ErrCode = -102001 // 瑞文智商测试访问表服务错误 ErrCodeRavenIQTestVisitNotExist ErrCode = -102002 // 瑞文智商测试访问表不存在 - // - ErrCodeVip ErrCode = -102003 ) diff --git a/app/mix/service/logic/image.go b/app/mix/service/logic/image.go index 3797270b..c6f15f36 100644 --- a/app/mix/service/logic/image.go +++ b/app/mix/service/logic/image.go @@ -1,7 +1,6 @@ package logic import ( - "math/rand" "service/api/consts" "service/app/mix/dao" "service/dbstruct" @@ -35,10 +34,5 @@ func (v *Image) TransToCImage(image *dbstruct.Image, isAMember int64) *dbstruct. } func (v *Image) getFileServerDomain() string { - return "https://filecdntx01.tiefen.fun/" - if rand.Intn(100) < 50 { - return "https://filecdntx01.tiefen.fun/" - } - return "https://filecdn01.tiefen.fun/" - //return defaultMediaFiller.fileServerDomainName + return "https://levianderwinv01.tiefen.space/" } From ec7b7adf61fb99ad1918de319c6445d8c9728e91 Mon Sep 17 00:00:00 2001 From: wangxinyu Date: Tue, 24 Dec 2024 11:44:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BC=9A=E5=91=98=E7=9C=8B=E5=8E=9F?= =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E5=9B=BE=E7=89=87=E6=A0=BC=E5=BC=8F=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/consts/consts.go | 10 ++++++++++ app/mix/service/logic/image.go | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/api/consts/consts.go b/api/consts/consts.go index e6425512..f16e3953 100644 --- a/api/consts/consts.go +++ b/api/consts/consts.go @@ -104,6 +104,16 @@ const ( RedisMomentPrefix = "moment:" //moment服务前缀 ) +const ( + ImageTiff = "image_tiff" + ImageWebp = "image/webp" + ImageHeic = "image/heic" + ImageJpeg = "image/jpeg" + ImageGif = "image/gif" + ImagePng = "image/png" + VideoMp4 = "video/mp4" +) + //const PackageRootPath = "C:/Users/PC/Desktop/service" const PackageRootPath = "/app/wishpal-ironfan" diff --git a/app/mix/service/logic/image.go b/app/mix/service/logic/image.go index c6f15f36..7daff27e 100644 --- a/app/mix/service/logic/image.go +++ b/app/mix/service/logic/image.go @@ -20,7 +20,7 @@ func (v *Image) TransToCImage(image *dbstruct.Image, isAMember int64) *dbstruct. imgSrcId := image.SelectMinSizeOssId() // 会员可以查看原图 - if isAMember == consts.PermanentMember { + if isAMember == consts.PermanentMember && (image.Fmt == consts.ImageWebp || image.Fmt == consts.ImageJpeg || image.Fmt == consts.ImagePng) { imgSrcId = image.SrcId }