diff --git a/sms4j-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java b/sms4j-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java index 3e57122f..9d6a58a7 100644 --- a/sms4j-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java +++ b/sms4j-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java @@ -25,8 +25,4 @@ public class SmsResponse { * @since 2.3.0 */ private Object data; - - /** 状态码*/ - private String code; - private String message; } 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 b20e2a53..68c9af81 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 @@ -5,9 +5,9 @@ import cn.hutool.core.collection.ListUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.AbstractSmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; @@ -198,11 +198,11 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { AtomicReference reference = new AtomicReference<>(); http.post(urls) .addHeader("Content-Type", Constant.APPLICATION_JSON_UTF8) - .addBody(requestJson.getInnerMap()) + .addBody(requestJson) .onSuccess(((data, req, res) -> reference.set(this.getResponse(res.get(JSONObject.class))))) .onError((ex, req, res) -> reference.set(this.getResponse(res.get(JSONObject.class)))) .execute(); - log.info("助通短信 URL={} json={} 响应值为={}", urls, requestJson.toJSONString(), reference.get()); + log.info("助通短信 URL={} json={} 响应值为={}", urls, requestJson, reference.get()); return reference.get(); } @@ -212,7 +212,7 @@ public class ZhutongSmsImpl extends AbstractSmsBlend { private SmsResponse getResponse(JSONObject jsonObject) { SmsResponse response = new SmsResponse(); - response.setSuccess(jsonObject.getInteger("code") <= 200); + response.setSuccess(jsonObject.getInt("code", -1) <= 200); response.setData(jsonObject); return response; } diff --git a/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/Sms4jTest.java b/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/Sms4jTest.java index 3f2ef391..0c7c6b91 100644 --- a/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/Sms4jTest.java +++ b/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/Sms4jTest.java @@ -31,7 +31,7 @@ class Sms4jTest { // 阿里 SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.ALIBABA).sendMessage(PHONE, SmsUtil.getRandomInt(6)); log.info(JSONUtil.toJsonStr(smsResponse)); - Assert.isTrue("OK".equals(smsResponse.getCode()) && smsResponse.isSuccess()); + Assert.isTrue(smsResponse.isSuccess()); } @Test @@ -42,7 +42,7 @@ class Sms4jTest { // 华为 SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.HUAWEI).sendMessage(PHONE, SmsUtil.getRandomInt(6)); log.info(JSONUtil.toJsonStr(smsResponse)); - Assert.isTrue("000000".equals(smsResponse.getCode()) && smsResponse.isSuccess()); + Assert.isTrue(smsResponse.isSuccess()); } @Test @@ -53,7 +53,7 @@ class Sms4jTest { // 容联云 SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.CLOOPEN).sendMessage(PHONE, SmsUtil.getRandomInt(6)); log.info(JSONUtil.toJsonStr(smsResponse)); - Assert.isTrue("000000".equals(smsResponse.getCode()) && smsResponse.isSuccess()); + Assert.isTrue(smsResponse.isSuccess()); } @Test @@ -64,7 +64,7 @@ class Sms4jTest { // 亿美软通 SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.EMAY).sendMessage(PHONE, SmsUtil.getRandomInt(6)); log.info(JSONUtil.toJsonStr(smsResponse)); - Assert.isTrue("success".equals(smsResponse.getCode()) && smsResponse.isSuccess()); + Assert.isTrue(smsResponse.isSuccess()); } @Test @@ -86,7 +86,7 @@ class Sms4jTest { // 云片 SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.YUNPIAN).sendMessage(PHONE, SmsUtil.getRandomInt(6)); log.info(JSONUtil.toJsonStr(smsResponse)); - Assert.isTrue("0".equals(smsResponse.getCode()) && smsResponse.isSuccess()); + Assert.isTrue(smsResponse.isSuccess()); } @Test @@ -97,7 +97,7 @@ class Sms4jTest { // 腾讯 SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.TENCENT).sendMessage(PHONE, SmsUtil.getRandomInt(6)); log.info(JSONUtil.toJsonStr(smsResponse)); - Assert.isTrue("Ok".equals(smsResponse.getCode()) && smsResponse.isSuccess()); + Assert.isTrue(smsResponse.isSuccess()); } @Test @@ -108,7 +108,7 @@ class Sms4jTest { // 合一 SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.UNI_SMS).sendMessage(PHONE, SmsUtil.getRandomInt(6)); log.info(JSONUtil.toJsonStr(smsResponse)); - Assert.isTrue("Success".equals(smsResponse.getMessage()) && smsResponse.isSuccess()); + Assert.isTrue(smsResponse.isSuccess()); } @Test @@ -119,7 +119,7 @@ class Sms4jTest { // 天翼云 SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.CTYUN).sendMessage(PHONE, SmsUtil.getRandomInt(6)); log.info(JSONUtil.toJsonStr(smsResponse)); - Assert.isTrue("OK".equals(smsResponse.getCode()) && smsResponse.isSuccess()); + Assert.isTrue(smsResponse.isSuccess()); } @Test @@ -130,7 +130,7 @@ class Sms4jTest { // 网易云短信 SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.NETEASE).sendMessage(PHONE, SmsUtil.getRandomInt(6)); log.info(JSONUtil.toJsonStr(smsResponse)); - Assert.isTrue(Long.parseLong(smsResponse.getCode()) <= 200 && smsResponse.isSuccess()); + Assert.isTrue(smsResponse.isSuccess()); } /** @@ -174,7 +174,7 @@ class Sms4jTest { } // 助通短信短信 String msg = StrUtil.format("【图书商城】您好,你的验证码是{}:(5分钟失效)", SmsUtil.getRandomInt(6)); - SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.ZHUTONG).massTexting(ListUtil.of(PHONE, "17312345678"), msg); + SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.ZHUTONG).massTexting(ListUtil.of(PHONE, "180****1111"), msg); log.info(JSONUtil.toJsonStr(smsResponse)); Assert.isTrue(smsResponse.isSuccess()); } @@ -190,7 +190,7 @@ class Sms4jTest { // 助通短信短信 LinkedHashMap messages = new LinkedHashMap<>(1); messages.put("code", SmsUtil.getRandomInt(6)); - SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.ZHUTONG).massTexting(ListUtil.of(PHONE, "17312345678"), "59264", messages); + SmsResponse smsResponse = SmsFactory.createSmsBlend(SupplierType.ZHUTONG).massTexting(ListUtil.of(PHONE, "180****1111"), "59264", messages); log.info(JSONUtil.toJsonStr(smsResponse)); Assert.isTrue(smsResponse.isSuccess()); }