Merge branch 'feature-multicast-daiyb'

增加日志

conf/conf.ini

@@ -14,12 +14,12 @@ BosBaseDir = "fonchain-main"
 BosHttp = "https://"
 BosDomain = "cdns.fontree.cn"
 [oss]
-AccessKeyId =  "LTAI5tCx628rkZ65oi5F5nxu"
+AccessKeyId =  "${OSS_AK}"
-AccessKeySecret = "WjSLa9tWs8RTdUmhKu3HLXIMogdUbo"
+AccessKeySecret = "${OSS_SK}"
-Endpoint =        "cdn-test.cdn.szjixun.cn"
+Endpoint =        "${OSS_ENDPOINTT}"
-BucketName =       "fontree-test2"
+BucketName =       "${OSS_BUCKETNAME}"
-BaseDir =      "fonchain-main"
+BaseDir =      "fontree-fiee-test"
-CdnHost =      "https://cdn-test.szjixun.cn"
+CdnHost =     "${OSS_CDN}"
 [redis]
 RedisDB = "2"
 RedisAddr = "127.0.0.1:6379"

docs/dev/conf.ini

@@ -15,12 +15,12 @@ BosBaseDir = "fiee"
 BosHttp = "https://"
 BosDomain = "cdns.fontree.cn"
 [oss]
-AccessKeyId =  "LTAI5tLz1fSK53FQAEC9uNSb"
+AccessKeyId =  "OSS_AK"
-AccessKeySecret = "oGB9chrQzQzITXR2IGv37Ji5WxZh4j"
+AccessKeySecret = "OSS_SK"
-Endpoint =        "oss-cn-hangzhou.aliyuncs.com"
+Endpoint =        "OSS_ENDPOINTT"
-BucketName =       "fontree-test"
+BucketName =       "OSS_BUCKETNAME"
-BaseDir =      "fiee"
+BaseDir =      "fontree-fiee-test"
-CdnHost =      "https://cdn-test.szjixun.cn"
+CdnHost =     "OSS_CDN"
 
 [redis]
 RedisDB = "2"

docs/dev/dubbogo.yaml

@@ -4,7 +4,7 @@ dubbo:
       protocol: zookeeper
       timeout: 3s
       #      address: 121.229.45.214:9004
-      address: 172.16.100.93:2181
+      address: 127.0.0.1:2181
 #      address: 127.0.0.1:2181
   #      address: 114.218.158.24:2181
   consumer:

docs/prod/conf.ini

@@ -26,12 +26,12 @@ TelNum = "18021272627"
 Password = "Gy.123456"
 
 [oss]
-AccessKeyId =   "LTAI5tHfjSmWXHqfWgaL7Uo5"
+AccessKeyId =  "OSS_AK"
-AccessKeySecret = "kOPctFZ3DHsbdSSym1fLyDK39hkzPI"
+AccessKeySecret = "OSS_SK"
-Endpoint =        "oss-cn-hangzhou.aliyuncs.com"
+Endpoint =        "OSS_ENDPOINTT"
-BucketName =       "erp-k8s-store"
+BucketName =       "OSS_BUCKETNAME"
-BaseDir =      "fiee"
+BaseDir =      "fontree-fiee"
-CdnHost =      "https://e-cdn.fontree.cn"
+CdnHost =     "OSS_CDN"
 
 [stripe]
 Webhookkey = "whsec_Mol32WD1KcKHUdYsSwap0LR03q2g9qNY"

docs/test/conf.ini

@@ -15,20 +15,12 @@ BosBaseDir = "fiee"
 BosHttp = "https://"
 BosDomain = "cdns.fontree.cn"
 [oss]
-AccessKeyId =  "LTAI5tLz1fSK53FQAEC9uNSb"
+AccessKeyId =  "OSS_AK"
-AccessKeySecret = "oGB9chrQzQzITXR2IGv37Ji5WxZh4j"
+AccessKeySecret = "OSS_SK"
-Endpoint =        "oss-cn-hangzhou.aliyuncs.com"
+Endpoint =        "OSS_ENDPOINTT"
-BucketName =       "fontree-test"
+BucketName =       "OSS_BUCKETNAME"
-BaseDir =      "fiee"
+BaseDir =      "fontree-fiee-test"
-CdnHost =      "https://cdn-test.szjixun.cn"
+CdnHost =     "OSS_CDN"
-
-[oss]
-AccessKeyId="LTAI5tLz1fSK53FQAEC9uNSb"
-AccessKeysecret ="oGB9chrQzQzITXR2IGv37Ji5WxZh4j"
-Endpoint = "oss-cn-hangzhou.aliyuncs.com"
-BucketName = "fontree-test"
-BaseDir  = "fiee"
-CdnHost = "https://cdn-test.szjixun.cn"
 
 [redis]
 RedisDB = "2"

pkg/config/config.go

