Merge branch 'pool410_shenwan_pic' into debug

controllers/data_manage/edb_info.go

@@ -6757,14 +6757,14 @@ func (this *EdbInfoController) ChartImageSetBySvg() {
 		br.Ret = 408
 		return
 	}
-	picType := this.GetString("PicType")
+	backendGenerate,_ := this.GetBool("BackendGenerate",false)
 	imgData := this.GetString("Img")
 	if imgData == "" {
 		br.Msg = "图片参数错误"
 		br.ErrMsg = "图片参数错误,Img Is Empty"
 		return
 	}
-	if strings.ToLower(picType) == "png" {
+	if !backendGenerate {
 		b, _ := regexp.MatchString(`^data:\s*image\/(\w+);base64,`, imgData)
 		if !b {
 			br.Msg = "图片格式不正确"
@@ -6784,7 +6784,7 @@ func (this *EdbInfoController) ChartImageSetBySvg() {
 	}
 
 	// 通过svg图片生成图片资源地址
-	resourceUrl, err, errMsg := services.GetResourceUrlBySvgImg(imgData,picType)
+	resourceUrl, err, errMsg := services.GetResourceUrlBySvgImg(imgData,backendGenerate)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = err.Error()

services/file.go

@@ -108,7 +108,7 @@ func saveToFileByHeader(fileHeader *multipart.FileHeader, tofile string) error {
 // @return resourceUrl string
 // @return err error
 // @return errMsg string
-func GetResourceUrlBySvgImg(imgData string, picType ...string) (resourceUrl string, err error, errMsg string) {
+func GetResourceUrlBySvgImg(imgData string, backendGenerate ...bool) (resourceUrl string, err error, errMsg string) {
 	errMsg = "图表保存失败"
 	uploadDir := "static/images/"
 	if !utils.FileIsExist(uploadDir) {
@@ -118,15 +118,16 @@ func GetResourceUrlBySvgImg(imgData string, picType ...string) (resourceUrl stri
 			return
 		}
 	}
-	var fileName, outFileName, picTypeStr string
+	var fileName, outFileName string
+	var generte bool
 	uploadDir = "static/images/"
 	randStr := utils.GetRandStringNoSpecialChar(28)
 	outFileName = randStr + ".png"
-	if len(picType) > 0 {
-		picTypeStr = picType[0]
+	if len(backendGenerate) > 0 {
+		generte = backendGenerate[0]
 	}
 
-	if strings.ToLower(picTypeStr) == "png" {
+	if !generte {
 		err = utils.SaveBase64ToFile(imgData, outFileName)
 		if err != nil {
 			err = errors.New("图片保存失败,Err:" + err.Error())