Browse Source

Merge branch 'pool410_shenwan_pic' into debug

kobe6258 2 days ago
parent
commit
483cdd6dd9

+ 7 - 7
services/file.go

@@ -165,12 +165,7 @@ func GetResourceUrlBySvgImg(imgData string, picType ...string) (resourceUrl stri
 			}
 			doneChannel <- true
 		}()
-		defer func() {
-			_ = os.Remove(outFileName)
-			if err != nil {
-				utils.FileLog.Info("删除生产的图片文件失败, err: " + err.Error())
-			}
-		}()
+
 
 		select {
 		case <-time.After(30 * time.Second):
@@ -193,7 +188,12 @@ func GetResourceUrlBySvgImg(imgData string, picType ...string) (resourceUrl stri
 			return
 		}
 	}
-
+	defer func() {
+		_ = os.Remove(outFileName)
+		if err != nil {
+			utils.FileLog.Info("删除生产的图片文件失败, err: " + err.Error())
+		}
+	}()
 	//上传到阿里云 和 minio
 	ossClient := NewOssClient()
 	if ossClient == nil {

File diff suppressed because it is too large
+ 0 - 7
static/images/UXjAv5IXV9fSqDBqhGS3DPYcj9wb.txt


File diff suppressed because it is too large
+ 0 - 7
static/images/fdUC0cafpf0LXCjpwluC0r6IzA4Z.txt


Some files were not shown because too many files changed in this diff