exhibition/exhibition-main
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wp' into dev

Browse Source
This commit is contained in:
workabee 2024-02-19 10:46:28 +08:00
commit 649293d794
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conf/dev/config.yaml
View File

@ -26,10 +26,10 @@ jwt:
key: "3Ei*^!a6^6$w^wgK" key: "3Ei*^!a6^6$w^wgK"
expire: 24 expire: 24
bos: bos:
Ak: "ALTAKxrqOQHnAN525Tb2GX4Bhe" AccessKeyId: "ALTAKxrqOQHnAN525Tb2GX4Bhe"
Sk: "d2ecaa9d75114d3b9f42b99014198306" AccessKeySecret: "d2ecaa9d75114d3b9f42b99014198306"
BucketName: "dci-file-new" BucketName: "dci-file-new"
BosUrl: ".bj.bcebos.com" Endpoint: ".bj.bcebos.com"
BosBaseDir: "fonchain-main" BosBaseDir: "exhibition"
BosHttp: "https://" Host: "https://bj.bcebos.com"
BosDomain: "cdns.fontree.cn" CdnHost: "https://cdns.fontree.cn"

12
conf/prod/config.yaml
View File

@ -26,10 +26,10 @@ jwt:
key: "tP0xXGErz4~" key: "tP0xXGErz4~"
expire: 24 expire: 24
bos: bos:
Ak: "ALTAKxrqOQHnAN525Tb2GX4Bhe" AccessKeyId: "ALTAKxrqOQHnAN525Tb2GX4Bhe"
Sk: "d2ecaa9d75114d3b9f42b99014198306" AccessKeySecret: "d2ecaa9d75114d3b9f42b99014198306"
BucketName: "dci-file-new" BucketName: "dci-file-new"
BosUrl: ".bj.bcebos.com" Endpoint: ".bj.bcebos.com"
BosBaseDir: "fonchain-main" BosBaseDir: "exhibition"
BosHttp: "https://" Host: "https://bj.bcebos.com"
BosDomain: "cdns.fontree.cn" CdnHost: "https://cdns.fontree.cn"

12
conf/test/config.yaml
View File

@ -26,10 +26,10 @@ jwt:
key: "SxjwBuEcHg42t73" key: "SxjwBuEcHg42t73"
expire: 24 expire: 24
bos: bos:
Ak: "ALTAKxrqOQHnAN525Tb2GX4Bhe" AccessKeyId: "ALTAKxrqOQHnAN525Tb2GX4Bhe"
Sk: "d2ecaa9d75114d3b9f42b99014198306" AccessKeySecret: "d2ecaa9d75114d3b9f42b99014198306"
BucketName: "dci-file-new" BucketName: "dci-file-new"
BosUrl: ".bj.bcebos.com" Endpoint: ".bj.bcebos.com"
BosBaseDir: "fonchain-main" BosBaseDir: "exhibition"
BosHttp: "https://" Host: "https://bj.bcebos.com"
BosDomain: "cdns.fontree.cn" CdnHost: "https://cdns.fontree.cn"

16
pkg/service/common/common.go
View File

@ -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) { 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 { if err != nil {
logger.Errorf("PutBos NewBOS err ", err) logger.Errorf("PutBos NewBOS err ", err)
err = errors.New(msg.ErrorUploadBos) 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) filePath = strings.Replace(filePath, "./runtime", "", 1)
var objectName string = fmt.Sprintf("%s/%s%s", config.BosBaseDir, config.Env, filePath) var objectName string = fmt.Sprintf("%s/%s%s", config.Data.Bos.BosBaseDir, config.Data.System.Mode, filePath)
_, err = BOSClient.PutObjectFromBytes(config.BosBucketName, objectName, fileBytes) _, err = BOSClient.PutObjectFromBytes(config.Data.Bos.BucketName, objectName, fileBytes)
if err != nil { if err != nil {
logger.Errorf("PutBos PutObject err %+v", err.Error()) logger.Errorf("PutBos PutObject err %+v", err.Error())
err = errors.New(msg.ErrorUploadBos) err = errors.New(msg.ErrorUploadBos)
return return
} }
//url = fmt.Sprintf("%s%s%s/%s", config.BosHttp, config.BosBucketName, config.BosUrl, objectName) //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 return
} }
@ -258,15 +258,15 @@ func quickBos(file *multipart.FileHeader, mediaType string, mask string, source
return return
} }
} }
var objectName string = fmt.Sprintf("%s/%s/%s", config.BosBaseDir, config.Env, filePath) var objectName string = fmt.Sprintf("%s/%s/%s", config.Data.Bos.BosBaseDir, config.Data.System.Mode, filePath)
BOSClient, _ := objstorage.NewBOS(config.BosAk, config.BosSk, objstorage.BOS_BJ) BOSClient, _ := objstorage.NewBOS(config.Data.Bos.AccessKeyId, config.Data.Bos.AccessKeySecret, objstorage.BOS_BJ)
_, err = BOSClient.PutObjectFromBytes(config.BosBucketName, objectName, fileBytes) _, err = BOSClient.PutObjectFromBytes(config.Data.Bos.BucketName, objectName, fileBytes)
if err != nil { if err != nil {
logger.Errorf("quickBos err", err) logger.Errorf("quickBos err", err)
return return
} }
//url = fmt.Sprintf("%s%s%s/%s", config.BosHttp, config.BosBucketName, config.BosUrl, objectName) //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 return
} }