diff --git a/docs/dev/conf.ini b/docs/dev/conf.ini index d8119f3..fac4364 100644 --- a/docs/dev/conf.ini +++ b/docs/dev/conf.ini @@ -15,12 +15,12 @@ BosBaseDir = "fiee" BosHttp = "https://" BosDomain = "cdns.fontree.cn" [oss] -AccessKeyId = "${OSS_AK}" -AccessKeySecret = "${OSS_SK}" -Endpoint = "${OSS_ENDPOINTT}" -BucketName = "${OSS_BUCKETNAME}" +AccessKeyId = "OSS_AK" +AccessKeySecret = "OSS_SK" +Endpoint = "OSS_ENDPOINTT" +BucketName = "OSS_BUCKETNAME" BaseDir = "fontree-fiee-test" -CdnHost = "${OSS_CDN}" +CdnHost = "OSS_CDN" [redis] RedisDB = "2" diff --git a/docs/prod/conf.ini b/docs/prod/conf.ini index 00db519..7d504da 100644 --- a/docs/prod/conf.ini +++ b/docs/prod/conf.ini @@ -26,12 +26,12 @@ TelNum = "18021272627" Password = "Gy.123456" [oss] -AccessKeyId = "${OSS_AK}" -AccessKeySecret = "${OSS_SK}" -Endpoint = "${OSS_ENDPOINTT}" -BucketName = "${OSS_BUCKETNAME}" +AccessKeyId = "OSS_AK" +AccessKeySecret = "OSS_SK" +Endpoint = "OSS_ENDPOINTT" +BucketName = "OSS_BUCKETNAME" BaseDir = "fontree-fiee" -CdnHost = "${OSS_CDN}" +CdnHost = "OSS_CDN" [stripe] Webhookkey = "whsec_Mol32WD1KcKHUdYsSwap0LR03q2g9qNY" diff --git a/docs/test/conf.ini b/docs/test/conf.ini index 2d396d7..b9b0e26 100644 --- a/docs/test/conf.ini +++ b/docs/test/conf.ini @@ -15,12 +15,12 @@ BosBaseDir = "fiee" BosHttp = "https://" BosDomain = "cdns.fontree.cn" [oss] -AccessKeyId = "${OSS_AK}" -AccessKeySecret = "${OSS_SK}" -Endpoint = "${OSS_ENDPOINTT}" -BucketName = "${OSS_BUCKETNAME}" +AccessKeyId = "OSS_AK" +AccessKeySecret = "OSS_SK" +Endpoint = "OSS_ENDPOINTT" +BucketName = "OSS_BUCKETNAME" BaseDir = "fontree-fiee-test" -CdnHost = "${OSS_CDN}" +CdnHost = "OSS_CDN" [redis] RedisDB = "2" diff --git a/pkg/logic/upload.go b/pkg/logic/upload.go index d2cd227..4f462a9 100644 --- a/pkg/logic/upload.go +++ b/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 } diff --git a/pkg/service/upload/upload.go b/pkg/service/upload/upload.go index 54282fc..37597c1 100644 --- a/pkg/service/upload/upload.go +++ b/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) - _, err = BOSClient.PutObjectFromBytes(config.ConfigData.Oss.BucketName, objectName, fileBytes) + BOSClient, _ := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(config.ConfigData.Oss.Endpoint)) + _, 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,7 +266,7 @@ 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 { //logger.Errorf("PutBos NewOss err ", err) err = errors.New(e.GetMsg(e.ErrorUploadBos)) @@ -290,14 +290,14 @@ 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 { //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 +331,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()) - url = config.ConfigData.Oss.CdnHost + "/" + cloudStoreSubPath + _, err = Client.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), cloudStoreSubPath, fileBuffer.Bytes()) + url = os.Getenv(config.ConfigData.Oss.CdnHost) + "/" + cloudStoreSubPath return } func getEnvDir(cloudStoreSubPath string) (ep string) {