diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java index 40a5fe223..9553071d7 100644 --- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java +++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java @@ -20,6 +20,10 @@ import java.util.Map.Entry; import java.util.Set; import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.client.Invocation.Builder; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; @@ -136,22 +140,36 @@ public class HttpClientUtil { public static String getMsg(String destUrl, Map params, HttpServletRequest req) { RequestContext requestContext = new RequestContext(req); - CloseableHttpResponse response = null; +// CloseableHttpResponse response = null; String result = null; + String url = ""; try { URIBuilder uriBuilder = new URIBuilder(destUrl); for (String param : params.keySet()) { uriBuilder.addParameter(param, params.get(param).toString()); } - HttpGet request = new HttpGet(uriBuilder.build()); - request.setConfig(requestConfig); - URI uri = request.getURI(); - logger.info(uri); - System.err.println(uri); - response = getHttpClient().execute(request); - int status = response.getStatusLine().getStatusCode(); + System.err.println(uriBuilder); + url=uriBuilder.toString(); + //创建连接 + WebTarget wt = ClientUtil.getWebTarger(url); + logger.info("getId url:"+url); + //获取响应结果 + Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); + Response response= header.get(); + + + +// HttpGet request = new HttpGet(uriBuilder.build()); +// request.setConfig(requestConfig); +// URI uri = request.getURI(); +// logger.info(uri); +// System.err.println(uri); +// response = getHttpClient().execute(request); +// int status = response.getStatusLine().getStatusCode(); + int status = response.getStatus(); if (status == HttpStatus.SC_OK) { - result = EntityUtils.toString(response.getEntity()); + result= response.readEntity(String.class); +// result = EntityUtils.toString(response.getEntity()); //调用处理数据方法 result = galaxyMessageFormat(result); logger.debug("获取消息成功,相应内容如下: " + result); @@ -159,7 +177,7 @@ public class HttpClientUtil { } else { throw new MaatConvertException(status+""); } - } catch (SocketTimeoutException e) { + } /*catch (SocketTimeoutException e) { logger.error("获取消息失败 ", e); throw new MaatConvertException(requestContext.getMessage("request_service_failed") + ":timeout"); } catch (MaatConvertException e) { @@ -167,10 +185,11 @@ public class HttpClientUtil { } catch (ConnectTimeoutException e) { logger.error("获取消息失败 ", e); throw new MaatConvertException(requestContext.getMessage("request_service_failed") + ":timeout"); - } catch (Exception e) { + }*/ catch (Exception e) { + e.printStackTrace(); logger.error("获取消息失败 ", e); throw new MaatConvertException(requestContext.getMessage("request_service_failed")); - } finally { + } /*finally { try { if (response != null) { response.close(); @@ -178,7 +197,7 @@ public class HttpClientUtil { } catch (IOException e) { e.printStackTrace(); } - } + }*/ return result; } diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index af6927b7e..023e65a5b 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -243,7 +243,7 @@
-