From 2eed541a0d2e3a217cdd79d5924c35f4ece1b5a2 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 28 七月 2023 10:39:24 +0800
Subject: [PATCH] 修改数简wmts服务代理

---
 src/main/java/com/moon/server/entity/all/StaticData.java |    2 +-
 src/main/java/com/moon/server/helper/HttpHelper.java     |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moon/server/entity/all/StaticData.java b/src/main/java/com/moon/server/entity/all/StaticData.java
index 3f78c89..1ed135e 100644
--- a/src/main/java/com/moon/server/entity/all/StaticData.java
+++ b/src/main/java/com/moon/server/entity/all/StaticData.java
@@ -88,7 +88,7 @@
 
     public final static String AK = "?ak=";
 
-    public final static String REST_LAYER = "/rest/layer/";
+    public final static String REST_LAYER = "/v6/rest/";
 
     /**
      * 鍗曞紩鍙�
diff --git a/src/main/java/com/moon/server/helper/HttpHelper.java b/src/main/java/com/moon/server/helper/HttpHelper.java
index bd945ad..77379ad 100644
--- a/src/main/java/com/moon/server/helper/HttpHelper.java
+++ b/src/main/java/com/moon/server/helper/HttpHelper.java
@@ -299,11 +299,13 @@
             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(), "")
+                str = str.replace("?" + res.getArgs() + "\"", "\"").replace("&amp;" + res.getArgs() + "\"", "\"")
+                        .replace("?" + res.getArgs() + "&amp;", "?").replace("&amp;" + res.getArgs() + "&amp;", "&amp;");
             }
 
             if (StaticData.THREE == res.getFirm() && str.contains(StaticData.REST_LAYER)) {
-                str = str.replace(res.getUrl().replace("/wmts/layer/", StaticData.REST_LAYER), proxyUrl.replace("/proxy/", "/proxy/rest/"));
+                str = str.replace(res.getUrl().replace("/v6/wmts/", StaticData.REST_LAYER), proxyUrl.replace("/proxy/", "/proxy/rest/"));
             }
         }
 

--
Gitblit v1.9.3