diff --git a/network-spring-boot-starter/src/main/java/com/hxuanyu/network/service/HttpService.java b/network-spring-boot-starter/src/main/java/com/hxuanyu/network/service/HttpService.java index 4bc30c0..59971a7 100644 --- a/network-spring-boot-starter/src/main/java/com/hxuanyu/network/service/HttpService.java +++ b/network-spring-boot-starter/src/main/java/com/hxuanyu/network/service/HttpService.java @@ -1,7 +1,7 @@ package com.hxuanyu.network.service; import com.hxuanyu.common.message.Msg; -import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; import java.util.Map; @@ -20,7 +20,7 @@ public interface HttpService { * @param url 请求地址 * @return 统一结果报文 */ - Msg doGetWithEntity(String url); + Msg doGetWithResponse(String url); @@ -47,7 +47,7 @@ public interface HttpService { * @param url 请求地址 * @param listener 异步请求结果监听 */ - void doGetSyncWithEntity(String url, NetWorkListener listener); + void doGetSyncWithResponse(String url, NetWorkListener listener); /** * 发送get请求；带请求参数 @@ -66,7 +66,7 @@ public interface HttpService { * @param params 请求参数集合 * @return 全局报文 */ - Msg doGetWithEntity(String url, Map params); + Msg doGetWithResponse(String url, Map params); /** * 异步Get请求 @@ -84,7 +84,7 @@ public interface HttpService { * @param params 请求参数 * @param listener 异步请求结果监听 */ - void doGetSyncWithEntity(String url, Map params, NetWorkListener listener); + void doGetSyncWithResponse(String url, Map params, NetWorkListener listener); /** * 发送get请求；带请求头和请求参数 @@ -104,7 +104,7 @@ public interface HttpService { * @param params 请求参数集合 * @return 全局报文 */ - Msg doGetWithEntity(String url, Map headers, Map params); + Msg doGetWithResponse(String url, Map headers, Map params); /** * 异步Get请求 @@ -124,7 +124,7 @@ public interface HttpService { * @param params 请求体 * @param listener 异步结果监听器 */ - void doGetSyncWithEntity(String url, Map headers, Map params, NetWorkListener listener); + void doGetSyncWithResponse(String url, Map headers, Map params, NetWorkListener listener); /** * 发送post请求；不带请求头和请求参数 @@ -140,7 +140,7 @@ public interface HttpService { * @param url 请求地址 * @return 统一报文 */ - Msg doPostWithEntity(String url); + Msg doPostWithResponse(String url); /** @@ -157,7 +157,7 @@ public interface HttpService { * @param url 请求地址 * @param listener 请求参数 */ - void doPostSyncWithEntity(String url, NetWorkListener listener); + void doPostSyncWithResponse(String url, NetWorkListener listener); /** * 同步Post请求 @@ -176,7 +176,7 @@ public interface HttpService { * @param params 请求参数 * @return 统一消息体 */ - Msg doPostWithEntity(String url, Map params); + Msg doPostWithResponse(String url, Map params); /** * 异步Post请求 @@ -194,7 +194,7 @@ public interface HttpService { * @param params 请求参数 * @param listener 异步请求结果监听 */ - void doPostSyncWithEntity(String url, Map params, NetWorkListener listener); + void doPostSyncWithResponse(String url, Map params, NetWorkListener listener); /** * 发送post请求；带请求头和请求参数 @@ -214,7 +214,7 @@ public interface HttpService { * @param params 请求参数集合 * @return 统一返回报文 */ - Msg doPostWithEntity(String url, Map headers, Map params); + Msg doPostWithResponse(String url, Map headers, Map params); /** @@ -235,7 +235,7 @@ public interface HttpService { * @param params 请求参数 * @param listener 异步请求结果监听 */ - void doPostSyncWithEntity(String url, Map headers, Map params, NetWorkListener listener); + void doPostSyncWithResponse(String url, Map headers, Map params, NetWorkListener listener); /** * 发送put请求；不带请求参数 @@ -252,7 +252,7 @@ public interface HttpService { * @param url 请求地址 * @return 统一消息返回报文 */ - Msg doPutWithEntity(String url); + Msg doPutWithResponse(String url); /** * 发送put请求；带请求参数 @@ -270,7 +270,7 @@ public interface HttpService { * @param params 请求参数 * @return 统一消息报文 */ - Msg doPutWithEntity(String url, Map params); + Msg doPutWithResponse(String url, Map params); /** * 发送delete请求；不带请求参数 @@ -286,7 +286,7 @@ public interface HttpService { * @param url 请求地址 * @return 统一返回报文 */ - Msg doDeleteWithEntity(String url); + Msg doDeleteWithResponse(String url); /** * 发送delete请求；带请求参数 @@ -305,7 +305,7 @@ public interface HttpService { * @param params 请求参数 * @return 统一返回报文 */ - Msg doDeleteWithEntity(String url, Map params); + Msg doDeleteWithResponse(String url, Map params); interface NetWorkListener { /** diff --git a/network-spring-boot-starter/src/main/java/com/hxuanyu/network/service/impl/HttpServiceImpl.java b/network-spring-boot-starter/src/main/java/com/hxuanyu/network/service/impl/HttpServiceImpl.java index 14a608f..7317cde 100644 --- a/network-spring-boot-starter/src/main/java/com/hxuanyu/network/service/impl/HttpServiceImpl.java +++ b/network-spring-boot-starter/src/main/java/com/hxuanyu/network/service/impl/HttpServiceImpl.java @@ -2,13 +2,12 @@ package com.hxuanyu.network.service.impl; import com.hxuanyu.common.message.Msg; import com.hxuanyu.network.service.HttpService; -import org.apache.http.HttpEntity; -import org.apache.http.HttpStatus; -import org.apache.http.NameValuePair; +import org.apache.http.*; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.*; import org.apache.http.client.utils.URIBuilder; +import org.apache.http.config.ConnectionConfig; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicNameValuePair; @@ -21,6 +20,7 @@ import org.springframework.stereotype.Service; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.net.URISyntaxException; import java.util.*; import java.util.concurrent.ExecutorService; @@ -56,9 +56,9 @@ public class HttpServiceImpl implements HttpService { @Override - public Msg doGetWithEntity(String url) { + public Msg doGetWithResponse(String url) { - return doGetWithEntity(url, null, null); + return doGetWithResponse(url, null, null); } @Override @@ -72,8 +72,8 @@ public class HttpServiceImpl implements HttpService { } @Override - public void doGetSyncWithEntity(String url, NetWorkListener listener) { - doGetSyncWithEntity(url, null, listener); + public void doGetSyncWithResponse(String url, NetWorkListener listener) { + doGetSyncWithResponse(url, null, listener); } @@ -83,8 +83,8 @@ public class HttpServiceImpl implements HttpService { } @Override - public Msg doGetWithEntity(String url, Map params) { - return doGetWithEntity(url, null, params); + public Msg doGetWithResponse(String url, Map params) { + return doGetWithResponse(url, null, params); } @Override @@ -93,54 +93,70 @@ public class HttpServiceImpl implements HttpService { } @Override - public void doGetSyncWithEntity(String url, Map params, NetWorkListener listener) { - doGetSyncWithEntity(url, null, params, listener); + public void doGetSyncWithResponse(String url, Map params, NetWorkListener listener) { + doGetSyncWithResponse(url, null, params, listener); } @Override public Msg doGet(String url, Map headers, Map params) { - Msg httpEntityMsg = doGetWithEntity(url, headers, params); - return getStringMsg(httpEntityMsg); - } - - @Override - public Msg doGetWithEntity(String url, Map headers, Map params) { // 创建httpClient对象 try (CloseableHttpClient httpClient = HttpClients.createDefault()) { // 创建访问的地址 - URIBuilder uriBuilder = new URIBuilder(url); - if (params != null) { - Set> entrySet = params.entrySet(); - for (Map.Entry entry : entrySet) { - uriBuilder.setParameter(entry.getKey(), entry.getValue()); - } - } - - // 创建http对象 - HttpGet httpGet = new HttpGet(uriBuilder.build()); - /* - * setConnectTimeout：设置连接超时时间，单位毫秒。 - * setConnectionRequestTimeout：设置从connect Manager(连接池)获取Connection - * 超时时间，单位毫秒。这个属性是新加的属性，因为目前版本是可以共享连接池的。 - * setSocketTimeout：请求获取数据的超时时间(即响应时间)，单位毫秒。 如果访问一个接口，多少时间内无法返回数据，就直接放弃此次调用。 - */ - RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(CONNECT_TIMEOUT).setSocketTimeout(SOCKET_TIMEOUT).build(); - httpGet.setConfig(requestConfig); - - // 设置请求头 - packageHeader(headers, httpGet); - + HttpGet httpGet = buildHttpGet(url, params, headers); // 创建httpResponse对象 CloseableHttpResponse httpResponse = null; // 执行请求并获得响应结果 + Msg httpClientResult = getHttpClientResult(httpClient, httpGet); + if (httpClientResult.isSuccess()) { + String result = EntityUtils.toString(httpClientResult.getData().getEntity()); + return Msg.success("请求成功[" + httpClientResult.getCode() + "]", result); + } else { + return Msg.failed("请求失败[" + httpClientResult.getCode() + "]"); + } + + } catch (Exception e) { + logger.error("请求过程出现异常: {}", e.getMessage()); + return Msg.failed("请求过程中出现异常" + e.getMessage()); + } + } + + @Override + public Msg doGetWithResponse(String url, Map headers, Map params) { + // 创建httpClient对象 + try (CloseableHttpClient httpClient = HttpClients.createDefault()) { + HttpGet httpGet = buildHttpGet(url, params, headers); + // 执行请求并获得响应结果 return getHttpClientResult(httpClient, httpGet); } catch (Exception e) { logger.error("请求过程出现异常: {}", e.getMessage()); - return Msg.failed("网络请求发生异常：" + e.getMessage()); + return Msg.failed("请求过程中出现异常" + e.getMessage()); } } + private HttpGet buildHttpGet(String url, Map params, Map headers) throws URISyntaxException { + // 创建访问的地址 + URIBuilder uriBuilder = new URIBuilder(url); + if (params != null) { + Set> entrySet = params.entrySet(); + for (Map.Entry entry : entrySet) { + uriBuilder.setParameter(entry.getKey(), entry.getValue()); + } + } + // 创建http对象 + HttpGet httpGet = new HttpGet(uriBuilder.build()); + RequestConfig requestConfig = RequestConfig + .custom() + .setConnectTimeout(CONNECT_TIMEOUT) + .setConnectionRequestTimeout(CONNECT_TIMEOUT) + .setSocketTimeout(SOCKET_TIMEOUT) + .build(); + httpGet.setConfig(requestConfig); + // 设置请求头 + packageHeader(headers, httpGet); + return httpGet; + } + @Override public void doGetSync(String url, Map headers, Map params, NetWorkListener listener) { @@ -161,10 +177,10 @@ public class HttpServiceImpl implements HttpService { } @Override - public void doGetSyncWithEntity(String url, Map headers, Map params, NetWorkListener listener) { + public void doGetSyncWithResponse(String url, Map headers, Map params, NetWorkListener listener) { executorService.execute(() -> { try { - Msg msg = doGetWithEntity(url, headers, params); + Msg msg = doGetWithResponse(url, headers, params); logger.debug("异步请求结果：{}", msg); if (msg.getCode().equals(Msg.MSG_CODE_SUCCESS)) { listener.onSuccess(msg); @@ -184,8 +200,8 @@ public class HttpServiceImpl implements HttpService { } @Override - public Msg doPostWithEntity(String url) { - return doPostWithEntity(url, null, null); + public Msg doPostWithResponse(String url) { + return doPostWithResponse(url, null, null); } @Override @@ -194,8 +210,8 @@ public class HttpServiceImpl implements HttpService { } @Override - public void doPostSyncWithEntity(String url, NetWorkListener listener) { - doPostSyncWithEntity(url, null, listener); + public void doPostSyncWithResponse(String url, NetWorkListener listener) { + doPostSyncWithResponse(url, null, listener); } @@ -205,8 +221,8 @@ public class HttpServiceImpl implements HttpService { } @Override - public Msg doPostWithEntity(String url, Map params) { - return doPostWithEntity(url, null, params); + public Msg doPostWithResponse(String url, Map params) { + return doPostWithResponse(url, null, params); } @Override @@ -215,40 +231,32 @@ public class HttpServiceImpl implements HttpService { } @Override - public void doPostSyncWithEntity(String url, Map params, NetWorkListener listener) { - doPostSyncWithEntity(url, null, params, listener); + public void doPostSyncWithResponse(String url, Map params, NetWorkListener listener) { + doPostSyncWithResponse(url, null, params, listener); } @Override public Msg doPost(String url, Map headers, Map params) { - Msg httpEntityMsg = doPostWithEntity(url, headers, params); - return getStringMsg(httpEntityMsg); + Msg httpResponseMsg = doPostWithResponse(url, headers, params); + String stringResult; + try { + stringResult = EntityUtils.toString(httpResponseMsg.getData().getEntity()); + return Msg.success("请求成功", stringResult); + } catch (IOException e) { + e.printStackTrace(); + return Msg.failed("转换字符串失败：" + e.getMessage()); + } } @Override - public Msg doPostWithEntity(String url, Map headers, Map params) { + public Msg doPostWithResponse(String url, Map headers, Map params) { // 创建httpClient对象 CloseableHttpClient httpClient = HttpClients.createDefault(); - // 创建http对象 HttpPost httpPost = new HttpPost(url); - /* - * setConnectTimeout：设置连接超时时间，单位毫秒。 - * setConnectionRequestTimeout：设置从connect Manager(连接池)获取Connection - * 超时时间，单位毫秒。这个属性是新加的属性，因为目前版本是可以共享连接池的。 - * setSocketTimeout：请求获取数据的超时时间(即响应时间)，单位毫秒。 如果访问一个接口，多少时间内无法返回数据，就直接放弃此次调用。 - */ RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(CONNECT_TIMEOUT).setSocketTimeout(SOCKET_TIMEOUT).build(); httpPost.setConfig(requestConfig); - // 设置请求头 -// httpPost.setHeader("Cookie", ""); -// httpPost.setHeader("Connection", "keep-alive"); -// httpPost.setHeader("Accept", "application/json"); -// httpPost.setHeader("Accept-Language", "zh-CN,zh;q=0.9"); -// httpPost.setHeader("Accept-Encoding", "gzip, deflate, br"); -// httpPost.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36"); packageHeader(headers, httpPost); - // 封装请求参数 try { packageParam(params, httpPost); @@ -279,10 +287,10 @@ public class HttpServiceImpl implements HttpService { } @Override - public void doPostSyncWithEntity(String url, Map headers, Map params, NetWorkListener listener) { + public void doPostSyncWithResponse(String url, Map headers, Map params, NetWorkListener listener) { executorService.execute(() -> { try { - Msg msg = doPostWithEntity(url, headers, params); + Msg msg = doPostWithResponse(url, headers, params); if (msg.getCode().equals(Msg.MSG_CODE_SUCCESS)) { listener.onSuccess(msg); } else if (msg.getCode().equals(Msg.MSG_CODE_FAILED)) { @@ -302,18 +310,26 @@ public class HttpServiceImpl implements HttpService { } @Override - public Msg doPutWithEntity(String url) { - return doPutWithEntity(url, null); + public Msg doPutWithResponse(String url) { + return doPutWithResponse(url, null); } @Override public Msg doPut(String url, Map params) { - Msg httpEntityMsg = doPutWithEntity(url, params); - return getStringMsg(httpEntityMsg); + Msg httpResponseMsg = doPutWithResponse(url, params); + String stringResult; + try { + stringResult = EntityUtils.toString(httpResponseMsg.getData().getEntity()); + return Msg.success("请求成功", stringResult); + } catch (IOException e) { + e.printStackTrace(); + return Msg.failed("转换字符串失败：" + e.getMessage()); + } } @Override - public Msg doPutWithEntity(String url, Map params) { + public Msg doPutWithResponse(String url, Map params) { + // 创建httpClient对象 CloseableHttpClient httpClient = HttpClients.createDefault(); HttpPut httpPut = new HttpPut(url); RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(CONNECT_TIMEOUT).setSocketTimeout(SOCKET_TIMEOUT).build(); @@ -331,32 +347,23 @@ public class HttpServiceImpl implements HttpService { } } - private String parseEntityToString(HttpEntity httpEntity) throws IOException { - return EntityUtils.toString(httpEntity, ENCODING); - } - private Msg getStringMsg(Msg httpEntityMsg) { - if (Msg.MSG_CODE_SUCCESS.equals(httpEntityMsg.getCode())) { - try { - String result = parseEntityToString(httpEntityMsg.getData()); - return Msg.success(httpEntityMsg.getMsg(), result); - } catch (IOException e) { - e.printStackTrace(); - return Msg.failed("转换字符串过程中发生异常：" + e.getMessage()); - } - } else { - return Msg.failed(httpEntityMsg.getMsg()); + @Override + public Msg doDelete(String url) { + Msg httpResponseMsg = doDeleteWithResponse(url); + String stringResult; + try { + stringResult = EntityUtils.toString(httpResponseMsg.getData().getEntity()); + return Msg.success("请求成功", stringResult); + } catch (IOException e) { + e.printStackTrace(); + return Msg.failed("转换字符串失败：" + e.getMessage()); } } @Override - public Msg doDelete(String url) { - Msg httpEntityMsg = doDeleteWithEntity(url); - return getStringMsg(httpEntityMsg); - } - - @Override - public Msg doDeleteWithEntity(String url) { + public Msg doDeleteWithResponse(String url) { + // 创建httpClient对象 CloseableHttpClient httpClient = HttpClients.createDefault(); HttpDelete httpDelete = new HttpDelete(url); RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(CONNECT_TIMEOUT).setSocketTimeout(SOCKET_TIMEOUT).build(); @@ -371,18 +378,25 @@ public class HttpServiceImpl implements HttpService { @Override public Msg doDelete(String url, Map params) { - Msg httpEntityMsg = doDeleteWithEntity(url, params); - return getStringMsg(httpEntityMsg); + Msg httpResponseMsg = doDeleteWithResponse(url, params); + String stringResult; + try { + stringResult = EntityUtils.toString(httpResponseMsg.getData().getEntity()); + return Msg.success("请求成功", stringResult); + } catch (IOException e) { + e.printStackTrace(); + return Msg.failed("转换字符串失败：" + e.getMessage()); + } } @Override - public Msg doDeleteWithEntity(String url, Map params){ + public Msg doDeleteWithResponse(String url, Map params) { if (params == null) { params = new HashMap<>(0); } params.put("_method", "delete"); - return doPostWithEntity(url, params); + return doPostWithResponse(url, params); } @@ -412,27 +426,15 @@ public class HttpServiceImpl implements HttpService { } } - private Msg getHttpClientResult(CloseableHttpClient httpClient, HttpRequestBase httpMethod) { + private Msg getHttpClientResult(CloseableHttpClient httpClient, HttpRequestBase httpMethod) throws IOException { // 执行请求 CloseableHttpResponse httpResponse; - try { - logger.info("执行请求：{}，请求方式：{}", httpMethod.getURI().toString(), httpMethod.getMethod()); - httpResponse = httpClient.execute(httpMethod); - // 获取返回结果 - if (httpResponse != null && httpResponse.getStatusLine() != null) { - HttpEntity content; - if (httpResponse.getEntity() != null) { - content = httpResponse.getEntity(); - return Msg.success(httpResponse.getStatusLine().getStatusCode() + "请求成功", content); - } - } - } catch (IOException e) { - e.printStackTrace(); - logger.error("请求过程中出现异常: {}", e.getMessage()); - return Msg.failed("请求过程出现异常" + e.getMessage()); + logger.info("执行请求：{}，请求方式：{}", httpMethod.getURI().toString(), httpMethod.getMethod()); + httpResponse = httpClient.execute(httpMethod); + // 获取返回结果 + if (httpResponse != null && httpResponse.getStatusLine() != null) { + return Msg.success("请求成功", httpResponse); } - - return Msg.failed(HttpStatus.SC_INTERNAL_SERVER_ERROR + "请求失败"); } diff --git a/test/src/test/java/com/hxuanyu/starter/test/OtherTest.java b/test/src/test/java/com/hxuanyu/starter/test/OtherTest.java new file mode 100644 index 0000000..14d065c --- /dev/null +++ b/test/src/test/java/com/hxuanyu/starter/test/OtherTest.java @@ -0,0 +1,51 @@ +package com.hxuanyu.starter.test; + +import org.apache.http.HttpEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.junit.jupiter.api.Test; + +import java.io.IOException; + +public class OtherTest { + + private static final String STATION_NAME_URL = "https://kyfw.12306.cn/otn/resources/js/framework/station_name.js?station_version=1.9226"; + + + @Test + public void testHttpClient() { + CloseableHttpClient httpclient = HttpClients.createDefault(); + try { + // 创建httpget. + HttpGet httpget = new HttpGet(STATION_NAME_URL); + System.out.println("executing request " + httpget.getURI()); + // 执行get请求. + try (CloseableHttpResponse response = httpclient.execute(httpget)) { + // 获取响应实体 + HttpEntity entity = response.getEntity(); + System.out.println("--------------------------------------"); + // 打印响应状态 + System.out.println(response.getStatusLine()); + if (entity != null) { + // 打印响应内容长度 + System.out.println("Response content length: " + entity.getContentLength()); + // 打印响应内容 + System.out.println("Response content: " + EntityUtils.toString(entity)); + } + System.out.println("------------------------------------"); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + // 关闭连接,释放资源 + try { + httpclient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } +} diff --git a/test/src/test/java/com/hxuanyu/starter/test/network/NetworkTest.java b/test/src/test/java/com/hxuanyu/starter/test/network/NetworkTest.java index 9001a2f..18c39ec 100644 --- a/test/src/test/java/com/hxuanyu/starter/test/network/NetworkTest.java +++ b/test/src/test/java/com/hxuanyu/starter/test/network/NetworkTest.java @@ -5,17 +5,11 @@ import com.hxuanyu.network.service.HttpService; import com.hxuanyu.test.MainApplication; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.web.WebAppConfiguration; -import java.util.HashMap; -import java.util.Map; - -import static java.lang.Thread.sleep; @SpringBootTest(classes = MainApplication.class) public class NetworkTest { @@ -24,18 +18,11 @@ public class NetworkTest { HttpService httpService; private final Logger logger = LoggerFactory.getLogger(NetworkTest.class); - private static final String STATION_NAME_URL = "https://kyfw.12306.cn/otn/resources/js/framework/station_name.js?station_version=1.9226"; - @Test @Timeout(3000) - public void testGet() throws InterruptedException { - Map header = new HashMap<>(1); -// header.put("Accept", "*/*"); - header.put("Connection", "keep-alive"); -// header.put("User-Agent", "PostmanRuntime/7.29.0"); -// header.put("Accept-Encoding", "gzip, deflate, br"); - Msg msg = httpService.doGet(STATION_NAME_URL, header, null); + public void testGet(){ + Msg msg = httpService.doGet("https://baidu.com"); logger.info("GET测试：{}", msg); assert msg.isSuccess(); }