Merge branch 'ETA_1.2.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"

controllers/resource.go

@@ -776,16 +776,32 @@ func (this *ResourceController) OssSTSToken() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	resp, err := services.GetOssSTSToken()
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取STSToken失败, Err: " + err.Error()
-		return
+
+	source, _ := this.GetInt("StorageSource")
+
+	if source == utils.STORAGESOURCE_OSS {
+		resp, err := services.GetOssSTSToken()
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取STSToken失败, Err: " + err.Error()
+			return
+		}
+		br.Data = resp
+		br.Msg = "获取成功"
+		br.Ret = 200
+		br.Success = true
+	} else if source == utils.STORAGESOURCE_MINIO {
+		resp, err := services.GetMinIOSTSToken()
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取STSToken失败, Err: " + err.Error()
+			return
+		}
+		br.Data = resp
+		br.Msg = "获取成功"
+		br.Ret = 200
+		br.Success = true
 	}
-	br.Msg = "获取成功"
-	br.Ret = 200
-	br.Success = true
-	br.Data = resp
 }
 
 // WechatWarning 小程序前端预警提示

models/report.go

@@ -121,7 +121,7 @@ func GetReportList(condition string, pars []interface{}, companyType string, sta
 	if condition != "" {
 		sql += condition
 	}
-	sql += `ORDER BY state ASC, modify_time DESC LIMIT ?,?`
+	sql += `ORDER BY FIELD(state,3,1,2,4), modify_time DESC LIMIT ?,?`
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }

services/minio.go

@@ -137,6 +137,7 @@ func UploadImgToMinIo(fileName, filePath string) (string, error) {
 	})
 	if err != nil {
 		log.Fatalln(err)
+		return "1", err
 	}
 	bucketName := utils.MinIoBucketname
 	// Check to see if we already own this bucket (which happens if you run this twice)
@@ -145,14 +146,16 @@ func UploadImgToMinIo(fileName, filePath string) (string, error) {
 		log.Printf("We already own %s\n", bucketName)
 	} else {
 		log.Fatalln(err)
+		return "2", err
 	}
-	path := utils.MinIoUpload_Audio_Dir + time.Now().Format("200601/20060102/")
+	path := utils.MinIoUploadDir + time.Now().Format("200601/20060102/")
 	path += fileName
 	// Upload the zip file with FPutObject
 	//contentType := "application/xlsx"
 	_, err = minioClient.FPutObject(ctx, bucketName, path, filePath, minio.PutObjectOptions{})
 	if err != nil {
 		log.Fatalln(err)
+		return "3", err
 	}
 
 	path = utils.MinIoImghost + path

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 {