From 0d3fc39d118fe82335b4a02624b17d60db53d2ef Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 17:38:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 55 +++++++++++--------------------------------------------
1 files changed, 11 insertions(+), 44 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 7c59e5e..6a4960e 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -22,6 +22,7 @@
import org.apache.http.util.EntityUtils;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
@@ -686,13 +687,13 @@
}
- public InputStream generateWxMiniImgStream(String accessToken,String scene,String page) {
+ public static InputStream generateWxMiniImgStream(String accessToken,String scene,String page) {
//鐢熸垚鍥剧墖涓婁紶OSS
Map<String,Object> body = new HashMap<>();
// 鍦烘櫙鐮侊紝涓庡墠绔害瀹氾紝鏈�缁堟槸闇�瑕佸墠绔В鏋�
body.put("scene", scene);
// 姝ｅ紡鐗堜负 "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝ｅ紡鐗堛��
- body.put("env_version", "release");
+ body.put("env_version", "develop");
body.put("page", page);
// 閫忔槑锛屾牴鎹綘鐨勫満鏅嚜琛岃缃産ody鍙傛暟
body.put("is_hyaline", true);
@@ -705,6 +706,13 @@
Response response = client.newCall(request).execute();
if (response.isSuccessful()) {
InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
+// ByteArrayOutputStream baos = new ByteArrayOutputStream();
+// byte[] buffer = new byte[1024];
+// int len = -1;
+// while ((len = inputStream.read(buffer)) != -1) {
+// baos.write(buffer, 0, len);
+// }
+// System.out.println("data:mediatype;base64," + Base64.getEncoder().encodeToString(baos.toByteArray()));
return inputStream;
}
} catch (Exception e) {
@@ -714,48 +722,7 @@
}
- /**
- * 鍙戦�乬et璇锋眰
- * @param url 璇锋眰URL
- * @param param 璇锋眰鍙傛暟 key:value url鎼哄甫鍙傛暟 鎴栬�呮棤鍙傚彲涓嶅～
- * @return
- */
- public static String doGet(String url, Map<String, String> param) {
- // 鍒涘缓Httpclient瀵硅薄
- CloseableHttpClient httpclient = HttpClients.createDefault();
- String resultString = "";
- CloseableHttpResponse response = null;
- try {
- // 鍒涘缓uri
- URIBuilder builder = new URIBuilder(url);
- if (param != null) {
- for (String key : param.keySet()) {
- builder.addParameter(key, param.get(key));
- }
- }
- URI uri = builder.build();
- // 鍒涘缓http GET璇锋眰
- HttpGet httpGet = new HttpGet(uri);
- // 鎵ц璇锋眰
- response = httpclient.execute(httpGet);
- // 鍒ゆ柇杩斿洖鐘舵�佹槸鍚︿负200
- if (response.getStatusLine().getStatusCode() == 200) {
- resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- try {
- if (response != null) {
- response.close();
- }
- httpclient.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- return resultString;
- }
+
--
Gitblit v1.9.3