From e6a222fea235eb4ebb3fc47d95c61a07a2db5e15 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 九月 2023 15:23:33 +0800
Subject: [PATCH] 修改栅格分析的面方法

---
 src/main/java/com/moon/server/helper/HttpHelper.java |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/moon/server/helper/HttpHelper.java b/src/main/java/com/moon/server/helper/HttpHelper.java
index 635cd78..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;
@@ -294,22 +293,19 @@
     }
 
     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], "").replace("&amp;" + strs[1], "").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(url, proxyUrl);
+            str = str.replace(res.getUrl(), proxyUrl);
 
-            if (str.contains(StaticData.REST_LAYER)) {
-                str = str.replace(url.replace("/wmts/layer/", StaticData.REST_LAYER), 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/"));
             }
         }
 

--
Gitblit v1.9.3