From 89e7ed902461f28d6a7dd3e6c927eaf40b154f5e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 15 八月 2024 10:12:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 61c079b..babd1ad 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
@@ -495,15 +495,15 @@
StringBuffer stringBuffer = new StringBuffer();
for (int i = 0; i < arr.length; i++) {
if(i==0){
- stringBuffer.append( i + "瀹�");
+ stringBuffer.append( arr[i] + "瀹�");
}else if(i==1){
- stringBuffer.append( i + "鍘�");
+ stringBuffer.append( arr[i] + "鍘�");
}else if(i==2){
- stringBuffer.append( i + "鍘�");
+ stringBuffer.append( arr[i] + "鍘�");
}else if(i==3){
- stringBuffer.append( i + "鍗�");
+ stringBuffer.append( arr[i] + "鍗�");
}else if(i==4){
- stringBuffer.append( i + "闃�");
+ stringBuffer.append( arr[i] + "闃�");
}else {
break;
}
@@ -683,11 +683,9 @@
// 鍦烘櫙鐮侊紝涓庡墠绔害瀹氾紝鏈�缁堟槸闇�瑕佸墠绔В鏋�
body.put("scene", scene);
// 姝ｅ紡鐗堜负 "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝ｅ紡鐗堛��
- String env_version = "trial";
+ String env_version = "release";
body.put("env_version", env_version);
- if(env_version.equals("release")&&StringUtils.isNotBlank(page)){
- body.put("page", page);
- }
+// body.put("page", "pages/index/index");
// 閫忔槑锛屾牴鎹綘鐨勫満鏅嚜琛岃缃産ody鍙傛暟
body.put("is_hyaline", true);
OkHttpClient client = new OkHttpClient().newBuilder().build();
@@ -699,7 +697,7 @@
Response response = client.newCall(request).execute();
if (response.isSuccessful()) {
InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
- /*ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ /* ByteArrayOutputStream baos = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
int len = -1;
while ((len = inputStream.read(buffer)) != -1) {
--
Gitblit v1.9.3