From f10a7c29f1a3748b28d2809335625c7888473b26 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 22:21:19 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 3a2ff61..12f1569 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -31,6 +31,7 @@
import com.ruoyi.member.service.member.MemberTotalService;
import com.ruoyi.member.util.HttpUtils;
import com.ruoyi.member.util.MsgUtils;
+import com.ruoyi.member.util.OBSUploadUtils;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.dto.*;
@@ -51,6 +52,7 @@
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.Base64Utils;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -2355,11 +2357,9 @@
@Override
public String getWeiXinQrCode(String scene, String path) {
try {
- File file = wxMaService.getQrcodeService().createWxaCodeUnlimit(scene, path);
- FileInputStream input = new FileInputStream(file);
- MultipartFile multipartFile = new MyMultipartFile("file", file.getName(), "text/plain", IOUtils.toByteArray(input));
- String data = remoteFileService.uploadOSS(multipartFile).getData();
- return data;
+ File file = wxMaService.getQrcodeService().createQrcode(path + "?" + scene);
+ String url = OBSUploadUtils.uploadLocalFile(file);
+ return url;
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.7.1