From 2e1a9c064309e60047473c78f0dd3a88c726bb8d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 11 三月 2025 10:49:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java
index ae73365..0db20f7 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java
@@ -6,6 +6,7 @@
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.auction.util.CreateQrCode;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.system.api.RemoteFileService;
import lombok.extern.slf4j.Slf4j;
@@ -13,12 +14,14 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
/**
@@ -235,8 +238,9 @@
*/
public String getwxacodeunlimit(String page, String scene, EnvVersion env_version, String filePath){
InputStream getwxacodeunlimit = getwxacodeunlimit(page, scene, env_version);
+ MultipartFile multipartFile = CreateQrCode.getMultipartFile(getwxacodeunlimit, UUID.randomUUID() + ".png");
// File file = FileUtil.writeFromStream(getwxacodeunlimit, new File(filePath));
// return file.getPath();
- return remoteFileService.obsUpload("png", getwxacodeunlimit).getData();
+ return remoteFileService.obsUpload(multipartFile).getData();
}
}
--
Gitblit v1.7.1