diff --git a/pom.xml b/pom.xml index 6f47f16d..fbd0f6f5 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 2.0.15 3.14.9 1.5.30 - 5.8.18 + 5.8.16 3.14.9 2.3.0 1.1.1 diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/entity/AlibabaResponse.java b/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/entity/AlibabaResponse.java deleted file mode 100644 index 4e2e022f..00000000 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/entity/AlibabaResponse.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.sms4j.aliyun.entity; - -import lombok.Data; - -/** - * AlibabaResponse - *

阿里响应参数 - * - * @author :handy - * 2023/5/19 16:23 - **/ -@Data -public class AlibabaResponse { - - /** - * 请求返回的结果码 - */ - private String Code; - - /** - * 请求返回的结果码描述 - */ - private String Message; - - private String RequestId; - - private String BizId; - -} 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 03370719..23f3578c 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,10 +1,10 @@ package org.dromara.sms4j.aliyun.service; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.dtflys.forest.config.ForestConfiguration; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.aliyun.config.AlibabaConfig; -import org.dromara.sms4j.aliyun.entity.AlibabaResponse; import org.dromara.sms4j.aliyun.utils.AliyunUtils; import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.callback.CallBack; @@ -98,16 +98,12 @@ public class AlibabaSmsImpl implements SmsBlend { .addHeader("Content-Type", "application/x-www-form-urlencoded") .addBody(paramStr) .onSuccess(((data, req, res) -> { - AlibabaResponse alibabaResponse = res.get(AlibabaResponse.class); - smsResponse.setCode(alibabaResponse.getCode()); - smsResponse.setMessage(alibabaResponse.getMessage()); - smsResponse.setBizId(alibabaResponse.getBizId()); - smsResponse.setData(alibabaResponse); + JSONObject jsonBody = res.get(JSONObject.class); + log.info(jsonBody.toJSONString()); })) .onError((ex, req, res) -> { - AlibabaResponse alibabaResponse = res.get(AlibabaResponse.class); - smsResponse.setErrMessage(alibabaResponse.getMessage()); - smsResponse.setErrorCode(alibabaResponse.getCode()); + JSONObject jsonBody = res.get(JSONObject.class); + log.info(jsonBody.toJSONString()); }) .execute(); return smsResponse; @@ -131,7 +127,7 @@ public class AlibabaSmsImpl implements SmsBlend { @Override @Restricted public void sendMessageAsync(String phone, String templateId, LinkedHashMap messages, CallBack callBack) { - CompletableFuture smsResponseCompletableFuture = CompletableFuture.supplyAsync(() -> sendMessage(phone, templateId, messages), pool); + CompletableFuture smsResponseCompletableFuture = CompletableFuture.supplyAsync(() -> sendMessage(phone,templateId, messages), pool); smsResponseCompletableFuture.thenAcceptAsync(callBack::callBack); }