优化部分 Map 集合代码风格

This commit is contained in:
Charles7c 2024-01-13 22:09:38 +08:00
parent 0750a39ec4
commit 2b67f22b82
11 changed files with 28 additions and 15 deletions

View File

@ -1,5 +1,6 @@
package org.dromara.sms4j.aliyun.service; package org.dromara.sms4j.aliyun.service;
import cn.hutool.core.map.MapUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -100,7 +101,7 @@ public class AlibabaSmsImpl extends AbstractSmsBlend<AlibabaConfig> {
} }
log.debug("requestUrl {}", requestUrl); log.debug("requestUrl {}", requestUrl);
Map<String, String> headers = new LinkedHashMap<>(1); Map<String, String> headers = MapUtil.newHashMap(1, true);
headers.put("Content-Type", Constant.FROM_URLENCODED); headers.put("Content-Type", Constant.FROM_URLENCODED);
SmsResponse smsResponse; SmsResponse smsResponse;
try { try {

View File

@ -19,6 +19,7 @@ public class CloopenFactory extends AbstractProviderFactory<CloopenSmsImpl, Cloo
/** /**
* 获取建造者实例 * 获取建造者实例
*
* @return 建造者实例 * @return 建造者实例
*/ */
public static CloopenFactory instance() { public static CloopenFactory instance() {
@ -27,6 +28,7 @@ public class CloopenFactory extends AbstractProviderFactory<CloopenSmsImpl, Cloo
/** /**
* 创建容连云短信实现对象 * 创建容连云短信实现对象
*
* @param cloopenConfig 短信配置对象 * @param cloopenConfig 短信配置对象
* @return 短信实现对象 * @return 短信实现对象
*/ */
@ -37,6 +39,7 @@ public class CloopenFactory extends AbstractProviderFactory<CloopenSmsImpl, Cloo
/** /**
* 获取供应商 * 获取供应商
*
* @return 供应商 * @return 供应商
*/ */
@Override @Override

View File

@ -1,5 +1,6 @@
package org.dromara.sms4j.cloopen.service; package org.dromara.sms4j.cloopen.service;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
@ -66,7 +67,7 @@ public class CloopenSmsImpl extends AbstractSmsBlend<CloopenConfig> {
@Override @Override
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
CloopenHelper helper = new CloopenHelper(getConfig(), http); CloopenHelper helper = new CloopenHelper(getConfig(), http);
Map<String, Object> paramMap = new LinkedHashMap<>(4); Map<String, Object> paramMap = MapUtil.newHashMap(4, true);
paramMap.put("to", String.join(",", phones)); paramMap.put("to", String.join(",", phones));
paramMap.put("appId", getConfig().getSdkAppId()); paramMap.put("appId", getConfig().getSdkAppId());
paramMap.put("templateId", templateId); paramMap.put("templateId", templateId);

View File

@ -3,6 +3,7 @@ package org.dromara.sms4j.cloopen.util;
import cn.hutool.core.codec.Base64; import cn.hutool.core.codec.Base64;
import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -42,7 +43,7 @@ public class CloopenHelper {
config.getBaseUrl(), config.getBaseUrl(),
config.getAccessKeyId(), config.getAccessKeyId(),
this.generateSign(config.getAccessKeyId(), config.getAccessKeySecret(), timestamp)); this.generateSign(config.getAccessKeyId(), config.getAccessKeySecret(), timestamp));
Map<String, String> headers = new LinkedHashMap<>(3); Map<String, String> headers = MapUtil.newHashMap(3, true);
headers.put("Accept", Constant.ACCEPT); headers.put("Accept", Constant.ACCEPT);
headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8); headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8);
headers.put("Authorization", this.generateAuthorization(config.getAccessKeyId(), timestamp)); headers.put("Authorization", this.generateAuthorization(config.getAccessKeyId(), timestamp));

View File

@ -1,5 +1,6 @@
package org.dromara.sms4j.dingzhong.service; package org.dromara.sms4j.dingzhong.service;
import cn.hutool.core.map.MapUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
@ -52,7 +53,7 @@ public class DingZhongSmsImpl extends AbstractSmsBlend<DingZhongConfig> {
@Override @Override
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
DingZhongHelper helper = new DingZhongHelper(getConfig(), http); DingZhongHelper helper = new DingZhongHelper(getConfig(), http);
Map<String, Object> paramMap = new LinkedHashMap<>(4); Map<String, Object> paramMap = MapUtil.newHashMap(4, true);
paramMap.put("cdkey", getConfig().getAccessKeyId()); paramMap.put("cdkey", getConfig().getAccessKeyId());
paramMap.put("password", getConfig().getAccessKeySecret()); paramMap.put("password", getConfig().getAccessKeySecret());
paramMap.put("mobile", phone); paramMap.put("mobile", phone);
@ -68,7 +69,7 @@ public class DingZhongSmsImpl extends AbstractSmsBlend<DingZhongConfig> {
@Override @Override
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
DingZhongHelper helper = new DingZhongHelper(getConfig(), http); DingZhongHelper helper = new DingZhongHelper(getConfig(), http);
Map<String, Object> paramMap = new LinkedHashMap<>(5); Map<String, Object> paramMap = MapUtil.newHashMap(5, true);
paramMap.put("cdkey", getConfig().getAccessKeyId()); paramMap.put("cdkey", getConfig().getAccessKeyId());
paramMap.put("password", getConfig().getAccessKeySecret()); paramMap.put("password", getConfig().getAccessKeySecret());
paramMap.put("mobile", phone); paramMap.put("mobile", phone);

View File

@ -1,5 +1,6 @@
package org.dromara.sms4j.dingzhong.util; package org.dromara.sms4j.dingzhong.util;
import cn.hutool.core.map.MapUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
@ -32,7 +33,7 @@ public class DingZhongHelper {
public SmsResponse smsResponse(Map<String, Object> paramMap) { public SmsResponse smsResponse(Map<String, Object> paramMap) {
String url = String.format("%s/%s", config.getRequestUrl(), SmsUtils.isEmpty(paramMap.get("templateId"))?config.getBaseAction():config.getTemplateAction()); String url = String.format("%s/%s", config.getRequestUrl(), SmsUtils.isEmpty(paramMap.get("templateId"))?config.getBaseAction():config.getTemplateAction());
Map<String, String> headers = new LinkedHashMap<>(2); Map<String, String> headers = MapUtil.newHashMap(2, true);
headers.put("Accept", Constant.ACCEPT); headers.put("Accept", Constant.ACCEPT);
headers.put("Content-Type", Constant.FROM_URLENCODED); headers.put("Content-Type", Constant.FROM_URLENCODED);
SmsResponse smsResponse = null; SmsResponse smsResponse = null;

View File

@ -1,5 +1,6 @@
package org.dromara.sms4j.emay.service; package org.dromara.sms4j.emay.service;
import cn.hutool.core.map.MapUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
@ -46,7 +47,7 @@ public class EmaySmsImpl extends AbstractSmsBlend<EmayConfig> {
String url = getConfig().getRequestUrl(); String url = getConfig().getRequestUrl();
Map<String, Object> params = EmayBuilder.buildRequestBody(getConfig().getAccessKeyId(), getConfig().getAccessKeySecret(), phone, message); Map<String, Object> params = EmayBuilder.buildRequestBody(getConfig().getAccessKeyId(), getConfig().getAccessKeySecret(), phone, message);
Map<String, String> headers = new LinkedHashMap<>(1); Map<String, String> headers = MapUtil.newHashMap(1, true);
headers.put("Content-Type", Constant.FROM_URLENCODED); headers.put("Content-Type", Constant.FROM_URLENCODED);
SmsResponse smsResponse; SmsResponse smsResponse;
try { try {

View File

@ -1,6 +1,7 @@
package org.dromara.sms4j.huawei.service; package org.dromara.sms4j.huawei.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
@ -65,7 +66,7 @@ public class HuaweiSmsImpl extends AbstractSmsBlend<HuaweiConfig> {
String mess = listToString(list); String mess = listToString(list);
String requestBody = HuaweiBuilder.buildRequestBody(getConfig().getSender(), phone, templateId, mess, getConfig().getStatusCallBack(), getConfig().getSignature()); String requestBody = HuaweiBuilder.buildRequestBody(getConfig().getSender(), phone, templateId, mess, getConfig().getStatusCallBack(), getConfig().getSignature());
Map<String, String> headers = new LinkedHashMap<>(3); Map<String, String> headers = MapUtil.newHashMap(3, true);
headers.put("Authorization", Constant.HUAWEI_AUTH_HEADER_VALUE); headers.put("Authorization", Constant.HUAWEI_AUTH_HEADER_VALUE);
headers.put("X-WSSE", HuaweiBuilder.buildWsseHeader(getConfig().getAccessKeyId(), getConfig().getAccessKeySecret())); headers.put("X-WSSE", HuaweiBuilder.buildWsseHeader(getConfig().getAccessKeyId(), getConfig().getAccessKeySecret()));
headers.put("Content-Type", Constant.FROM_URLENCODED); headers.put("Content-Type", Constant.FROM_URLENCODED);

View File

@ -2,6 +2,7 @@ package org.dromara.sms4j.netease.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONArray; import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
@ -109,7 +110,7 @@ public class NeteaseSmsImpl extends AbstractSmsBlend<NeteaseConfig> {
String nonce = IdUtil.fastSimpleUUID(); String nonce = IdUtil.fastSimpleUUID();
String curTime = String.valueOf(DateUtil.currentSeconds()); String curTime = String.valueOf(DateUtil.currentSeconds());
String checkSum = NeteaseUtils.getCheckSum(getConfig().getAccessKeySecret(), nonce, curTime); String checkSum = NeteaseUtils.getCheckSum(getConfig().getAccessKeySecret(), nonce, curTime);
Map<String, Object> body = new LinkedHashMap<>(4); Map<String, Object> body = MapUtil.newHashMap(4, true);
body.put("templateid", templateId); body.put("templateid", templateId);
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
jsonArray.addAll(phones); jsonArray.addAll(phones);
@ -117,7 +118,7 @@ public class NeteaseSmsImpl extends AbstractSmsBlend<NeteaseConfig> {
body.put("params", message); body.put("params", message);
body.put("needUp", getConfig().getNeedUp()); body.put("needUp", getConfig().getNeedUp());
Map<String, String> headers = new LinkedHashMap<>(5); Map<String, String> headers = MapUtil.newHashMap(5, true);
headers.put("Content-Type", Constant.FROM_URLENCODED); headers.put("Content-Type", Constant.FROM_URLENCODED);
headers.put("AppKey", getConfig().getAccessKeyId()); headers.put("AppKey", getConfig().getAccessKeyId());
headers.put("Nonce", nonce); headers.put("Nonce", nonce);

View File

@ -1,5 +1,6 @@
package org.dromara.sms4j.unisms.service; package org.dromara.sms4j.unisms.service;
import cn.hutool.core.map.MapUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms4j.comm.constant.SupplierConstant; import org.dromara.sms4j.comm.constant.SupplierConstant;
@ -58,9 +59,9 @@ public class UniSmsImpl extends AbstractSmsBlend<UniConfig> {
@Override @Override
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
if (Objects.isNull(messages)){ if (Objects.isNull(messages)){
messages = new LinkedHashMap<String, String>(); messages = new LinkedHashMap<>();
} }
Map<String, Object> data = new LinkedHashMap<>(4); Map<String, Object> data = MapUtil.newHashMap(4, true);
data.put("to", Collections.singletonList(phone)); data.put("to", Collections.singletonList(phone));
data.put("signature", getConfig().getSignature()); data.put("signature", getConfig().getSignature());
data.put("templateId", templateId); data.put("templateId", templateId);
@ -83,7 +84,7 @@ public class UniSmsImpl extends AbstractSmsBlend<UniConfig> {
if (phones.size() > 1000) { if (phones.size() > 1000) {
throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于1000"); throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于1000");
} }
Map<String, Object> data = new LinkedHashMap<>(4); Map<String, Object> data = MapUtil.newHashMap(4, true);
data.put("to", phones); data.put("to", phones);
data.put("signature", getConfig().getSignature()); data.put("signature", getConfig().getSignature());
data.put("templateId", templateId); data.put("templateId", templateId);

View File

@ -2,6 +2,7 @@ package org.dromara.sms4j.zhutong.service;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.ListUtil; import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.text.StrPool; import cn.hutool.core.text.StrPool;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
@ -139,7 +140,7 @@ public class ZhutongSmsImpl extends AbstractSmsBlend<ZhutongConfig> {
//内容 //内容
json.put("content", content); json.put("content", content);
Map<String, String> headers = new LinkedHashMap<>(1); Map<String, String> headers = MapUtil.newHashMap(1, true);
headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8); headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8);
SmsResponse smsResponse; SmsResponse smsResponse;
try { try {
@ -227,7 +228,7 @@ public class ZhutongSmsImpl extends AbstractSmsBlend<ZhutongConfig> {
} }
requestJson.set("records", records); requestJson.set("records", records);
Map<String, String> headers = new LinkedHashMap<>(1); Map<String, String> headers = MapUtil.newHashMap(1, true);
headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8); headers.put("Content-Type", Constant.APPLICATION_JSON_UTF8);
SmsResponse smsResponse; SmsResponse smsResponse;
try { try {