优化导入

统一配置使用的字段
This commit is contained in:
wind 2023-09-11 21:15:07 +08:00
parent 22614c294d
commit 9307d7e99e
8 changed files with 7 additions and 25 deletions

View File

@ -20,11 +20,6 @@ import org.dromara.sms4j.provider.config.BaseConfig;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class CloopenConfig extends BaseConfig { public class CloopenConfig extends BaseConfig {
/**
* 应用 ID
*/
private String appId;
/** /**
* REST API Base URL * REST API Base URL
*/ */

View File

@ -59,7 +59,7 @@ public class CloopenSmsImpl extends AbstractSmsBlend<CloopenConfig> {
CloopenHelper helper = new CloopenHelper(getConfig(), http); CloopenHelper helper = new CloopenHelper(getConfig(), http);
Map<String, Object> paramMap = new LinkedHashMap<>(4); Map<String, Object> paramMap = new LinkedHashMap<>(4);
paramMap.put("to", String.join(",", phones)); paramMap.put("to", String.join(",", phones));
paramMap.put("appId", getConfig().getAppId()); paramMap.put("appId", getConfig().getAccessKeyId());
paramMap.put("templateId", templateId); paramMap.put("templateId", templateId);
paramMap.put("datas", messages.keySet().stream().map(messages::get).toArray(String[]::new)); paramMap.put("datas", messages.keySet().stream().map(messages::get).toArray(String[]::new));
return helper.smsResponse(paramMap); return helper.smsResponse(paramMap);

View File

@ -1,15 +1,12 @@
package org.dromara.sms4j.netease.config; package org.dromara.sms4j.netease.config;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.dromara.sms4j.comm.constant.SupplierConstant; import org.dromara.sms4j.comm.constant.SupplierConstant;
import org.dromara.sms4j.netease.service.NeteaseSmsImpl;
import org.dromara.sms4j.provider.config.BaseConfig; import org.dromara.sms4j.provider.config.BaseConfig;
/** /**
* 网易云信
* @author adam * @author adam
*/ */
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -41,7 +38,7 @@ public class NeteaseConfig extends BaseConfig {
* 是否需要支持短信上行true:需要false:不需要 * 是否需要支持短信上行true:需要false:不需要
* 说明如果开通了短信上行抄送功能该参数需要设置为true其它情况设置无效 * 说明如果开通了短信上行抄送功能该参数需要设置为true其它情况设置无效
*/ */
private Boolean needUp; private Boolean needUp = false;
/** /**
* 获取供应商 * 获取供应商

View File

@ -14,11 +14,6 @@ import org.dromara.sms4j.tencent.service.TencentSmsImpl;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class TencentConfig extends BaseConfig { public class TencentConfig extends BaseConfig {
/**
* 短信sdkAppId
*/
private String sdkAppId;
/** /**
* 地域信息默认为 ap-guangzhou * 地域信息默认为 ap-guangzhou
*/ */

View File

@ -91,7 +91,7 @@ public class TencentSmsImpl extends AbstractSmsBlend<TencentConfig> {
} }
Map<String, String> headsMap = TencentUtils.generateHeadsMap(signature, timestamp, getConfig().getAction(), Map<String, String> headsMap = TencentUtils.generateHeadsMap(signature, timestamp, getConfig().getAction(),
getConfig().getVersion(), getConfig().getTerritory(), getConfig().getRequestUrl()); getConfig().getVersion(), getConfig().getTerritory(), getConfig().getRequestUrl());
Map<String, Object> requestBody = TencentUtils.generateRequestBody(phones, getConfig().getSdkAppId(), Map<String, Object> requestBody = TencentUtils.generateRequestBody(phones, getConfig().getAccessKeyId(),
getConfig().getSignature(), templateId, messages); getConfig().getSignature(), templateId, messages);
String url = Constant.HTTPS_PREFIX + getConfig().getRequestUrl(); String url = Constant.HTTPS_PREFIX + getConfig().getRequestUrl();

View File

@ -65,7 +65,7 @@ public class TencentUtils {
String signedHeaders = "content-type;host"; String signedHeaders = "content-type;host";
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("PhoneNumberSet", phones); params.put("PhoneNumberSet", phones);
params.put("SmsSdkAppId", tencentConfig.getSdkAppId()); params.put("SmsSdkAppId", tencentConfig.getAccessKeyId());
params.put("SignName", tencentConfig.getSignature()); params.put("SignName", tencentConfig.getSignature());
params.put("TemplateId", templateId); params.put("TemplateId", templateId);
params.put("TemplateParamSet", messages); params.put("TemplateParamSet", messages);

View File

@ -2,12 +2,8 @@ package org.dromara.sms4j.yunpian.config;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.SuperBuilder;
import org.dromara.sms4j.comm.constant.SupplierConstant; import org.dromara.sms4j.comm.constant.SupplierConstant;
import org.dromara.sms4j.provider.config.BaseConfig; import org.dromara.sms4j.provider.config.BaseConfig;
import org.dromara.sms4j.yunpian.service.YunPianSmsImpl;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

View File

@ -1,10 +1,9 @@
package org.dromara.sms4j.zhutong.config; package org.dromara.sms4j.zhutong.config;
import lombok.*; import lombok.Data;
import lombok.experimental.SuperBuilder; import lombok.EqualsAndHashCode;
import org.dromara.sms4j.comm.constant.SupplierConstant; import org.dromara.sms4j.comm.constant.SupplierConstant;
import org.dromara.sms4j.provider.config.BaseConfig; import org.dromara.sms4j.provider.config.BaseConfig;
import org.dromara.sms4j.zhutong.service.ZhutongSmsImpl;
/** /**
* 助通-自定义短信发送-配置 * 助通-自定义短信发送-配置