Merge remote-tracking branch 'origin/feature-pay_picture-wxy-20241216' into test

api/consts/consts.go

@@ -135,6 +135,16 @@ const (
 	//StreamerAvatar  = 2 // 主播头像审核
 )
 
+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"

api/errcode/errcode.go

@@ -710,6 +710,4 @@ const (
 	ErrCodeRavenIQTestVisitSrvFail  ErrCode = -102001 // 瑞文智商测试访问表服务错误
 	ErrCodeRavenIQTestVisitNotExist ErrCode = -102002 // 瑞文智商测试访问表不存在
 
-	//
-	ErrCodeVip ErrCode = -102003
 )

app/mix/service/logic/image.go

@@ -1,7 +1,6 @@
 package logic
 
 import (
-	"math/rand"
 	"service/api/consts"
 	"service/app/mix/dao"
 	"service/dbstruct"
@@ -21,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
 	}
 
@@ -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/"
 }