From 45c39c4deba8f37d6152793efc3b271c352fac89 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 25 八月 2023 23:16:52 +0800
Subject: [PATCH] 优化diamante
---
java110-core/src/main/java/com/java110/core/factory/YidongSendMessageFactory.java | 74 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/YidongSendMessageFactory.java b/java110-core/src/main/java/com/java110/core/factory/YidongSendMessageFactory.java
index cab4471..b92034f 100644
--- a/java110-core/src/main/java/com/java110/core/factory/YidongSendMessageFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/YidongSendMessageFactory.java
@@ -1,21 +1,12 @@
package com.java110.core.factory;
-import com.aliyuncs.CommonRequest;
-import com.aliyuncs.CommonResponse;
-import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.IAcsClient;
-import com.aliyuncs.exceptions.ClientException;
-import com.aliyuncs.exceptions.ServerException;
-import com.aliyuncs.http.MethodType;
-import com.aliyuncs.profile.DefaultProfile;
import com.java110.core.client.OutRestTemplate;
import com.java110.core.log.LoggerFactory;
-import com.java110.dto.smsConfig.SmsConfigDto;
+import com.java110.dto.sms.SmsConfigDto;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.HttpStatusCodeException;
@@ -94,17 +85,64 @@
return result;
}
- public static void sendMessage(String tel, String code) {
+// public static void sendMessage(String tel, String code) {
+//
+// String apId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "apId");
+// String secretKey = MappingCache.getValue(YIDONG_SMS_DOMAIN, "secretKey");
+// String ecName = MappingCache.getValue(YIDONG_SMS_DOMAIN, "ecName");
+// String sign = MappingCache.getValue(YIDONG_SMS_DOMAIN, "sign");
+// String addSerial = MappingCache.getValue(YIDONG_SMS_DOMAIN, "addSerial");
+// String templateId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "templateId");
+// String url = MappingCache.getValue(YIDONG_SMS_DOMAIN, "yidong_url");
+//
+// String mac = getMac(ecName, apId, secretKey, templateId, tel, code, sign, addSerial);
+//
+// //寮�濮嬪彂閫侀獙璇佺爜
+// String reqParam = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+// "<WsSubmitTempletReq>\n" +
+// " <apId>" + apId + "</apId>\n" +
+// " <secretKey>" + secretKey + "</secretKey>\n" +
+// " <ecName>" + ecName + "</ecName>\n" +
+// " <mobiles>\n" +
+// " <string>" + tel + "</string>\n" +
+// " </mobiles>\n" +
+// " <params>\n" +
+// " <string>" + code + "</string>\n" +
+// " </params>\n" +
+// " <sign>" + sign + "</sign>\n" +
+// " <addSerial>" + addSerial + "</addSerial>\n" +
+// " <mac>" + mac + "</mac>\n" +
+// " <templateId>" + templateId + "</templateId>\n" +
+// "</WsSubmitTempletReq>";
+//
+// reqParam = WEBSERVICE_BODY.replace("REQUESTBODY",reqParam);
+// logger.debug("璇锋眰绉诲姩鍏徃璇锋眰鎶ユ枃锛歿}",reqParam);
+// HttpHeaders httpHeaders = new HttpHeaders();
+// httpHeaders.add("Content-Type","text/xml;charset=UTF-8");
+// outRestTemplate = ApplicationContextFactory.getBean("outRestTemplate",OutRestTemplate.class);
+// HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(reqParam, httpHeaders);
+// try {
+// ResponseEntity<String> responseEntity = outRestTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+// logger.debug("绉诲姩鍏徃杩斿洖鎶ユ枃,{}",responseEntity);
+// }catch (HttpStatusCodeException e){
+// logger.error("璋冪敤寮傚父",e);
+// }catch (Exception e){
+// logger.error("璋冪敤寮傚父",e);
+// }
+//
+// }
+ public static void sendMessage(String tel, String code) {
String apId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "apId");
String secretKey = MappingCache.getValue(YIDONG_SMS_DOMAIN, "secretKey");
String ecName = MappingCache.getValue(YIDONG_SMS_DOMAIN, "ecName");
String sign = MappingCache.getValue(YIDONG_SMS_DOMAIN, "sign");
String addSerial = MappingCache.getValue(YIDONG_SMS_DOMAIN, "addSerial");
- String templateId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "templateId");
String url = MappingCache.getValue(YIDONG_SMS_DOMAIN, "yidong_url");
- String mac = getMac(ecName, apId, secretKey, templateId, tel, code, sign, addSerial);
+ String param = "鎮ㄧ殑楠岃瘉鐮佹槸锛�"+code+",楠岃瘉鐮佹湁鏁堟湡5鍒嗛挓";
+
+ String mac = getMac(ecName, apId, secretKey, tel, param, sign, addSerial);
//寮�濮嬪彂閫侀獙璇佺爜
String reqParam = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
@@ -115,16 +153,13 @@
" <mobiles>\n" +
" <string>" + tel + "</string>\n" +
" </mobiles>\n" +
- " <params>\n" +
- " <string>" + code + "</string>\n" +
- " </params>\n" +
+ " <content>" + param + "</content>\n" +
" <sign>" + sign + "</sign>\n" +
" <addSerial>" + addSerial + "</addSerial>\n" +
" <mac>" + mac + "</mac>\n" +
- " <templateId>" + templateId + "</templateId>\n" +
"</WsSubmitTempletReq>";
- reqParam = WEBSERVICE_BODY.replace("REQUESTBODY",reqParam);
+ reqParam = WEBSERVICE_BODY2.replace("REQUESTBODY",reqParam);
logger.debug("璇锋眰绉诲姩鍏徃璇锋眰鎶ユ枃锛歿}",reqParam);
HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.add("Content-Type","text/xml;charset=UTF-8");
@@ -138,6 +173,7 @@
}catch (Exception e){
logger.error("璋冪敤寮傚父",e);
}
+
}
@@ -173,7 +209,7 @@
" <mobiles>\n" +
" <string>" + tel + "</string>\n" +
" </mobiles>\n" +
- " <content>" + param + "</string>\n" +
+ " <content>" + param + "</content>\n" +
" <sign>" + sign + "</sign>\n" +
" <addSerial>" + addSerial + "</addSerial>\n" +
" <mac>" + mac + "</mac>\n" +
--
Gitblit v1.8.0