From 20001a775126c1be95a2b84cebb8813a54608712 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 八月 2023 14:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/factory/TencentSendMessageFactory.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/TencentSendMessageFactory.java b/java110-core/src/main/java/com/java110/core/factory/TencentSendMessageFactory.java
index fe8214a..a6d6681 100755
--- a/java110-core/src/main/java/com/java110/core/factory/TencentSendMessageFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/TencentSendMessageFactory.java
@@ -1,17 +1,8 @@
package com.java110.core.factory;
import com.alibaba.fastjson.JSONObject;
-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.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 com.tencentcloudapi.common.Credential;
import com.tencentcloudapi.common.exception.TencentCloudSDKException;
@@ -20,10 +11,9 @@
import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest;
import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
import java.util.Random;
/*
@@ -70,7 +60,8 @@
Random random = new Random();
String result = "";
for (int i = 0; i < limit; i++) {
- result += (random.nextInt(9) + 1);;
+ result += (random.nextInt(9) + 1);
+ ;
}
return result;
}
@@ -96,13 +87,16 @@
sendSmsRequest.setTemplateParamSet(templateParam);
sendSmsRequest.setSign(MappingCache.getValue(TENCENT_SMS_DOMAIN, "Sign")); //绛惧悕鍐呭锛屼笉鏄～绛惧悕id,瑙併�婂垱寤虹煭淇＄鍚嶅拰妯＄増銆嬪皬鑺�
SendSmsResponse sendSmsResponse = null;
+ String errMsg= "鍙戦�佺煭淇″け璐�:";
try {
sendSmsResponse = smsClient.SendSms(sendSmsRequest); //鍙戦�佺煭淇�
} catch (TencentCloudSDKException e) {
logger.error("鍙戦�佺煭淇″け璐�", e);
+ errMsg = e.getMessage();
}
- logger.debug("鑵捐鐭俊楠岃瘉鐮佸彂閫侊紝璇锋眰鎶ユ枃" + JSONObject.toJSONString(sendSmsRequest) + ",杩斿洖鏃ュ織" + (sendSmsResponse != null ? sendSmsResponse.toString() : ""));
+ logger.debug("鑵捐鐭俊楠岃瘉鐮佸彂閫侊紝璇锋眰鎶ユ枃" + JSONObject.toJSONString(sendSmsRequest) + ",杩斿洖鏃ュ織" + (sendSmsResponse != null ? JSONObject.toJSONString(sendSmsResponse) : ""));
+ LogFactory.saveOutLog("SMS", JSONObject.toJSONString(sendSmsRequest), new ResponseEntity((sendSmsResponse != null ? JSONObject.toJSONString(sendSmsResponse) : errMsg), HttpStatus.OK));
}
@@ -120,7 +114,7 @@
String[] phones = {"+86" + tel}; //鍙戦�佺煭淇＄殑鐩爣鎵嬫満鍙凤紝鍙～澶氫釜銆�
sendSmsRequest.setPhoneNumberSet(phones);
sendSmsRequest.setTemplateID(smsConfigDto.getTemplateCode()); //妯＄増id,瑙併�婂垱寤虹煭淇＄鍚嶅拰妯＄増銆嬪皬鑺�
- String[] templateParam = (String[])param;//妯＄増鍙傛暟锛屼粠鍓嶅線鍚庡搴旂殑鏄ā鐗堢殑{1}銆亄2}绛�,瑙併�婂垱寤虹煭淇＄鍚嶅拰妯＄増銆嬪皬鑺�
+ String[] templateParam = (String[]) param;//妯＄増鍙傛暟锛屼粠鍓嶅線鍚庡搴旂殑鏄ā鐗堢殑{1}銆亄2}绛�,瑙併�婂垱寤虹煭淇＄鍚嶅拰妯＄増銆嬪皬鑺�
sendSmsRequest.setTemplateParamSet(templateParam);
sendSmsRequest.setSign(smsConfigDto.getSignName()); //绛惧悕鍐呭锛屼笉鏄～绛惧悕id,瑙併�婂垱寤虹煭淇＄鍚嶅拰妯＄増銆嬪皬鑺�
SendSmsResponse sendSmsResponse = null;
@@ -132,7 +126,7 @@
logger.debug("鑵捐鐭俊楠岃瘉鐮佸彂閫侊紝璇锋眰鎶ユ枃" + JSONObject.toJSONString(sendSmsRequest) + ",杩斿洖鏃ュ織" + (sendSmsResponse != null ? sendSmsResponse.toString() : ""));
- return new ResultVo(ResultVo.CODE_OK,ResultVo.MSG_OK);
+ return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
}
--
Gitblit v1.8.0