ziwen 1 year ago
parent
commit
dc338ab8b8
2 changed files with 28 additions and 9 deletions
  1. 16 6
      controllers/data_manage/chart_info.go
  2. 12 3
      services/report.go

+ 16 - 6
controllers/data_manage/chart_info.go

@@ -1722,13 +1722,23 @@ func (this *ChartInfoController) ChartInfoBase64Upload() {
 
 	//上传到阿里云 和 minio
 	resourceUrl := ``
-	err = services.UploadFileToAliyun("", outFileName, saveToOssPath)
-	if err != nil {
-		br.Msg = "文件上传失败"
-		br.ErrMsg = "文件上传失败,Err:" + err.Error()
-		return
+	if utils.ObjectStorageClient == "minio" {
+		err = services.UploadFileToMinIo("", outFileName, saveToOssPath)
+		if err != nil {
+			br.Msg = "文件上传失败"
+			br.ErrMsg = "文件上传失败,Err:" + err.Error()
+			return
+		}
+		resourceUrl = utils.MinIoImghost + saveToOssPath
+	} else {
+		err = services.UploadFileToAliyun("", outFileName, saveToOssPath)
+		if err != nil {
+			br.Msg = "文件上传失败"
+			br.ErrMsg = "文件上传失败,Err:" + err.Error()
+			return
+		}
+		resourceUrl = utils.Imghost + saveToOssPath
 	}
-	resourceUrl = utils.Imghost + saveToOssPath
 
 	resp.ResourceUrl = resourceUrl
 	resp.Source = "convert"

+ 12 - 3
services/report.go

@@ -515,9 +515,18 @@ func PcCreateAndUploadSunCode(scene, page string) (imgUrl string, err error) {
 	}()
 	// 上传OSS
 	fileDir := "yb/suncode/"
-	imgUrl, err = UploadAliyunToDir(fileName, fpath, "", fileDir)
-	if err != nil {
-		return
+
+	//上传到阿里云 和 minio
+	if utils.ObjectStorageClient == "minio" {
+		imgUrl, err = UploadMinIoToDir(fileName, fpath, "", fileDir)
+		if err != nil {
+			return
+		}
+	} else {
+		imgUrl, err = UploadAliyunToDir(fileName, fpath, "", fileDir)
+		if err != nil {
+			return
+		}
 	}
 
 	if err != nil {