@@ -4,9 +4,12 @@ import (
 	"fmt"
 	"fonchain-fiee/pkg/common"
 	"github.com/spf13/viper"
+	"go.uber.org/zap"
 	"gopkg.in/ini.v1"
 	"os"
+	"reflect"
 	"strconv"
+	"strings"
 )
 
 var (
@@ -249,5 +252,63 @@ func Viper(iniConf string) (err error) {
 		panic("viper.Unmarshal failed" + err.Error())
 		return
 	}
+	traverseFields(reflect.ValueOf(*ConfigData), "", ConfigData)
+	zap.L().Info("ConfigData", zap.Any("ConfigData", ConfigData))
+	fmt.Printf("ConfigData--%+v", ConfigData)
 	return
 }
+func traverseFields(value reflect.Value, prefix string, configPtr interface{}) {
+	valueType := value.Type()
+	prefixEnv := "${"
+	suffixEnv := "}"
+	// 遍历结构体的字段
+	for i := 0; i < valueType.NumField(); i++ {
+		field := valueType.Field(i)
+		fieldValue := value.Field(i)
+		// 拼接字段名（带有前缀）
+		fieldName := prefix + field.Name
+		// 判断字段的类型
+		if fieldValue.Kind() == reflect.Struct {
+			// 递归遍历嵌套结构体字段
+			traverseFields(fieldValue, fieldName+".", configPtr)
+		} else {
+			// 获取字段的值
+			fieldValueStr := fmt.Sprintf("%v", fieldValue.Interface())
+			// 判断是不是需要通过环境变量获取
+			if len(fieldValueStr) > 3 && strings.HasPrefix(fieldValueStr, prefixEnv) && strings.HasSuffix(fieldValueStr, suffixEnv) {
+				end := len(fieldValueStr) - len(suffixEnv)
+				var hasDefault bool
+				if strings.Index(fieldValueStr, "|") > 0 {
+					hasDefault = true
+					end = strings.Index(fieldValueStr, "|")
+				}
+				envStr := fieldValueStr[len(prefixEnv):end]
+				getValue := os.Getenv(envStr)
+				if getValue == "" && hasDefault {
+					getValue = fieldValueStr[end+1 : len(fieldValueStr)-len(suffixEnv)]
+				}
+				setSubFieldValue(configPtr, fieldName, getValue)
+			}
+		}
+	}
+}
+
+func setSubFieldValue(configPtr interface{}, fieldPath string, newValue interface{}) {
+	value := reflect.ValueOf(configPtr).Elem()
+	fields := strings.Split(fieldPath, ".")
+	for _, field := range fields {
+		value = value.FieldByName(field)
+		if !value.IsValid() {
+			return // 字段不存在，直接返回
+		}
+		if value.Kind() == reflect.Ptr {
+			value = value.Elem() // 解引用指针类型的字段
+		}
+	}
+	// 检查字段是否可设置
+	if value.CanSet() {
+		// 根据字段类型，将新值转换为对应类型并设置字段的值
+		newValue := reflect.ValueOf(newValue).Convert(value.Type())
+		value.Set(newValue)
+	}
+}

pkg/logic/upload.go

@@ -129,7 +129,7 @@ func MakeThumbnail(imagePath, savePath string) error {
 }
 
 func (u *Upload) PutBos(filePath string, mediaType string, needRemove bool) (url string, err error) {
-	BOSClient, err := objstorage.NewOSS(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint)
+	BOSClient, err := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(config.ConfigData.Oss.Endpoint))
 	if err != nil {
 		logger.Errorf("PutBos NewOOS err ", err)
 		err = errors.New(e.GetMsg(e.ErrorUploadBos))
@@ -148,14 +148,14 @@ func (u *Upload) PutBos(filePath string, mediaType string, needRemove bool) (url
 	}
 	filePath = strings.Replace(filePath, "./runtime", "", 1)
 	var objectName string = fmt.Sprintf("%s/%s%s", config.ConfigData.Oss.BaseDir, config.Env, filePath)
-	_, err = BOSClient.PutObjectFromBytes(config.ConfigData.Oss.BucketName, objectName, fileBytes)
+	_, err = BOSClient.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), objectName, fileBytes)
 	if err != nil {
 		logger.Errorf("PutBos PutObject err %+v", err.Error())
 		err = errors.New(e.GetMsg(e.ErrorUploadBos))
 		return
 	}
 	//url = fmt.Sprintf("%s%s%s/%s", config.BosHttp, config.BosBucketName, config.BosUrl, objectName)
-	url = fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, objectName)
+	url = fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), objectName)
 	return
 }
 

pkg/service/cast/work.go

