From dbbfe5de7b6a80c143aa32e576b8bee589d7985a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 13 九月 2023 13:52:08 +0800
Subject: [PATCH] 修改mn下的所有实体类

---
 src/main/java/com/moon/server/helper/HttpHelper.java |   46 +++++++++++++++++++++++++---------------------
 1 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/moon/server/helper/HttpHelper.java b/src/main/java/com/moon/server/helper/HttpHelper.java
index 68e27cc..aef4376 100644
--- a/src/main/java/com/moon/server/helper/HttpHelper.java
+++ b/src/main/java/com/moon/server/helper/HttpHelper.java
@@ -20,7 +20,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.net.HttpCookie;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -274,35 +273,40 @@
             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) {
-        String url = res.getUrl();
-        if (url.contains(StaticData.AK)) {
-            String[] strs = url.split("\\?");
-            url = strs[0];
-
-            if (!StringHelper.isEmpty(strs[1])) {
-                str = str.replace("?" + strs[1], "");
-            }
-        }
-        if (str.contains(url)) {
+        if (str.contains(res.getUrl())) {
             String proxyUrl = res.getProxy().replace("{token}", response.getHeader("token"));
             proxyUrl = request.getRequestURL().substring(0, request.getRequestURL().indexOf(proxyUrl) + proxyUrl.length());
             str = str.replace(res.getUrl(), proxyUrl);
+
+            if (!StringHelper.isEmpty(res.getArgs())) {
+                // str = str.replace("?" + res.getArgs(), "").replace("&amp;" + res.getArgs(), "")
+                str = str.replace("?" + res.getArgs() + "\"", "\"").replace("&amp;" + res.getArgs() + "\"", "\"")
+                        .replace("?" + res.getArgs() + "&amp;", "?").replace("&amp;" + res.getArgs() + "&amp;", "&amp;");
+            }
+
+            if (StaticData.I3 == res.getCategory() && str.contains(StaticData.REST_LAYER)) {
+                str = str.replace(res.getUrl().replace("/v6/wmts/", StaticData.REST_LAYER), proxyUrl.replace("/proxy/", "/proxy/rest/"));
+            }
         }
 
         return str;

--
Gitblit v1.9.3