From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
index 0214366..fa41272 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -5,6 +5,7 @@
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ID;
import com.doumee.dao.business.RefundMapper;
import com.doumee.dao.business.TransactionsMapper;
@@ -24,6 +25,7 @@
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,10 +33,7 @@
import org.springframework.transaction.annotation.Transactional;
import sun.misc.BASE64Decoder;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
+import java.io.*;
import java.math.BigDecimal;
import java.util.*;
@@ -134,7 +133,7 @@
* https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/qrcode-link/qr-code/getUnlimitedQRCode.html
* @return
*/
- public void generateWXMiniCode(Locks locks,SystemDictData systemDictData){
+ public void generateWXMiniCode(Locks locks,SystemDictData systemDictData,String prePath,String path){
if(Objects.isNull(systemDictData)){
return;
@@ -157,13 +156,10 @@
Response response = client.newCall(request).execute();
if (response.isSuccessful()) {
InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
-
- // 寰楀埌鏂囦欢澶у皬
- int i = inputStream.available();
- byte[] mFileBody = new byte[i];
- // 璇绘暟鎹�
- inputStream.read(mFileBody);
- locks.setInfo("data:image/Jpeg;base64," + Base64.getEncoder().encodeToString(mFileBody));
+ String nowDate = DateUtil.getNowShortDate();
+ File file = new File(prePath+path,locks.getSiteId()+"-"+locks.getCode()+"-"+nowDate+".png");
+ FileUtils.copyInputStreamToFile(inputStream,file);
+ locks.setInfo(locks.getSiteId()+"-"+locks.getCode()+"-"+nowDate+".png");
}
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.3