From f7b2d885bc64a0598facb2b5a0d89dcdf5921902 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 27 九月 2023 16:26:11 +0800
Subject: [PATCH] 修改代理服务-3

---
 src/main/java/com/moon/server/helper/HttpHelper.java |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/moon/server/helper/HttpHelper.java b/src/main/java/com/moon/server/helper/HttpHelper.java
index 68f9d87..19d8eff 100644
--- a/src/main/java/com/moon/server/helper/HttpHelper.java
+++ b/src/main/java/com/moon/server/helper/HttpHelper.java
@@ -69,7 +69,6 @@
 
         CloseableHttpClient client = null;
         HttpResponse proxyResponse = null;
-
         try {
             client = this.createHttpClient();
             proxyResponse = client.execute(host, proxyRequest);
@@ -273,23 +272,37 @@
             return;
         }
 
-        do {
-            if (null == res || StringHelper.isNull(res.getUrl())) {
+        switch (res.getCategory()) {
+            case 2:
+                copeGeoService(proxyResponse, request, response, res);
                 break;
-            }
+            case 3:
+                copeSjService(proxyResponse, request, response, res);
+                break;
+            default:
+                entity.writeTo(response.getOutputStream());
+                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"));
+    private void copeGeoService(HttpResponse proxyResponse, HttpServletRequest request, HttpServletResponse response, ResEntity res) throws IOException {
+        if (StaticData.GET_CAPABILITIES.equals(res.getBak())) {
+            //
+        }
 
-                byte[] bytes = str.getBytes(StandardCharsets.UTF_8);
-                response.setContentLength(bytes.length);
-                response.getOutputStream().write(bytes);
-                return;
-            }
-        } while (false);
+        proxyResponse.getEntity().writeTo(response.getOutputStream());
+    }
 
-        entity.writeTo(response.getOutputStream());
+    private void copeSjService(HttpResponse proxyResponse, HttpServletRequest request, HttpServletResponse response, ResEntity res) throws IOException {
+        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(proxyResponse.getEntity(), "UTF-8"));
+            byte[] bytes = str.getBytes(StandardCharsets.UTF_8);
+            response.setContentLength(bytes.length);
+            response.getOutputStream().write(bytes);
+        } else {
+            proxyResponse.getEntity().writeTo(response.getOutputStream());
+        }
     }
 
     private String filterStr(HttpServletRequest request, HttpServletResponse response, ResEntity res, String str) {
@@ -304,7 +317,7 @@
                         .replace("?" + res.getArgs() + "&amp;", "?").replace("&amp;" + res.getArgs() + "&amp;", "&amp;");
             }
 
-            if (StaticData.THREE == res.getCategory() && str.contains(StaticData.REST_LAYER)) {
+            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