@@ -11,9 +11,10 @@ import (
 	"fonchain-fiee/pkg/e"
 	modelCast "fonchain-fiee/pkg/model/cast"
 	"fonchain-fiee/pkg/service"
+	"strconv"
+
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
-	"strconv"
 )
 
 func UpdateWorkImage(ctx *gin.Context) {
@@ -50,6 +51,7 @@ func UpdateWorkImage(ctx *gin.Context) {
 		return
 	}
 	newCtx := NewCtxWithUserInfo(ctx)
+	req.Source = 1
 	resp, err := service.CastProvider.UpdateWorkImage(newCtx, req)
 	if err != nil {
 		service.Error(ctx, err)
@@ -93,6 +95,7 @@ func UpdateWorkVideo(ctx *gin.Context) {
 	req.ArtistPhone = infoResp.TelNum
 	req.ArtistPhoneAreaCode = infoResp.TelAreaCode
 	newCtx := NewCtxWithUserInfo(ctx)
+	req.Source = 1
 	resp, err := service.CastProvider.UpdateWorkVideo(newCtx, req)
 	if err != nil {
 		service.Error(ctx, err)
@@ -235,7 +238,7 @@ func RePublish(ctx *gin.Context) {
 	return
 }
 
-//修改余量我还需要调用吗
+// 修改余量我还需要调用吗
 func UserBundleBalanceCost() {
 	service.BundleProvider.AddBundleBalance(context.Background(), &bundle.AddBundleBalanceReq{})
 }

pkg/service/upload/upload.go

@@ -217,14 +217,14 @@ func quickBos(file *multipart.FileHeader, mediaType string, mask string, source
 		}
 	}
 	var objectName string = fmt.Sprintf("%s/%s/%s", config.ConfigData.Oss.BaseDir, config.Env, filePath)
-	BOSClient, _ := objstorage.NewOSS(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint)
+	BOSClient, _ := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(config.ConfigData.Oss.Endpoint))
-	_, err = BOSClient.PutObjectFromBytes(config.ConfigData.Oss.BucketName, objectName, fileBytes)
+	_, err = BOSClient.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), objectName, fileBytes)
 	if err != nil {
 		//logger.Errorf("quickOss err", err)
 		return
 	}
 	//url = fmt.Sprintf("%s%s%s/%s", config.BosHttp, config.BosBucketName, config.BosUrl, objectName)
-	url = fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, objectName)
+	url = fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), objectName)
 	return
 }
 
@@ -266,8 +266,9 @@ func BaiduCheckImage(imageByte []byte) (err error) {
 	return nil
 }
 func PutBos(filePath string, mediaType string, needRemove bool) (url string, err error) {
-	BOSClient, err := objstorage.NewOSS(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint)
+	BOSClient, err := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(config.ConfigData.Oss.Endpoint))
 	if err != nil {
+		fmt.Println("=== PutBos NewOss err ", err)
 		//logger.Errorf("PutBos NewOss err ", err)
 		err = errors.New(e.GetMsg(e.ErrorUploadBos))
 		return
@@ -290,14 +291,15 @@ func PutBos(filePath string, mediaType string, needRemove bool) (url string, err
 	}
 	filePath = strings.Replace(filePath, model.MediaPath, "", 1)
 	var objectName string = fmt.Sprintf("%s/%s%s", config.ConfigData.Oss.BaseDir, config.Env, filePath)
-	_, err = BOSClient.PutObjectFromBytes(config.ConfigData.Oss.BucketName, objectName, fileBytes)
+	_, err = BOSClient.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), objectName, fileBytes)
 	if err != nil {
+		fmt.Println("=== PutBos PutObject err ", err)
 		//logger.Errorf("PutBos PutObject err %+v", err.Error())
 		err = errors.New(e.GetMsg(e.ErrorUploadBos))
 		return
 	}
 	//url = fmt.Sprintf("%s%s%s/%s", config.BosHttp, config.BosBucketName, config.BosUrl, objectName)
-	url = fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, objectName)
+	url = fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), objectName)
 	return
 }
 func GetSnapshot(videoPath, snapshotPath string, frameNum int) (snapshotName string, err error) {
@@ -331,14 +333,14 @@ func GetSnapshot(videoPath, snapshotPath string, frameNum int) (snapshotName str
 }
 
 func UploadWithBuffer(fileBuffer *bytes.Buffer, cloudStoreSubPath string) (url string, err error) {
-	Client, err := objstorage.NewOSS(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint)
+	Client, err := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(config.ConfigData.Oss.Endpoint))
 	if err != nil {
 		err = errors.New(fmt.Sprintf("云存储初始化失败：%s", err.Error()))
 		return
 	}
 	cloudStoreSubPath = getEnvDir(cloudStoreSubPath)
-	_, err = Client.PutObjectFromBytes(config.ConfigData.Oss.BucketName, cloudStoreSubPath, fileBuffer.Bytes())
+	_, err = Client.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), cloudStoreSubPath, fileBuffer.Bytes())
-	url = config.ConfigData.Oss.CdnHost + "/" + cloudStoreSubPath
+	url = os.Getenv(config.ConfigData.Oss.CdnHost) + "/" + cloudStoreSubPath
 	return
 }
 func getEnvDir(cloudStoreSubPath string) (ep string) {