diff --git a/src/main/java/com/example/zxweb/utils/RestUtil.java b/src/main/java/com/example/zxweb/utils/RestUtil.java index 7ff19bb..f24025d 100644 --- a/src/main/java/com/example/zxweb/utils/RestUtil.java +++ b/src/main/java/com/example/zxweb/utils/RestUtil.java @@ -248,17 +248,10 @@ public class RestUtil { // 发送请求 HttpEntity request = new HttpEntity<>(body, headers); //回调接口 - if (url.contains("callback")) { - SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory(); - requestFactory.setConnectTimeout(30000); - requestFactory.setReadTimeout(30000); - RT = new RestTemplate(requestFactory); - }else{ - SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory(); - requestFactory.setConnectTimeout(300 *1000); - requestFactory.setReadTimeout(300* 1000); - RT = new RestTemplate(requestFactory); - } + SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory(); + requestFactory.setConnectTimeout(300 *1000); + requestFactory.setReadTimeout(300* 1000); + RT = new RestTemplate(requestFactory); // 解决乱码问题 RT.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8)); return RT.exchange(url, method, request, responseType); diff --git a/src/main/java/com/example/zxweb/utils/RmsUtils.java b/src/main/java/com/example/zxweb/utils/RmsUtils.java index 25c5de3..87b6fd0 100644 --- a/src/main/java/com/example/zxweb/utils/RmsUtils.java +++ b/src/main/java/com/example/zxweb/utils/RmsUtils.java @@ -112,7 +112,7 @@ public class RmsUtils { header.put("devid",devid); String cardNum = requestBody.getString("cardNum"); AssertUtils.notEmpty(cardNum,"清输入访客证件号-[cardNum]"); - JSONObject responseBody = RestUtil.post(API_PREFIX+RmsApiEnum.getApiByText("访客注销"), requestBody, header); + JSONObject responseBody = RestUtil.post(API_PREFIX+RmsApiEnum.getApiByText("访客注销")+"/"+cardNum, null, header); log.error(responseBody.toJSONString()); AssertUtils.notNull(responseBody,"请求失败"); //Integer code = responseBody.getInteger("code");