|
|
|
@ -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
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
