admin/sms4j
1
0
Fork 0
mirror of https://gitee.com/dromara/sms4j.git synced 2025-12-07 01:18:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

!37 回退 'Pull Request !36 : alibaba 返回正确响应内容'

Browse Source 
Merge pull request !37 from 风如歌/revert-merge-36-master
This commit is contained in:
风如歌 2023-05-19 08:56:51 +00:00 committed by Gitee
commit f60e1b433e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -56,7 +56,7 @@
<json.version>2.0.15</json.version> <json.version>2.0.15</json.version>
<okhttp.version>3.14.9</okhttp.version> <okhttp.version>3.14.9</okhttp.version>
<forest.version>1.5.30</forest.version> <forest.version>1.5.30</forest.version>
<hutool.version>5.8.18</hutool.version> <hutool.version>5.8.16</hutool.version>
<okhttp.version>3.14.9</okhttp.version> <okhttp.version>3.14.9</okhttp.version>
<xmlblend.version>2.3.0</xmlblend.version> <xmlblend.version>2.3.0</xmlblend.version>
<activation.version>1.1.1</activation.version> <activation.version>1.1.1</activation.version>

29
sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/entity/AlibabaResponse.java
View File

@ -1,29 +0,0 @@
package org.dromara.sms4j.aliyun.entity;
import lombok.Data;
/**
* AlibabaResponse
* <p> 阿里响应参数
*
* @author :handy
* 2023/5/19 16:23
**/
@Data
public class AlibabaResponse {
/**
* 请求返回的结果码
*/
private String Code;
/**
* 请求返回的结果码描述
*/
private String Message;
private String RequestId;
private String BizId;
}

16
sms4j-provider/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java
View File

@ -1,10 +1,10 @@
package org.dromara.sms4j.aliyun.service; package org.dromara.sms4j.aliyun.service;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.dtflys.forest.config.ForestConfiguration; import com.dtflys.forest.config.ForestConfiguration;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.aliyun.config.AlibabaConfig; 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.aliyun.utils.AliyunUtils;
import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms4j.api.callback.CallBack; import org.dromara.sms4j.api.callback.CallBack;
@ -98,16 +98,12 @@ public class AlibabaSmsImpl implements SmsBlend {
.addHeader("Content-Type", "application/x-www-form-urlencoded") .addHeader("Content-Type", "application/x-www-form-urlencoded")
.addBody(paramStr) .addBody(paramStr)
.onSuccess(((data, req, res) -> { .onSuccess(((data, req, res) -> {
AlibabaResponse alibabaResponse = res.get(AlibabaResponse.class); JSONObject jsonBody = res.get(JSONObject.class);
smsResponse.setCode(alibabaResponse.getCode()); log.info(jsonBody.toJSONString());
smsResponse.setMessage(alibabaResponse.getMessage());
smsResponse.setBizId(alibabaResponse.getBizId());
smsResponse.setData(alibabaResponse);
})) }))
.onError((ex, req, res) -> { .onError((ex, req, res) -> {
AlibabaResponse alibabaResponse = res.get(AlibabaResponse.class); JSONObject jsonBody = res.get(JSONObject.class);
smsResponse.setErrMessage(alibabaResponse.getMessage()); log.info(jsonBody.toJSONString());
smsResponse.setErrorCode(alibabaResponse.getCode());
}) })
.execute(); .execute();
return smsResponse; return smsResponse;
@ -131,7 +127,7 @@ public class AlibabaSmsImpl implements SmsBlend {
@Override @Override
@Restricted @Restricted
public void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages, CallBack callBack) { public void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages, CallBack callBack) {
CompletableFuture<SmsResponse> smsResponseCompletableFuture = CompletableFuture.supplyAsync(() -> sendMessage(phone, templateId, messages), pool); CompletableFuture<SmsResponse> smsResponseCompletableFuture = CompletableFuture.supplyAsync(() -> sendMessage(phone,templateId, messages), pool);
smsResponseCompletableFuture.thenAcceptAsync(callBack::callBack); smsResponseCompletableFuture.thenAcceptAsync(callBack::callBack);
} }