pkg/service/upload/upload.go

@@ -293,7 +293,8 @@ 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)
+	var objectName string = fmt.Sprintf("%s/%s%s", os.Getenv(config.ConfigData.Oss.BaseDir), config.Env, filePath)
+	//var objectName string = fmt.Sprintf("%s/%s%s", config.ConfigData.Oss.BaseDir, config.Env, filePath)
 	_, err = BOSClient.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), objectName, fileBytes)
 	//_, err = BOSClient.PutObjectFromBytes(config.ConfigData.Oss.BucketName, objectName, fileBytes)
 	if err != nil {
@@ -353,8 +354,8 @@ func getEnvDir(cloudStoreSubPath string) (ep string) {
 	return ep
 }
 func PutBosWithName(filePath string, needRemove bool, ossPath string) (url string, err error) {
-	//BOSClient, err := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(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))
-	BOSClient, err := objstorage.NewOSS(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint)
+	//BOSClient, err := objstorage.NewOSS(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint)
 	if err != nil {
 		//logger.Errorf("PutBosWithName err1 ", err)
 		err = errors.New(e.GetMsg(e.ErrorUploadBos))
@@ -364,8 +365,8 @@ func PutBosWithName(filePath string, needRemove bool, ossPath string) (url strin
 		ossPath = filePath[1:]
 	}
 	var objectName string = fmt.Sprintf("%s/%s%s", config.ConfigData.Oss.BaseDir, config.Env, ossPath)
-	//_, err = BOSClient.PutObject(os.Getenv(config.ConfigData.Oss.BucketName), objectName, filePath)
+	_, err = BOSClient.PutObject(os.Getenv(config.ConfigData.Oss.BucketName), objectName, filePath)
-	_, err = BOSClient.PutObject(config.ConfigData.Oss.BucketName, objectName, filePath)
+	//_, err = BOSClient.PutObject(config.ConfigData.Oss.BucketName, objectName, filePath)
 	if err != nil {
 		//logger.Errorf("PutBosWithName err2 ", err)
 		err = errors.New(e.GetMsg(e.ErrorUploadBos))
@@ -375,7 +376,7 @@ func PutBosWithName(filePath string, needRemove bool, ossPath string) (url strin
 	if needRemove {
 		_ = os.Remove(filePath)
 	}
-	//url = fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), objectName)
+	url = fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), objectName)
-	url = fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, objectName)
+	//url = fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, objectName)
 	return
 }