From 08d894697a501522902dc25f016298ad68a6361b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 27 九月 2023 16:57:51 +0800
Subject: [PATCH] 解决代理地址有空格导致运行出错

---
 src/main/java/com/moon/server/entity/all/StaticData.java    |    2 ++
 src/main/java/com/moon/server/service/sys/ProxyService.java |    2 +-
 src/main/resources/application.yml                          |    5 +++--
 3 files changed, 6 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 4574fe9..a424a62 100644
--- a/src/main/java/com/moon/server/entity/all/StaticData.java
+++ b/src/main/java/com/moon/server/entity/all/StaticData.java
@@ -102,6 +102,8 @@
 
     public final static String TILDE = "~";
 
+    public final static String QUESTION = "?";
+
     public final static String BACKSLASH = "\\\\";
 
     public final static String SINGLE_QUOTES = "'";
diff --git a/src/main/java/com/moon/server/service/sys/ProxyService.java b/src/main/java/com/moon/server/service/sys/ProxyService.java
index b6c8770..5624a36 100644
--- a/src/main/java/com/moon/server/service/sys/ProxyService.java
+++ b/src/main/java/com/moon/server/service/sys/ProxyService.java
@@ -218,7 +218,7 @@
         String proxyUrl = entity.getProxy().replace("{token}", token);
         int end = req.getRequestURL().indexOf(proxyUrl) + proxyUrl.length();
 
-        String url = entity.getUrl() + req.getRequestURL().substring(end);
+        String url = entity.getUrl().trim() + req.getRequestURL().substring(end);
         // category锛�0-鍏朵粬锛�1-GisServer锛�2-GeoServer锛�3-鏁扮畝
         if (StaticData.I2 == entity.getCategory()) {
             url = getGeoServerUrl(req, ue, entity, url);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a7d152c..e106e61 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -120,10 +120,11 @@
   connectTimeout: 30000
   readTimeout: -1
 
+# http://172.16.2.10:50001
 shujian:
   ak: ak=mf72ff9295c740ec0f37e61433e8a3ad8d
-  url1: http://172.16.2.10:50001
-  url5: http://172.16.2.10:50005
+  url1: http://219.153.49.10:7511
+  url5: http://219.153.49.10:7511
   path: share/YQData/upload/
   domName: 鑷姩鍙戝竷褰卞儚鍥惧眰缁�
   demName: 鑷姩鍙戝竷楂樼▼鍥惧眰缁�

--
Gitblit v1.9.3