diff --git a/conf/dev/config.yaml b/conf/dev/config.yaml index 4b911f9..3d9ffd4 100644 --- a/conf/dev/config.yaml +++ b/conf/dev/config.yaml @@ -26,10 +26,10 @@ jwt: key: "3Ei*^!a6^6$w^wgK" expire: 24 bos: - Ak: "ALTAKxrqOQHnAN525Tb2GX4Bhe" - Sk: "d2ecaa9d75114d3b9f42b99014198306" + AccessKeyId: "ALTAKxrqOQHnAN525Tb2GX4Bhe" + AccessKeySecret: "d2ecaa9d75114d3b9f42b99014198306" BucketName: "dci-file-new" - BosUrl: ".bj.bcebos.com" - BosBaseDir: "fonchain-main" - BosHttp: "https://" - BosDomain: "cdns.fontree.cn" \ No newline at end of file + Endpoint: ".bj.bcebos.com" + BosBaseDir: "exhibition" + Host: "https://bj.bcebos.com" + CdnHost: "https://cdns.fontree.cn" \ No newline at end of file diff --git a/conf/prod/config.yaml b/conf/prod/config.yaml index 36f257e..b16f94a 100644 --- a/conf/prod/config.yaml +++ b/conf/prod/config.yaml @@ -26,10 +26,10 @@ jwt: key: "tP0xXGErz4~" expire: 24 bos: - Ak: "ALTAKxrqOQHnAN525Tb2GX4Bhe" - Sk: "d2ecaa9d75114d3b9f42b99014198306" + AccessKeyId: "ALTAKxrqOQHnAN525Tb2GX4Bhe" + AccessKeySecret: "d2ecaa9d75114d3b9f42b99014198306" BucketName: "dci-file-new" - BosUrl: ".bj.bcebos.com" - BosBaseDir: "fonchain-main" - BosHttp: "https://" - BosDomain: "cdns.fontree.cn" \ No newline at end of file + Endpoint: ".bj.bcebos.com" + BosBaseDir: "exhibition" + Host: "https://bj.bcebos.com" + CdnHost: "https://cdns.fontree.cn" \ No newline at end of file diff --git a/conf/test/config.yaml b/conf/test/config.yaml index 0e3e09c..d322c86 100644 --- a/conf/test/config.yaml +++ b/conf/test/config.yaml @@ -26,10 +26,10 @@ jwt: key: "SxjwBuEcHg42t73" expire: 24 bos: - Ak: "ALTAKxrqOQHnAN525Tb2GX4Bhe" - Sk: "d2ecaa9d75114d3b9f42b99014198306" + AccessKeyId: "ALTAKxrqOQHnAN525Tb2GX4Bhe" + AccessKeySecret: "d2ecaa9d75114d3b9f42b99014198306" BucketName: "dci-file-new" - BosUrl: ".bj.bcebos.com" - BosBaseDir: "fonchain-main" - BosHttp: "https://" - BosDomain: "cdns.fontree.cn" \ No newline at end of file + Endpoint: ".bj.bcebos.com" + BosBaseDir: "exhibition" + Host: "https://bj.bcebos.com" + CdnHost: "https://cdns.fontree.cn" \ No newline at end of file diff --git a/pkg/service/common/common.go b/pkg/service/common/common.go index 10ed065..6f2d87e 100644 --- a/pkg/service/common/common.go +++ b/pkg/service/common/common.go @@ -212,7 +212,7 @@ func GetSnapshot(videoPath, snapshotPath string, frameNum int) (snapshotName str } func PutBos(filePath string, mediaType string, needRemove bool) (url string, err error) { - BOSClient, err := objstorage.NewBOS(config.BosAk, config.BosSk, objstorage.BOS_BJ) + BOSClient, err := objstorage.NewBOS(config.Data.Bos.AccessKeyId, config.Data.Bos.AccessKeySecret, objstorage.BOS_BJ) if err != nil { logger.Errorf("PutBos NewBOS err ", err) err = errors.New(msg.ErrorUploadBos) @@ -235,15 +235,15 @@ func PutBos(filePath string, mediaType string, needRemove bool) (url string, err } } filePath = strings.Replace(filePath, "./runtime", "", 1) - var objectName string = fmt.Sprintf("%s/%s%s", config.BosBaseDir, config.Env, filePath) - _, err = BOSClient.PutObjectFromBytes(config.BosBucketName, objectName, fileBytes) + var objectName string = fmt.Sprintf("%s/%s%s", config.Data.Bos.BosBaseDir, config.Data.System.Mode, filePath) + _, err = BOSClient.PutObjectFromBytes(config.Data.Bos.BucketName, objectName, fileBytes) if err != nil { logger.Errorf("PutBos PutObject err %+v", err.Error()) err = errors.New(msg.ErrorUploadBos) return } //url = fmt.Sprintf("%s%s%s/%s", config.BosHttp, config.BosBucketName, config.BosUrl, objectName) - url = fmt.Sprintf("%s%s/%s", config.BosHttp, config.BosDomain, objectName) + url = fmt.Sprintf("%s/%s", config.Data.Bos.CdnHost, objectName) return } @@ -258,15 +258,15 @@ func quickBos(file *multipart.FileHeader, mediaType string, mask string, source return } } - var objectName string = fmt.Sprintf("%s/%s/%s", config.BosBaseDir, config.Env, filePath) - BOSClient, _ := objstorage.NewBOS(config.BosAk, config.BosSk, objstorage.BOS_BJ) - _, err = BOSClient.PutObjectFromBytes(config.BosBucketName, objectName, fileBytes) + var objectName string = fmt.Sprintf("%s/%s/%s", config.Data.Bos.BosBaseDir, config.Data.System.Mode, filePath) + BOSClient, _ := objstorage.NewBOS(config.Data.Bos.AccessKeyId, config.Data.Bos.AccessKeySecret, objstorage.BOS_BJ) + _, err = BOSClient.PutObjectFromBytes(config.Data.Bos.BucketName, objectName, fileBytes) if err != nil { logger.Errorf("quickBos err", err) return } //url = fmt.Sprintf("%s%s%s/%s", config.BosHttp, config.BosBucketName, config.BosUrl, objectName) - url = fmt.Sprintf("%s%s/%s", config.BosHttp, config.BosDomain, objectName) + url = fmt.Sprintf("%s/%s", config.Data.Bos.CdnHost, objectName) return }