message_bus / message_bus_sdk · 提交

转到一个项目

作者 王勇
提交 dfbcd17a3436a2c2425abbf8dbed69c3a929268c 1 个父辈 bb75779d

sdk，初步完成

内嵌 并排对比
正在显示 8 个修改的文件 包含 474 行增加 和 128 行删除
package com.sunyo.wlpt.message.bus.sdk;
import com.sunyo.wlpt.message.bus.sdk.request.MessageRequest;
import com.sunyo.wlpt.message.bus.sdk.response.BusResult;
import java.io.IOException;
/**
* @author 子诚
* Description：
* 时间：2020/9/7 11:00
*/
public class App {
public static void main(String[] args) throws IOException
public static void main(String[] args)
{
MessageRequest request = new MessageRequest();
BusResult resultOne = request.getMessageOne("zicheng", "S_zicheng",
"V_zicheng", "V_zicheng_zicheng_R");
BusResult resultMore = request.getMessageMore("zicheng", "S_zicheng",
"V_zicheng", "V_zicheng_zicheng_R", 5);
System.out.println(resultOne);
System.out.println(resultMore);
MyTestMethods myTestMethods = new MyTestMethods();
// BusResult busResult = myTestMethods.product_old();
// BusResult busResult2 = myTestMethods.product_new();
// BusResult busResult3 = myTestMethods.consumerOne();
// System.out.println(busResult3);
BusResult busResult4 = myTestMethods.consumerMore();
System.out.println(busResult4);
}
}
... ...
package com.sunyo.wlpt.message.bus.sdk;
import com.sunyo.wlpt.message.bus.sdk.request.MessageRequest;
import com.sunyo.wlpt.message.bus.sdk.response.BusResult;
import java.io.IOException;
/**
* @author 子诚
* Description：
* 时间：2020/9/7 14:36
*/
public class MyTestMethods {
private static final String url_product_new = "http://192.168.1.53:12343/message-bus-send/bus/rabbit/product_new";
private static final String url_product_old = "http://192.168.1.53:12343/message-bus-send/bus/rabbit/product_old";
private static final String url_consumer_one = "http://192.168.1.53:12343/message-bus-receive/bus/rabbit/consumer_one";
private static final String url_consumer_more = "http://192.168.1.53:12343/message-bus-receive/bus/rabbit/consumer_more2";
private static final String token =
"Bearer eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJ6aWNoZW5nIiwiZXhwIjoxNTk5NDk3MzU1fQ.YI69vs8pV99v7hnt6xGX5c4wvMPBj6tgsjiI4JJbW2Irj-sUW1stskQ25-G5cDRI-qoZFQTlvRvGVFR97arFD9gwAIB8Gfz4Sog-QC1wLDS3xStvygsCDabQmaF8JaE_zWbtJ7Izs7Jd45VOiI4CS_uZY5dsgODB5IqW1hwj-JY";
/**
* 报文消息发送
*
* @return
*/
public BusResult product_old()
{
long start = System.currentTimeMillis();
String content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <MSG> <META> <SNDR>zicheng</SNDR> \t\t<RCVR></RCVR> \t\t<DDTM>20200902164413</DDTM> \t\t<TYPE>E_zicheng</TYPE> \t\t<STYP>R_zicheng</STYP> \t\t<SEQN>本性难移</SEQN> \t\t<TOKN>江山易老</TOKN> \t\t<VSHT>V_zicheng</VSHT> \t\t<SERV>S_zicheng</SERV> \t</META> \t<BODY>中元节，即是鬼节</BODY> </MSG>";
MessageRequest messageRequest = new MessageRequest();
BusResult busResult = messageRequest.sendMessage(url_product_old, token, content);
long end = System.currentTimeMillis();
System.out.println("发送一条报文消息，耗时：" + (end - start) + "毫秒");
return busResult;
}
public BusResult product_new()
{
long start = System.currentTimeMillis();
MessageRequest messageRequest = new MessageRequest();
BusResult busResult = messageRequest.sendMessage(url_product_new, "S_zicheng", "V_zicheng", "E_zicheng", "R_zicheng", "江山易老，本性难移", "zicheng"
, "20200907164413", token, "序列号");
long end = System.currentTimeMillis();
System.out.println("发送一条参数消息，耗时：" + (end - start) + "毫秒");
return busResult;
}
public BusResult consumerOne()
{
long start = System.currentTimeMillis();
MessageRequest messageRequest = new MessageRequest();
BusResult busResult = messageRequest.getMessageOne(url_consumer_one, token, "zicheng", "S_zicheng", "V_zicheng", "V_zicheng_zicheng_R");
long end = System.currentTimeMillis();
System.out.println("接收一条消息，耗时：" + (end - start) + "毫秒");
return busResult;
}
public BusResult consumerMore()
{
int num = 100;
long start = System.currentTimeMillis();
MessageRequest messageRequest = new MessageRequest();
BusResult busResult = messageRequest.getMessageMore(url_consumer_more, token, "zicheng", "S_zicheng",
"V_zicheng", "V_zicheng_zicheng_R",
num);
long end = System.currentTimeMillis();
System.out.println("接收" + num + "条消息，耗时：" + (end - start) + "毫秒");
return busResult;
}
}
... ...
package com.sunyo.wlpt.message.bus.sdk;
import com.sunyo.wlpt.message.bus.sdk.request.MessageRequest;
import com.sunyo.wlpt.message.bus.sdk.response.BusResult;
import com.sunyo.wlpt.message.bus.sdk.utils.GsonUtil;
import sun.security.krb5.internal.Ticket;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.concurrent.*;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
/**
* @author 子诚
* Description：
* 时间：2020/9/7 10:34
*/
public class Test2 {
public static void main(String[] args) throws IOException
{
// 1031 15:45:58 15:48:57
Test2 t2 = new Test2();
t2.moreThread();
}
void moreThread()
{
Tickets thread = new Tickets();
ExecutorService executorService = new ThreadPoolExecutor(
32, 64,
0L,
TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<>(10),
Executors.defaultThreadFactory(),
new ThreadPoolExecutor.AbortPolicy());
for (int i = 0; i < 32; i++) {
executorService.submit(thread);
}
executorService.shutdown();
}
}
class Tickets implements Runnable {
private int ticket = 1000;
@Override
public void run()
{
while (true) {
try {
if (ticket <= 0) {
break;
}
MyTestMethods myTestMethods = new MyTestMethods();
// 发送一条报文消息
BusResult busResult = myTestMethods.product_old();
System.out.println(Thread.currentThread().getName() + "发送了第" + ticket + "条消息");
ticket--;
} finally {
}
}
}
}
... ...
package com.sunyo.wlpt.message.bus.sdk.request;
import com.sunyo.wlpt.message.bus.sdk.response.ResultJson;
import com.sunyo.wlpt.message.bus.sdk.utils.GsonUtil;
import com.sunyo.wlpt.message.bus.sdk.utils.OkHttpUtils;
import okhttp3.MediaType;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.HashMap;
import java.util.Properties;
/**
* @author 子诚
* Description：
* 时间：2020/9/3 15:18
*/
public class BusMessage {
/**
* 指定队列，接收一条消息
*
* @param RUSR 接收者
* @param SERV 服务器名称
* @param VSHT 虚拟主机名称
* @param RCVR 队列名称
* @return
* @throws IOException
*/
public static ResultJson consumerOne(String RUSR, String SERV, String VSHT, String RCVR) throws IOException
{
HashMap<String, Object> params = new HashMap<>();
params.put("RUSR", RUSR);
params.put("SERV", SERV);
params.put("VSHT", VSHT);
params.put("RCVR", RCVR);
OkHttpUtils okHttp = new OkHttpUtils();
String url_consumer_one = getUrl("URL_CONSUMER_ONE");
String json = okHttp.doGet(url_consumer_one, params);
ResultJson result = GsonUtil.GsonToBean(json, ResultJson.class);
return result;
}
/**
* 指定队列，接收多条消息
*
* @param RUSR 接收者
* @param SERV 服务器名称
* @param VSHT 虚拟主机名称
* @param RCVR 队列名称
* @param CUNT 接收消息的数量
* @return
* @throws IOException
*/
public static ResultJson consumerMore(String RUSR, String SERV, String VSHT, String RCVR, Integer CUNT) throws IOException
{
HashMap<String, Object> params = new HashMap<>();
params.put("RUSR", RUSR);
params.put("SERV", SERV);
params.put("VSHT", VSHT);
params.put("RCVR", RCVR);
params.put("CUNT", CUNT);
OkHttpUtils okHttp = new OkHttpUtils();
String url_consumer_more = getUrl("URL_CONSUMER_MORE");
String json = okHttp.doGet(url_consumer_more, params);
ResultJson result = GsonUtil.GsonToBean(json, ResultJson.class);
return result;
}
/**
* 根据url名称，动态获取url
*
* @param urlName url名称
* @return url信息
* @throws IOException
*/
public static String getUrl(String urlName) throws IOException
{
Properties properties = new Properties();
FileInputStream fis = new FileInputStream("config\\url.properties");
properties.load(fis);
fis.close();
String url = properties.getProperty(urlName);
return url;
}
}
... ... @@ -4,6 +4,7 @@ import com.sunyo.wlpt.message.bus.sdk.response.BusResult;
import com.sunyo.wlpt.message.bus.sdk.response.ResultJson;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.List;
/**
... ... @@ -12,8 +13,106 @@ import java.util.List;
* 时间：2020/9/3 18:04
*/
public class MessageRequest {
private static final String SUCCESS_SEND_CODE = "10200";
private static final String SUCCESS_RECEIVE_CODE = "20200";
private static final String SUCCESS_ONE_CODE = "20200";
/**
* 发送消息,xml报文形式
*
* @param xmlMessage xml报文
* @return
* @throws IOException
*/
public BusResult sendMessage(String url, String token, String xmlMessage)
{
MessageService messageService = new MessageService();
ResultJson resultJson = messageService.productOld(url, token, xmlMessage);
if (resultJson == null) {
BusResult result = new BusResult(false, "10400", "请检查url、token以及以及报文格式");
return result;
}
String code = resultJson.getCode();
String msg = resultJson.getMsg();
if (!SUCCESS_SEND_CODE.equals(resultJson.getCode())) {
String resultMessage = "错误代码:" + code + ";错误信息:" + msg;
BusResult errorResult = new BusResult(false, code, resultMessage);
return errorResult;
}
BusResult result = new BusResult(true, code, msg);
return result;
}
final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/**
* 发送消息，根据参数
*
* @param SERV 服务器名称
* @param VSHT 虚拟主机名称
* @param TYPE 大类型（交换机名称）
* @param STYP 小类型（路由键名称）
* @param MSG 发送消息内容
* @param SNDR 发送者名称
* @param DDTM yyyyMMddHHmmss格式的发送时间
* @param TOKN token令牌
* @param SEQN 序列号
* @param RCVR 指定接收队列（非必须）
* @return
* @throws IOException
*/
public BusResult sendMessage(String url, String SERV, String VSHT, String TYPE, String STYP, String MSG,
String SNDR, String DDTM, String TOKN, String SEQN, String RCVR)
{
ResultJson resultJson = MessageService.productNew(url, SERV, VSHT, TYPE, STYP, MSG, SNDR, DDTM, TOKN, SEQN, RCVR);
if (resultJson == null) {
BusResult result = new BusResult(false, "10400", "请检查url、token以及以及参数内容与位置");
return result;
}
String code = resultJson.getCode();
String msg = resultJson.getMsg();
if (!SUCCESS_SEND_CODE.equals(resultJson.getCode())) {
String resultMessage = "错误代码:" + code + ";错误信息:" + msg;
BusResult errorResult = new BusResult(false, code, resultMessage);
return errorResult;
}
BusResult result = new BusResult(true, code, msg);
return result;
}
/**
* 发送消息，根据参数
*
* @param SERV 服务器名称
* @param VSHT 虚拟主机名称
* @param TYPE 大类型（交换机名称）
* @param STYP 小类型（路由键名称）
* @param MSG 发送消息内容
* @param SNDR 发送者名称
* @param DDTM yyyyMMddHHmmss格式的发送时间
* @param TOKN token令牌
* @param SEQN 序列号
* @return
* @throws IOException
*/
public BusResult sendMessage(String url, String SERV, String VSHT, String TYPE, String STYP,
String MSG, String SNDR, String DDTM, String TOKN, String SEQN)
{
ResultJson resultJson = MessageService.productNew(url, SERV, VSHT, TYPE, STYP, MSG, SNDR, DDTM, TOKN, SEQN);
if (resultJson == null) {
BusResult result = new BusResult(false, "10400", "请检查url、token以及以及参数内容与位置");
return result;
}
String code = resultJson.getCode();
String msg = resultJson.getMsg();
if (!SUCCESS_SEND_CODE.equals(resultJson.getCode())) {
String resultMessage = "错误代码:" + code + ";错误信息:" + msg;
BusResult errorResult = new BusResult(false, code, resultMessage);
return errorResult;
}
BusResult result = new BusResult(true, code, msg);
return result;
}
/**
* 接收消息，一条
... ... @@ -24,15 +123,16 @@ public class MessageRequest {
* @param RCVR 接收队列名称
* @return
*/
public BusResult getMessageOne(String RUSR, String SERV, String VSHT, String RCVR) throws IOException
public BusResult getMessageOne(String url, String token, String RUSR, String SERV, String VSHT, String RCVR)
{
ResultJson resultJson = BusMessage.consumerOne(RUSR, SERV, VSHT, RCVR);
ResultJson resultJson = MessageService.consumerOne(url, token, RUSR, SERV, VSHT, RCVR);
if (resultJson == null) {
BusResult result = new BusResult(false, "20400", "请检查url、token以及以及参数内容与位置");
return result;
}
String code = resultJson.getCode();
String msg = resultJson.getMsg();
if (!SUCCESS_ONE_CODE.equals(resultJson.getCode())) {
if (!SUCCESS_RECEIVE_CODE.equals(resultJson.getCode())) {
String resultMessage = "错误代码:" + code + ";错误信息:" + msg;
BusResult errorResult = new BusResult(false, code, resultMessage);
return errorResult;
... ... @@ -42,16 +142,27 @@ public class MessageRequest {
return result;
}
public BusResult getMessageMore(String RUSR, String SERV, String VSHT, String RCVR, Integer CUNT) throws IOException
/**
* 接收消息，多条
*
* @param RUSR 接收人名称
* @param SERV 服务器名称
* @param VSHT 虚拟主机名称
* @param RCVR 接收队列名称
* @param CUNT 消息的数量
* @return
* @throws IOException
*/
public BusResult getMessageMore(String url, String token, String RUSR, String SERV, String VSHT, String RCVR, Integer CUNT)
{
ResultJson resultJson = BusMessage.consumerMore(RUSR, SERV, VSHT, RCVR, CUNT);
ResultJson resultJson = MessageService.consumerMore(url, token, RUSR, SERV, VSHT, RCVR, CUNT);
if (resultJson == null) {
BusResult result = new BusResult(false, "20400", "请检查url、token以及以及参数内容与位置");
return result;
}
String code = resultJson.getCode();
String msg = resultJson.getMsg();
if (!SUCCESS_ONE_CODE.equals(resultJson.getCode())) {
if (!SUCCESS_RECEIVE_CODE.equals(resultJson.getCode())) {
String resultMessage = "错误代码:" + code + ";错误信息:" + msg;
BusResult errorResult = new BusResult(false, code, resultMessage);
return errorResult;
... ... @@ -60,4 +171,6 @@ public class MessageRequest {
BusResult result = new BusResult(true, code, msg, dataList);
return result;
}
}
... ...
package com.sunyo.wlpt.message.bus.sdk.request;
import com.sunyo.wlpt.message.bus.sdk.response.ResultJson;
import com.sunyo.wlpt.message.bus.sdk.utils.GsonUtil;
import com.sunyo.wlpt.message.bus.sdk.utils.OkHttpUtils;
import org.springframework.util.StringUtils;
import java.io.IOException;
import java.util.HashMap;
/**
* @author 子诚
* Description：
* 时间：2020/9/3 15:18
*/
public class MessageService {
/**
* 发送消息，根据参数
*
* @param url 地址
* @param SERV 服务器名称
* @param VSHT 虚拟主机名称
* @param TYPE 大类型（交换机名称）
* @param STYP 小类型（路由键名称）
* @param MSG 发送消息内容
* @param SNDR 发送者名称
* @param DDTM yyyyMMddHHmmss格式的发送时间
* @param TOKN token令牌
* @param SEQN 序列号
* @param RCVR 指定接收队列（非必须）
* @return
* @throws IOException
*/
public static ResultJson productNew(String url, String SERV, String VSHT, String TYPE, String STYP,
String MSG, String SNDR, String DDTM, String TOKN, String SEQN, String RCVR)
{
HashMap<String, String> params = new HashMap<>();
params.put("SERV", SERV);
params.put("VSHT", VSHT);
params.put("TYPE", TYPE);
params.put("STYP", STYP);
params.put("MSG", MSG);
params.put("SNDR", SNDR);
params.put("DDTM", DDTM);
params.put("TOKN", TOKN);
params.put("SEQN", SEQN);
params.put("RCVR", RCVR);
OkHttpUtils okHttp = new OkHttpUtils();
String json = okHttp.doPostForm(url, TOKN, params);
if (StringUtils.isEmpty(json)) {
return new ResultJson<>("10400", "请检查url、token以及以及参数内容与位置");
}
ResultJson result = GsonUtil.GsonToBean(json, ResultJson.class);
return result;
}
/**
* 发送消息，根据参数
*
* @param url 地址
* @param SERV 服务器名称
* @param VSHT 虚拟主机名称
* @param TYPE 大类型（交换机名称）
* @param STYP 小类型（路由键名称）
* @param MSG 发送消息内容
* @param SNDR 发送者名称
* @param DDTM yyyyMMddHHmmss格式的发送时间
* @param TOKN token令牌
* @param SEQN 序列号
* @return
* @throws IOException
*/
public static ResultJson productNew(String url, String SERV, String VSHT, String TYPE, String STYP,
String MSG, String SNDR, String DDTM, String TOKN, String SEQN)
{
HashMap<String, String> params = new HashMap<>();
params.put("SERV", SERV);
params.put("VSHT", VSHT);
params.put("TYPE", TYPE);
params.put("STYP", STYP);
params.put("MSG", MSG);
params.put("SNDR", SNDR);
params.put("DDTM", DDTM);
params.put("TOKN", TOKN);
params.put("SEQN", SEQN);
OkHttpUtils okHttp = new OkHttpUtils();
String json = okHttp.doPostForm(url, TOKN, params);
if (StringUtils.isEmpty(json)) {
return new ResultJson<>("10400", "请检查url、token以及以及参数内容与位置");
}
ResultJson result = GsonUtil.GsonToBean(json, ResultJson.class);
return result;
}
/**
* 发送消息,xml报文形式
*
* @param xmlMessage xml报文
* @return
* @throws IOException
*/
public ResultJson productOld(String url, String token, String xmlMessage)
{
HashMap<String, String> params = new HashMap<>();
params.put("xmlMessage", xmlMessage);
OkHttpUtils okHttp = new OkHttpUtils();
String json = okHttp.doPostForm(url, token, params);
if (StringUtils.isEmpty(json)) {
return new ResultJson<>("10400", "请检查url、token以及报文格式");
}
ResultJson result = GsonUtil.GsonToBean(json, ResultJson.class);
return result;
}
/**
* 指定队列，接收一条消息
*
* @param RUSR 接收者
* @param SERV 服务器名称
* @param VSHT 虚拟主机名称
* @param RCVR 队列名称
* @return
* @throws IOException
*/
public static ResultJson consumerOne(String url, String token, String RUSR, String SERV, String VSHT, String RCVR)
{
HashMap<String, Object> params = new HashMap<>();
params.put("RUSR", RUSR);
params.put("SERV", SERV);
params.put("VSHT", VSHT);
params.put("RCVR", RCVR);
OkHttpUtils okHttp = new OkHttpUtils();
String json = okHttp.doGet(url, token, params);
if (StringUtils.isEmpty(json)) {
return new ResultJson<>("20400", "请检查url、token以及以及参数内容与位置");
}
ResultJson result = GsonUtil.GsonToBean(json, ResultJson.class);
return result;
}
/**
* 指定队列，接收多条消息
*
* @param RUSR 接收者
* @param SERV 服务器名称
* @param VSHT 虚拟主机名称
* @param RCVR 队列名称
* @param CUNT 接收消息的数量
* @return
* @throws IOException
*/
public static ResultJson consumerMore(String url, String token, String RUSR, String SERV, String VSHT, String RCVR, Integer CUNT)
{
HashMap<String, Object> params = new HashMap<>();
params.put("RUSR", RUSR);
params.put("SERV", SERV);
params.put("VSHT", VSHT);
params.put("RCVR", RCVR);
params.put("CUNT", CUNT);
OkHttpUtils okHttp = new OkHttpUtils();
String json = okHttp.doGet(url, token, params);
if (StringUtils.isEmpty(json)) {
return new ResultJson<>("20400", "请检查url、token以及以及参数内容与位置");
}
ResultJson result = GsonUtil.GsonToBean(json, ResultJson.class);
return result;
}
}
... ...
... ... @@ -59,6 +59,11 @@ public class BusResult {
this.dataList = dataList;
}
public BusResult()
{
}
public Boolean getOk()
{
return isOk;
... ...
package com.sunyo.wlpt.message.bus.sdk.utils;
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import java.net.URLEncoder;
... ... @@ -15,8 +15,9 @@ import java.util.concurrent.TimeUnit;
* Description：
* 时间：2020/9/3 15:22
*/
@Slf4j
public class OkHttpUtils {
private static Logger log = Logger.getLogger(OkHttpUtils.class);
private static final MediaType MEDIA_TYPE_JSON = MediaType.parse("application/json; charset=utf-8");
private static final MediaType MEDIA_TYPE_TEXT = MediaType.parse("application/x-www-form-urlencoded; charset=utf-8");
... ... @@ -28,11 +29,11 @@ public class OkHttpUtils {
{
okHttpClient = new OkHttpClient.Builder()
//10秒连接超时
.connectTimeout(10, TimeUnit.SECONDS)
.connectTimeout(60, TimeUnit.SECONDS)
//10m秒写入超时
.writeTimeout(10, TimeUnit.SECONDS)
.writeTimeout(600, TimeUnit.SECONDS)
//10秒读取超时
.readTimeout(10, TimeUnit.SECONDS)
.readTimeout(600, TimeUnit.SECONDS)
.build();
}
... ... @@ -57,12 +58,12 @@ public class OkHttpUtils {
return commonRequest(request);
}
public String doGet(String url, HashMap<String, Object> params)
public String doGet(String url, String token, HashMap<String, Object> params)
{
if (isBlankUrl(url)) {
return null;
}
Request request = getRequestForGet(url, params);
Request request = getRequestForGet(url, token, params);
return commonRequest(request);
}
... ... @@ -75,21 +76,21 @@ public class OkHttpUtils {
return commonRequest(request);
}
public String doPostForm(String url, Map<String, String> params)
public String doPostForm(String url, String token, Map<String, String> params)
{
if (isBlankUrl(url)) {
return null;
}
Request request = getRequestForPostForm(url, params);
Request request = getRequestForPostForm(url, token, params);
return commonRequest(request);
}
private Boolean isBlankUrl(String url)
{
if (StringUtils.isBlank(url)) {
log.info("url is not blank");
return true;
} else {
log.info("url is blank-->" + url);
return false;
}
}
... ... @@ -102,12 +103,12 @@ public class OkHttpUtils {
Response response = call.execute();
if (response.isSuccessful()) {
re = response.body().string();
// log.info("request url:{};response:{}", request.url().toString(), re);
} else {
// log.info("request failure url:{};message:{}", request.url().toString(), response.message());
log.error("request failure url:{};message:{}", request.url().toString(), response.message());
}
} catch (Exception e) {
log.error("request execute failure", e);
System.out.println("失败");
}
return re;
}
... ... @@ -123,7 +124,7 @@ public class OkHttpUtils {
}
private Request getRequestForPostForm(String url, Map<String, String> params)
private Request getRequestForPostForm(String url, String token, Map<String, String> params)
{
if (params == null) {
params = new HashMap<>();
... ... @@ -137,15 +138,17 @@ public class OkHttpUtils {
RequestBody requestBody = builder.build();
Request request = new Request.Builder()
.url(url)
.addHeader("Authorization", token)
.post(requestBody)
.build();
return request;
}
private Request getRequestForGet(String url, HashMap<String, Object> params)
private Request getRequestForGet(String url, String token, HashMap<String, Object> params)
{
Request request = new Request.Builder()
.url(getUrlStringForGet(url, params))
.addHeader("Authorization", token)
.build();
return request;
}
... ... @@ -166,7 +169,6 @@ public class OkHttpUtils {
if (params != null && params.size() > 0) {
for (Map.Entry<String, Object> entry : params.entrySet()) {
try {
urlBuilder.append("&").append(entry.getKey()).append("=").append(
"CUNT".equals(entry.getKey())
? entry.getValue()
... ...