From 5ddddd34c5839a1e6e09f93dae8347c3ffe27f2f Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 28 Jul 2024 15:56:53 +0800 Subject: [PATCH] md --- .../erp/emis/service/EmisBaseService.java | 4 +- .../emis/service/sms/AliyunSMSService.java | 113 +++++------------- 2 files changed, 33 insertions(+), 84 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index bc915a78d..dc08cc698 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -1424,7 +1424,7 @@ public class EmisBaseService { jObjParam.put("Nationalcity",nationalcity); jObjParam.put("name",dt.getBillCode()); - aliyunSMSService.sendMessage("探路速运", dt.getPhone(),"SMS_465316363", jObjParam.toJSONString()); +// aliyunSMSService.sendMessage("探路速运", dt.getPhone(),"SMS_465316363", jObjParam.toJSONString()); // cmccSMSService.sendMessage(DBUtil.getSeqNoByLen(10),dt.getPhone(),dt.getContent()); } @@ -1460,7 +1460,7 @@ public class EmisBaseService { jObjParam.put("Problemtype",emisProblemType.getTypeName()); jObjParam.put("time",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,waybill.getEstimateDate())); - aliyunSMSService.sendMessage("探路速运", dt.getPhone(),"SMS_465386407", jObjParam.toJSONString()); +// aliyunSMSService.sendMessage("探路速运", dt.getPhone(),"SMS_465386407", jObjParam.toJSONString()); // cmccSMSService.sendMessage(DBUtil.getSeqNoByLen(10),dt.getPhone(),dt.getContent()); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/AliyunSMSService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/AliyunSMSService.java index 95fbf19ec..0c3813a61 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/AliyunSMSService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/AliyunSMSService.java @@ -1,12 +1,7 @@ package com.xdadan.erp.emis.service.sms; -import com.alibaba.fastjson.JSONObject; import com.aliyun.dysmsapi20170525.Client; -import com.aliyun.tea.TeaModel; -import com.aliyun.teautil.Common; -import com.aliyun.teautil.models.RuntimeOptions; -import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.system.service.ISysConfigService; import lombok.extern.slf4j.Slf4j; @@ -30,12 +25,14 @@ public class AliyunSMSService { */ public int sendMessage(String signName,String phone, String templateCode,String tplParam) throws EmisBizError { - String jsonParamStr=configService.selectConfigByKey("sys.aliyun.sms"); - JSONObject jObjAliyunParam=JSONObject.parseObject(jsonParamStr); - String accessKeyId=jObjAliyunParam.getString("accessKeyId"); - String accessKeySecret=jObjAliyunParam.getString("accessKeySecret"); +// String jsonParamStr=configService.selectConfigByKey("sys.aliyun.sms"); +// JSONObject jObjAliyunParam=JSONObject.parseObject(jsonParamStr); +// String accessKeyId=jObjAliyunParam.getString("accessKeyId"); +// String accessKeySecret=jObjAliyunParam.getString("accessKeySecret"); +// +// return innerSendMessage(accessKeyId,accessKeySecret,signName,templateCode,phone,tplParam); - return innerSendMessage(accessKeyId,accessKeySecret,signName,templateCode,phone,tplParam); + return 1; } @@ -47,93 +44,45 @@ public class AliyunSMSService { * @throws Exception */ public static Client createClient(String accessKeyId, String accessKeySecret) throws Exception { - com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config() - .setAccessKeyId(accessKeyId) - .setAccessKeySecret(accessKeySecret); - // 访问的域名 - config.endpoint = "dysmsapi.aliyuncs.com"; - return new Client(config); +// com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config() +// .setAccessKeyId(accessKeyId) +// .setAccessKeySecret(accessKeySecret); +// // 访问的域名 +// config.endpoint = "dysmsapi.aliyuncs.com"; +// return new Client(config); + + return null; } public static int innerSendMessage(String accessKeyId,String accessKeySecret,String signName,String templateCode, String phone, String tplParam) throws EmisBizError { - try { - Client client = createClient(accessKeyId, accessKeySecret); - com.aliyun.dysmsapi20170525.models.SendSmsRequest sendSmsRequest = new com.aliyun.dysmsapi20170525.models.SendSmsRequest(); - sendSmsRequest.setPhoneNumbers(phone); - sendSmsRequest.setSignName(signName); - sendSmsRequest.setTemplateCode(templateCode); -// sendSmsRequest.setTemplateParam("{\"code\":\""+param+"\"}"); - sendSmsRequest.setTemplateParam(tplParam); - RuntimeOptions runtime = new RuntimeOptions(); - com.aliyun.dysmsapi20170525.models.SendSmsResponse response = client.sendSmsWithOptions(sendSmsRequest, runtime); - String jsonStr= Common.toJSONString(TeaModel.buildMap(response)); - - if(response.getStatusCode()==200) { - if ("OK".equals(response.getBody().getCode())) { - return 1; - } else { - throw new EmisBizError(EmisBizErrorType.FAIL,response.getBody().getMessage()); - } - }else{ - throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道发送错误"); - } - }catch (Exception e) { - e.printStackTrace(); - throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道异常"); - } - } - -// public static AsyncClient createClient(String accessKeyId, String accessKeySecret) throws Exception { -// StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder() -// .accessKeyId(accessKeyId) -// .accessKeySecret(accessKeySecret) -// .build()); -// -// return AsyncClient.builder() -// .credentialsProvider(provider) -// .overrideConfiguration( -// ClientOverrideConfiguration.create().setEndpointOverride("dysmsapi.aliyuncs.com") -// ) -// .build(); -// -// } -// -// -// public static int innerSendMessage(String accessKeyId,String accessKeySecret,String signName,String templateCode, String phone, String tplParam) throws EmisBizError { // try { -// AsyncClient client = createClient(accessKeyId, accessKeySecret); +// Client client = createClient(accessKeyId, accessKeySecret); +// com.aliyun.dysmsapi20170525.models.SendSmsRequest sendSmsRequest = new com.aliyun.dysmsapi20170525.models.SendSmsRequest(); +// sendSmsRequest.setPhoneNumbers(phone); +// sendSmsRequest.setSignName(signName); +// sendSmsRequest.setTemplateCode(templateCode); +//// sendSmsRequest.setTemplateParam("{\"code\":\""+param+"\"}"); +// sendSmsRequest.setTemplateParam(tplParam); +// RuntimeOptions runtime = new RuntimeOptions(); +// com.aliyun.dysmsapi20170525.models.SendSmsResponse response = client.sendSmsWithOptions(sendSmsRequest, runtime); +// String jsonStr= Common.toJSONString(TeaModel.buildMap(response)); // -// -// SendSmsRequest sendSmsRequest = SendSmsRequest.builder() -// .phoneNumbers(phone) -// .signName(signName) -// .templateCode(templateCode) -// .templateParam(tplParam) -// .build(); -// -// CompletableFuture response = client.sendSms(sendSmsRequest); -// SendSmsResponse resp = response.get(); -//// String jsonStr=resp.getBody(); -// -// -// if(resp.getStatusCode()==200) { -// if ("OK".equals(resp.getBody().getCode())) { -// client.close(); +// if(response.getStatusCode()==200) { +// if ("OK".equals(response.getBody().getCode())) { // return 1; // } else { -// client.close(); -// throw new EmisBizError(EmisBizErrorType.FAIL,resp.getBody().getMessage()); +// throw new EmisBizError(EmisBizErrorType.FAIL,response.getBody().getMessage()); // } // }else{ -// client.close(); // throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道发送错误"); // } -// // }catch (Exception e) { // e.printStackTrace(); // throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道异常"); // } -// } + return 1; + } + public static void main(String[] args) {