记得上下班打卡 | git大法好,push需谨慎

Commit 6b4b0236 authored by 张国柄's avatar 张国柄

Merge remote-tracking branch 'origin/consumer_unite' into dev_bd_rm_consumer_od

parents 0e1bb449 8104eb9b
......@@ -2,7 +2,7 @@ package com.liquidnet.commons.lang.util;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.liquidnet.commons.lang.util.spring.RestTemplateConfig;
import com.liquidnet.commons.lang.util.spring.RestTemplateOkConfig;
import org.springframework.http.*;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
......@@ -20,9 +20,9 @@ public class HttpUtil {
static {
//apache httpClient
restTemplate = RestTemplateConfig.getRestTemplate();
// restTemplate = RestTemplateConfig.getRestTemplate();
// //okhttp3 client
// restTemplate = RestTemplateOkConfig.getRestTemplate();
restTemplate = RestTemplateOkConfig.getRestTemplate();
}
/**
......@@ -45,7 +45,7 @@ public class HttpUtil {
* @return
*/
public static String get(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
return request(url, params, headers, HttpMethod.GET);
return requestForGet(url, params, headers, HttpMethod.GET);
}
/**
......@@ -245,13 +245,29 @@ public class HttpUtil {
* @param method 请求方式
* @return
*/
public static String request(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers, HttpMethod method) {
private static String request(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers, HttpMethod method) {
if (params == null) {
params = new LinkedMultiValueMap<>();
}
return request(url, params, headers, method, MediaType.APPLICATION_FORM_URLENCODED);
}
/**
* 表单请求
*
* @param url
* @param params 请求参数
* @param headers 请求头
* @param method 请求方式
* @return
*/
private static String requestForGet(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers, HttpMethod method) {
if (params == null) {
params = new LinkedMultiValueMap<>();
}
return requestForGet(url, params, headers, method, MediaType.APPLICATION_FORM_URLENCODED);
}
/**
* http请求 通过uri
* @param url
......@@ -259,7 +275,7 @@ public class HttpUtil {
* @param method
* @return
*/
public static String request(URI url,MultiValueMap<String, String> headers, HttpMethod method) {
private static String request(URI url,MultiValueMap<String, String> headers, HttpMethod method) {
if (url == null) {
return null;
}
......@@ -286,13 +302,64 @@ public class HttpUtil {
* @param method 请求方式
* @return
*/
public static String requestRaw(String url, String params, MultiValueMap<String, String> headers, HttpMethod method) {
private static String requestRaw(String url, String params, MultiValueMap<String, String> headers, HttpMethod method) {
if (params == null) {
params = "";
}
return requestRaw(url, params, headers, method, MediaType.APPLICATION_JSON);
}
/**
* http请求
*
* @param url
* @param params 请求参数
* @param headers 请求头
* @param method 请求方式
* @param mediaType 参数类型
* @return
*/
private static String requestForGet(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
if (url == null || url.trim().isEmpty()) {
return null;
}
// header
HttpHeaders httpHeaders = new HttpHeaders();
if (headers != null) {
httpHeaders.addAll(headers);
}
HttpEntity<Object> httpEntity = new HttpEntity(httpHeaders);
MultiValueMap<String, String> multiValueMap = (MultiValueMap<String, String>)params;
String paramStr = "";
if(multiValueMap.size()>0) {
if (!url.contains("?")) {
// 提交方式:表单、json
for (String key : multiValueMap.keySet()) {
try {
String value = multiValueMap.get(key).get(0);
paramStr = paramStr.concat("&" + key + "=" + value);
} catch (Exception e) {
e.printStackTrace();
}
}
url = url.concat("?").concat(paramStr);
// System.out.println("url=="+url);
}
ResponseEntity<String> response = restTemplate.exchange(url, method, httpEntity, String.class);
return response.getBody();
}else{
// 提交方式:表单、json
ResponseEntity<String> response = restTemplate.exchange(url, method, httpEntity, String.class);
return response.getBody();
}
}
/**
* http请求
*
......@@ -303,7 +370,7 @@ public class HttpUtil {
* @param mediaType 参数类型
* @return
*/
public static String request(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
private static String request(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
if (url == null || url.trim().isEmpty()) {
return null;
}
......@@ -321,7 +388,7 @@ public class HttpUtil {
return response.getBody();
}
public static String requestRaw(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
private static String requestRaw(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
if (url == null || url.trim().isEmpty()) {
return null;
}
......
package com.liquidnet.service.goblin.test;
import com.liquidnet.common.third.zxlnft.biz.ZxlnftBiz;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: TestHttpUtil
* @Package com.liquidnet.service.goblin.test
* @Copyright: LightNet @ Copyright (c) 2022
* @date 2022/7/18 16:42
*/
@Slf4j
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest
public class TestHttpUtil {
@Autowired
private ZxlnftBiz zxlnftBiz;
@Test
public void testHttp(){
// LinkedMultiValueMap<String, String> headersMap = CollectionUtil.linkedMultiValueMapStringString();
// headersMap.add("Authorization", "APPCODE ".concat("1111"));
LinkedMultiValueMap<String, String> paramsMap = CollectionUtil.linkedMultiValueMapStringString();
paramsMap.add("identifyNum", "1111");
paramsMap.add("mobile", "12222");
paramsMap.add("userName", "12222");
//// paramsMap.add("identifyNum", cardNo);
//// paramsMap.add("mobile", mobile);
//// paramsMap.add("userName", realName);
MultiValueMap<String, String> commonHeader = new LinkedMultiValueMap();
zxlnftBiz.buildHeader(commonHeader);
MultiValueMap<String, String> params = new LinkedMultiValueMap();
params.add("addressList", "ZXb8602b785235f89aaa6cc4dc2df800d4490079c2");
String rs = HttpUtil.get("https://nfttest2.zxinchain.com/api/v1/nft/identity/bind/query", params, commonHeader);
// String rs = HttpUtil.get("https://nfttest2.zxinchain.com/api/v1/nft/identity/bind/query?addressList=ZXb8602b785235f89aaa6cc4dc2df800d4490079c2", params, commonHeader);
System.out.println("结果==="+rs);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment