From 7d4432754e2661ff12beaf5fec5875ff92a27b57 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 18 七月 2023 17:12:36 +0800
Subject: [PATCH] 解决代理服务编译出错
---
src/main/java/com/moon/server/controller/all/FloatServerController.java | 2 +-
src/main/java/com/moon/server/helper/HttpHelper.java | 24 ++++++++++++++----------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/all/FloatServerController.java b/src/main/java/com/moon/server/controller/all/FloatServerController.java
index b8475a7..de7b877 100644
--- a/src/main/java/com/moon/server/controller/all/FloatServerController.java
+++ b/src/main/java/com/moon/server/controller/all/FloatServerController.java
@@ -36,7 +36,7 @@
try {
if (IS_REDIRECT) {
HttpHelper httpHelper = new HttpHelper();
- httpHelper.service(req, res, "http://192.168.20.43:38080/floatserver/checkout/license", null);
+ httpHelper.service(req, res, null, "http://192.168.20.43:38080/floatserver/checkout/license");
return;
}
diff --git a/src/main/java/com/moon/server/helper/HttpHelper.java b/src/main/java/com/moon/server/helper/HttpHelper.java
index 68e27cc..2e9abb5 100644
--- a/src/main/java/com/moon/server/helper/HttpHelper.java
+++ b/src/main/java/com/moon/server/helper/HttpHelper.java
@@ -274,19 +274,23 @@
return;
}
- OutputStream outputStream = response.getOutputStream();
+ do {
+ if (null == res || StringHelper.isNull(res.getUrl())) {
+ break;
+ }
- Header[] headers = proxyResponse.getHeaders("content-type");
- if (null != headers && headers.length > 0 && headers[0].getValue().contains(StaticData.TEXT_XML)) {
- String str = filterStr(request, response, res, EntityUtils.toString(entity, "UTF-8"));
+ Header[] headers = proxyResponse.getHeaders("content-type");
+ if (null != headers && headers.length > 0 && headers[0].getValue().contains(StaticData.TEXT_XML)) {
+ String str = filterStr(request, response, res, EntityUtils.toString(entity, "UTF-8"));
- byte[] bytes = str.getBytes(StandardCharsets.UTF_8);
- response.setContentLength(bytes.length);
- outputStream.write(bytes);
- return;
- }
+ byte[] bytes = str.getBytes(StandardCharsets.UTF_8);
+ response.setContentLength(bytes.length);
+ response.getOutputStream().write(bytes);
+ return;
+ }
+ } while (false);
- entity.writeTo(outputStream);
+ entity.writeTo(response.getOutputStream());
}
private String filterStr(HttpServletRequest request, HttpServletResponse response, ResEntity res, String str) {
--
Gitblit v1.9.3