Merge branch 'wp'
This commit is contained in:
commit
4b8ce2b3f8
@ -212,9 +212,9 @@ 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.Data.Bos.AccessKeyId, config.Data.Bos.AccessKeySecret, objstorage.BOS_BJ)
|
||||
BOSClient, err := objstorage.NewOSS(config.Data.Bos.AccessKeyId, config.Data.Bos.AccessKeySecret, objstorage.BOS_BJ)
|
||||
if err != nil {
|
||||
logger.Errorf("PutBos NewBOS err ", err)
|
||||
logger.Errorf("PutBos NewOSS err ", err)
|
||||
err = errors.New(msg.ErrorUploadBos)
|
||||
return
|
||||
}
|
||||
@ -258,7 +258,7 @@ func quickBos(file *multipart.FileHeader, mediaType string, mask string, source
|
||||
}
|
||||
}
|
||||
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)
|
||||
BOSClient, _ := objstorage.NewOSS(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)
|
||||
|
Loading…
Reference in New Issue
Block a user