From d4c12b3ad2ae1c052b3b080a68398448e56b619a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 27 八月 2025 16:28:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
index e95f68e..6b640bf 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
@@ -43,9 +43,7 @@
 import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -204,9 +202,10 @@
         OutputStream outputStream = null;
         String accessToken = wxAppletTools.getAccessToken();
         try {
-//            String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + accessToken;
+            String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken;
             Map<String, Object> param = new HashMap<>();
             param.put("scene", "phone=" + phonenumber+",amount="+amount);
+            param.put("path", "chargingPile/payMent/payMent");
             param.put("check_path", false);
             param.put("env_version", "trial");
             param.put("width", 200); //二维码尺寸
@@ -218,18 +217,14 @@
             line_color.put("b", 0);
             param.put("line_color", line_color);
             System.err.println("调用生成微信URL接口传参:" + param);
-//            MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-//            HttpEntity requestEntity = new HttpEntity(param, headers);
-//            ResponseEntity<byte[]> entity = restTemplate.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]);
-//            System.err.println("调用小程序生成微信永久小程序码URL接口返回结果:" + entity.getBody());
-//            byte[] result = entity.getBody();
-            //路径也是固定的"https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token="
-            String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken;
-            //这里有个坑,需要用HttpResponse获取,不然会有问题
-            HttpResponse httpResponse = HttpUtils.doPost(url, new JSONObject(param));
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            HttpEntity requestEntity = new HttpEntity(param, headers);
+            ResponseEntity<byte[]> entity = restTemplate.exchange(url, HttpMethod.POST, requestEntity, byte[].class);
+            System.err.println("调用小程序生成微信永久小程序码URL接口返回结果:" + entity.getBody());
+            byte[] result = entity.getBody();
+            inputStream = new ByteArrayInputStream(result);
             //拿到httpResponse后,在获取里面的图片
-            inputStream = httpResponse.getEntity().getContent();
-
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             // 最后上传生成的文件名
             String finalFileName = System.currentTimeMillis() + "" + new SecureRandom().nextInt(0x0400) + ".jpg";

--
Gitblit v1.7.1