From 4663d4ab7d4ceb8b01772f68bac30c668c1b6371 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 21 Apr 2023 14:15:07 +0800 Subject: [PATCH] =?UTF-8?q?Get=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/sale/admin/controller/sync/SyncController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/SyncController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/SyncController.java index 43bb923..cdbbdcd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/SyncController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/SyncController.java @@ -31,6 +31,8 @@ import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.BufferedReader; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -160,7 +162,6 @@ public class SyncController { } - private JSONObject redirectNolog(HttpServletRequest request, String uri) { RestTemplate restTemplate = new RestTemplate(); HttpEntity httpEntity = uriUtils.buildHeader(request); @@ -168,6 +169,7 @@ public class SyncController { if (request.getMethod().equals("POST")) { responseBody = restTemplate.postForEntity(uri, httpEntity, JSONObject.class); } else if (request.getMethod().equals("GET")) { + uri = uri +"?"+ request.getQueryString(); responseBody = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, JSONObject.class); } JSONObject result = responseBody.getBody(); @@ -189,7 +191,7 @@ public class SyncController { writeUploadLog(taskId, httpEntity.getBody(), idDatas, type); responseBody = restTemplate.postForEntity(uri, httpEntity, JSONObject.class); } else if (request.getMethod().equals("GET")) { - writeDownloadLog(taskId, httpEntity.getBody(), idDatas, type); + writeUploadLog(taskId, httpEntity.getBody(), idDatas, type); responseBody = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, JSONObject.class); } JSONObject result = responseBody.getBody(); @@ -206,7 +208,7 @@ public class SyncController { writeUploadLog(taskId, httpEntity.getBody(), idDatas, type); responseBody = restTemplate.postForEntity(uri, httpEntity, JSONObject.class); } else if (request.getMethod().equals("GET")) { - writeDownloadLog(taskId, httpEntity.getBody(), idDatas, type); + writeUploadLog(taskId, httpEntity.getBody(), idDatas, type); responseBody = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, JSONObject.class); } JSONObject result = responseBody.getBody();