添加 success 参数 用于用户统一判断

cloopen,ctyun,tencent,unisms 未实现,之后补
This commit is contained in:
handy 2023-05-31 10:06:45 +08:00
parent 2bc06fabb6
commit 6670f20af5
7 changed files with 19 additions and 7 deletions

View File

@ -10,6 +10,14 @@ import lombok.Data;
**/ **/
@Data @Data
public class SmsResponse { public class SmsResponse {
/**
* 是否成功
*
* @since 2.2.0
*/
private boolean success;
/** 状态码*/ /** 状态码*/
private String code; private String code;
/** 返回消息*/ /** 返回消息*/

View File

@ -107,6 +107,7 @@ public class AlibabaSmsImpl extends AbstractSmsBlend {
smsResponse.setMessage(resJson.getStr("Message")); smsResponse.setMessage(resJson.getStr("Message"));
if ("OK".equals(smsResponse.getCode())) { if ("OK".equals(smsResponse.getCode())) {
smsResponse.setBizId(resJson.getStr("BizId")); smsResponse.setBizId(resJson.getStr("BizId"));
smsResponse.setSuccess(true);
} }
return smsResponse; return smsResponse;
} }

View File

@ -63,6 +63,7 @@ public class CloopenHelper {
String statusMsg = Convert.toStr(responseMap.get("statusMsg")); String statusMsg = Convert.toStr(responseMap.get("statusMsg"));
boolean isSuccess = "000000".equals(statusCode); boolean isSuccess = "000000".equals(statusCode);
if (isSuccess) { if (isSuccess) {
smsResponse.setSuccess(true);
smsResponse.setCode(statusCode); smsResponse.setCode(statusCode);
smsResponse.setMessage(statusMsg); smsResponse.setMessage(statusMsg);
smsResponse.setData(response); smsResponse.setData(response);

View File

@ -112,6 +112,7 @@ public class EmaySmsImpl extends AbstractSmsBlend {
} else { } else {
smsResponse.setCode(code); smsResponse.setCode(code);
if ("success".equalsIgnoreCase(code)) { if ("success".equalsIgnoreCase(code)) {
smsResponse.setSuccess(true);
JSONArray data = execute.getJSONArray("data"); JSONArray data = execute.getJSONArray("data");
JSONObject result = (JSONObject) data.get(0); JSONObject result = (JSONObject) data.get(0);
String smsId = result.getStr("smsId"); String smsId = result.getStr("smsId");

View File

@ -10,11 +10,7 @@ import org.dromara.sms4j.huawei.config.HuaweiConfig;
import org.dromara.sms4j.huawei.entity.HuaweiResponse; import org.dromara.sms4j.huawei.entity.HuaweiResponse;
import org.dromara.sms4j.huawei.utils.HuaweiBuilder; import org.dromara.sms4j.huawei.utils.HuaweiBuilder;
import java.util.ArrayList; import java.util.*;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import static org.dromara.sms4j.huawei.utils.HuaweiBuilder.listToString; import static org.dromara.sms4j.huawei.utils.HuaweiBuilder.listToString;
@ -23,7 +19,7 @@ import static org.dromara.sms4j.huawei.utils.HuaweiBuilder.listToString;
@Slf4j @Slf4j
public class HuaweiSmsImpl extends AbstractSmsBlend { public class HuaweiSmsImpl extends AbstractSmsBlend {
public HuaweiSmsImpl(HuaweiConfig config, Executor pool, DelayedTime delayed) { public HuaweiSmsImpl(HuaweiConfig config, Executor pool, DelayedTime delayed) {
super(pool,delayed); super(pool, delayed);
this.config = config; this.config = config;
} }
@ -61,6 +57,9 @@ public class HuaweiSmsImpl extends AbstractSmsBlend {
smsResponse.setMessage(jsonBody.getDescription()); smsResponse.setMessage(jsonBody.getDescription());
smsResponse.setBizId(jsonBody.getResult().get(0).getSmsMsgId()); smsResponse.setBizId(jsonBody.getResult().get(0).getSmsMsgId());
smsResponse.setData(jsonBody.getResult()); smsResponse.setData(jsonBody.getResult());
if ("000000".equals(jsonBody.getCode())) {
smsResponse.setSuccess(true);
}
})) }))
.onError((ex, req, res) -> { .onError((ex, req, res) -> {
HuaweiResponse huaweiResponse = res.get(HuaweiResponse.class); HuaweiResponse huaweiResponse = res.get(HuaweiResponse.class);

View File

@ -91,6 +91,7 @@ public class JdCloudSmsImpl extends AbstractSmsBlend {
smsResponse.setMessage(res.getMessage()); smsResponse.setMessage(res.getMessage());
Boolean status = res.getStatus(); Boolean status = res.getStatus();
boolean isSuccess = status != null && status; boolean isSuccess = status != null && status;
smsResponse.setSuccess(isSuccess);
if (!isSuccess) { if (!isSuccess) {
smsResponse.setErrMessage(res.getMessage()); smsResponse.setErrMessage(res.getMessage());
smsResponse.setErrorCode(String.valueOf(res.getCode())); smsResponse.setErrorCode(String.valueOf(res.getCode()));

View File

@ -39,7 +39,8 @@ public class YunPianSmsImpl extends AbstractSmsBlend {
smsResponse.setCode(execute.getStr("code")); smsResponse.setCode(execute.getStr("code"));
smsResponse.setMessage(execute.getStr("msg")); smsResponse.setMessage(execute.getStr("msg"));
smsResponse.setBizId(execute.getStr("sid")); smsResponse.setBizId(execute.getStr("sid"));
if (execute.getInt("code") != 0) { smsResponse.setSuccess(execute.getInt("code") == 0);
if (!smsResponse.isSuccess()) {
smsResponse.setErrMessage(execute.getStr("msg")); smsResponse.setErrMessage(execute.getStr("msg"));
} }
smsResponse.setData(execute); smsResponse.setData(execute);