diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java index 6d53d093..dd15db52 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java @@ -1,5 +1,6 @@ package org.dromara.sms4j.aliyun.service; +import cn.hutool.core.map.MapUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; @@ -100,7 +101,7 @@ public class AlibabaSmsImpl extends AbstractSmsBlend { } log.debug("requestUrl {}", requestUrl); - Map headers = new LinkedHashMap<>(1); + Map headers = MapUtil.newHashMap(1, true); headers.put("Content-Type", Constant.FROM_URLENCODED); SmsResponse smsResponse; try { diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/config/CloopenFactory.java b/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/config/CloopenFactory.java index b1c0353a..af092503 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/config/CloopenFactory.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/config/CloopenFactory.java @@ -19,6 +19,7 @@ public class CloopenFactory extends AbstractProviderFactory { @Override public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { CloopenHelper helper = new CloopenHelper(getConfig(), http); - Map paramMap = new LinkedHashMap<>(4); + Map paramMap = MapUtil.newHashMap(4, true); paramMap.put("to", String.join(",", phones)); paramMap.put("appId", getConfig().getSdkAppId()); paramMap.put("templateId", templateId); diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java b/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java index 10a450ef..2a525cb8 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java @@ -3,6 +3,7 @@ package org.dromara.sms4j.cloopen.util; import cn.hutool.core.codec.Base64; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.json.JSONObject; import lombok.extern.slf4j.Slf4j; @@ -42,7 +43,7 @@ public class CloopenHelper { config.getBaseUrl(), config.getAccessKeyId(), this.generateSign(config.getAccessKeyId(), config.getAccessKeySecret(), timestamp)); - Map headers = new LinkedHashMap<>(3); + Map headers = MapUtil.newHashMap(3, true); headers.put("Accept", Constant.ACCEPT); headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8); headers.put("Authorization", this.generateAuthorization(config.getAccessKeyId(), timestamp)); diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/service/DingZhongSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/service/DingZhongSmsImpl.java index 14de7742..efdeed23 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/service/DingZhongSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/service/DingZhongSmsImpl.java @@ -1,5 +1,6 @@ package org.dromara.sms4j.dingzhong.service; +import cn.hutool.core.map.MapUtil; import cn.hutool.json.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; @@ -52,7 +53,7 @@ public class DingZhongSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String message) { DingZhongHelper helper = new DingZhongHelper(getConfig(), http); - Map paramMap = new LinkedHashMap<>(4); + Map paramMap = MapUtil.newHashMap(4, true); paramMap.put("cdkey", getConfig().getAccessKeyId()); paramMap.put("password", getConfig().getAccessKeySecret()); paramMap.put("mobile", phone); @@ -68,7 +69,7 @@ public class DingZhongSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { DingZhongHelper helper = new DingZhongHelper(getConfig(), http); - Map paramMap = new LinkedHashMap<>(5); + Map paramMap = MapUtil.newHashMap(5, true); paramMap.put("cdkey", getConfig().getAccessKeyId()); paramMap.put("password", getConfig().getAccessKeySecret()); paramMap.put("mobile", phone); diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/util/DingZhongHelper.java b/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/util/DingZhongHelper.java index 83f783c7..e67a35cc 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/util/DingZhongHelper.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/dingzhong/util/DingZhongHelper.java @@ -1,5 +1,6 @@ package org.dromara.sms4j.dingzhong.util; +import cn.hutool.core.map.MapUtil; import cn.hutool.json.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; @@ -32,7 +33,7 @@ public class DingZhongHelper { public SmsResponse smsResponse(Map paramMap) { String url = String.format("%s/%s", config.getRequestUrl(), SmsUtils.isEmpty(paramMap.get("templateId"))?config.getBaseAction():config.getTemplateAction()); - Map headers = new LinkedHashMap<>(2); + Map headers = MapUtil.newHashMap(2, true); headers.put("Accept", Constant.ACCEPT); headers.put("Content-Type", Constant.FROM_URLENCODED); SmsResponse smsResponse = null; diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java index a0e8e644..2a1aae6e 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java @@ -1,5 +1,6 @@ package org.dromara.sms4j.emay.service; +import cn.hutool.core.map.MapUtil; import cn.hutool.json.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; @@ -46,7 +47,7 @@ public class EmaySmsImpl extends AbstractSmsBlend { String url = getConfig().getRequestUrl(); Map params = EmayBuilder.buildRequestBody(getConfig().getAccessKeyId(), getConfig().getAccessKeySecret(), phone, message); - Map headers = new LinkedHashMap<>(1); + Map headers = MapUtil.newHashMap(1, true); headers.put("Content-Type", Constant.FROM_URLENCODED); SmsResponse smsResponse; try { diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java index 9c5f8d69..9e394d73 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java @@ -1,6 +1,7 @@ package org.dromara.sms4j.huawei.service; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.json.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; @@ -65,7 +66,7 @@ public class HuaweiSmsImpl extends AbstractSmsBlend { String mess = listToString(list); String requestBody = HuaweiBuilder.buildRequestBody(getConfig().getSender(), phone, templateId, mess, getConfig().getStatusCallBack(), getConfig().getSignature()); - Map headers = new LinkedHashMap<>(3); + Map headers = MapUtil.newHashMap(3, true); headers.put("Authorization", Constant.HUAWEI_AUTH_HEADER_VALUE); headers.put("X-WSSE", HuaweiBuilder.buildWsseHeader(getConfig().getAccessKeyId(), getConfig().getAccessKeySecret())); headers.put("Content-Type", Constant.FROM_URLENCODED); diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/netease/service/NeteaseSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/netease/service/NeteaseSmsImpl.java index 85630caa..33142737 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/netease/service/NeteaseSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/netease/service/NeteaseSmsImpl.java @@ -2,6 +2,7 @@ package org.dromara.sms4j.netease.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; @@ -109,7 +110,7 @@ public class NeteaseSmsImpl extends AbstractSmsBlend { String nonce = IdUtil.fastSimpleUUID(); String curTime = String.valueOf(DateUtil.currentSeconds()); String checkSum = NeteaseUtils.getCheckSum(getConfig().getAccessKeySecret(), nonce, curTime); - Map body = new LinkedHashMap<>(4); + Map body = MapUtil.newHashMap(4, true); body.put("templateid", templateId); JSONArray jsonArray = new JSONArray(); jsonArray.addAll(phones); @@ -117,7 +118,7 @@ public class NeteaseSmsImpl extends AbstractSmsBlend { body.put("params", message); body.put("needUp", getConfig().getNeedUp()); - Map headers = new LinkedHashMap<>(5); + Map headers = MapUtil.newHashMap(5, true); headers.put("Content-Type", Constant.FROM_URLENCODED); headers.put("AppKey", getConfig().getAccessKeyId()); headers.put("Nonce", nonce); diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java index cb19c1c8..41cdb27b 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java @@ -1,5 +1,6 @@ package org.dromara.sms4j.unisms.service; +import cn.hutool.core.map.MapUtil; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.comm.constant.SupplierConstant; @@ -58,9 +59,9 @@ public class UniSmsImpl extends AbstractSmsBlend { @Override public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { if (Objects.isNull(messages)){ - messages = new LinkedHashMap(); + messages = new LinkedHashMap<>(); } - Map data = new LinkedHashMap<>(4); + Map data = MapUtil.newHashMap(4, true); data.put("to", Collections.singletonList(phone)); data.put("signature", getConfig().getSignature()); data.put("templateId", templateId); @@ -83,7 +84,7 @@ public class UniSmsImpl extends AbstractSmsBlend { if (phones.size() > 1000) { throw new SmsBlendException("单次发送超过最大发送上限,建议每次群发短信人数低于1000"); } - Map data = new LinkedHashMap<>(4); + Map data = MapUtil.newHashMap(4, true); data.put("to", phones); data.put("signature", getConfig().getSignature()); data.put("templateId", templateId); diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/service/ZhutongSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/service/ZhutongSmsImpl.java index 662766df..6e34eb49 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/service/ZhutongSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/zhutong/service/ZhutongSmsImpl.java @@ -2,6 +2,7 @@ package org.dromara.sms4j.zhutong.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; @@ -139,7 +140,7 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { //内容 json.put("content", content); - Map headers = new LinkedHashMap<>(1); + Map headers = MapUtil.newHashMap(1, true); headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8); SmsResponse smsResponse; try { @@ -227,7 +228,7 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { } requestJson.set("records", records); - Map headers = new LinkedHashMap<>(1); + Map headers = MapUtil.newHashMap(1, true); headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8); SmsResponse smsResponse; try {