From 79b7a9a6db4e5165e837ac083ccc70147135d571 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 12 八月 2025 11:45:51 +0800
Subject: [PATCH] 修改bug

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/SMSUtil.java |   72 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/SMSUtil.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/SMSUtil.java
index 131392f..1d5fcaa 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/SMSUtil.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/SMSUtil.java
@@ -2,8 +2,11 @@
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
 import com.open.common.util.OpenApiClient;
 import com.open.common.util.SystemParameterNames;
+import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.SendSmsRequest;
 import lombok.extern.slf4j.Slf4j;
 
 import java.text.SimpleDateFormat;
@@ -20,6 +23,8 @@
 @Slf4j
 public class SMSUtil {
 	
+	private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();
+	
 	
 	/**
 	 * 获取易信验证码
@@ -28,11 +33,11 @@
 	 */
 	public static String sendVerifyCode(String mobile) {
 		//请求路径
-		String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/sendVerifyCode";
+		String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/sendVerifyCode";
 		//私钥文件
-		String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+		String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
 		//注意:私钥文件需要开发者手动新建.pem文件,将委办局提供的私钥串复制进文件里用于sign加密
-		String appKey = QianYunTongProperties.appkey;//appkey
+		String appKey = qianYunTongConfig.getAppkey();//appkey
 		Map<String, String> headers = new HashMap<>();
 		headers.put("Content-Type", "application/json");
 		Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -43,8 +48,8 @@
 		String messageId = UUID.randomUUID().toString().replaceAll("-", "");
 		contentMap.put(SystemParameterNames.getAppKey(), appKey);
 		contentMap.put(SystemParameterNames.getMessage_id(), messageId);
-		contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
-		contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+		contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+		contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
 		contentMap.put("content", "{\"mobile\":\"" + mobile + "\"}");
 		log.info("【获取易信验证码】请求地址:" + url);
 		log.info("【获取易信验证码】请求参数:" + JSON.toJSONString(contentMap));
@@ -64,4 +69,61 @@
 		}
 		return object.getString("code");
 	}
+	
+	public static void main(String[] args) {
+		SendSmsRequest request = new SendSmsRequest();
+		request.setDestAddress("15828353127");
+		request.setTemplateId("TPL202507300002");
+		Map<String, String> templateParams = new HashMap<>();
+//		templateParams.put("code", "1234");
+		request.setTemplateParams(templateParams);
+//		request.setCode("code");
+		request.setSpId("Y86asr7J");
+		SMSUtil.sendSms(request);
+	}
+	
+	/**
+	 * 根据模板发送短信
+	 *
+	 * @param request
+	 * @return
+	 */
+	public static Boolean sendSms(SendSmsRequest request) {
+		//请求路径
+		String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/sendSmsByTpl";
+		//私钥文件
+		String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
+		//注意:私钥文件需要开发者手动新建.pem文件,将委办局提供的私钥串复制进文件里用于sign加密
+		String appKey = qianYunTongConfig.getAppkey();//appkey
+		Map<String, String> headers = new HashMap<>();
+		headers.put("Content-Type", "application/json");
+		Map<String, Object> contentMap = new HashMap<String, Object>();
+		Date nowdate = new Date();
+		SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss");
+		
+		String timeStamp = date.format(nowdate);
+		String messageId = UUID.randomUUID().toString().replaceAll("-", "");
+		contentMap.put(SystemParameterNames.getAppKey(), appKey);
+		contentMap.put(SystemParameterNames.getMessage_id(), messageId);
+		contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+		contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
+		contentMap.put("content", new Gson().toJson(request));
+		log.info("【根据模板发送短信】请求地址:" + url);
+		log.info("【根据模板发送短信】请求参数:" + JSON.toJSONString(contentMap));
+		String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap);
+		log.info("【根据模板发送短信】请求结果:" + result);
+		JSONObject jsonObject = JSON.parseObject(result);
+		String retCode = jsonObject.getString("retCode");
+		if (!"0".equals(retCode)) {
+			log.error("【根据模板发送短信】请求失败:" + result);
+			throw new RuntimeException("【根据模板发送短信】请求失败:" + result);
+		}
+		JSONObject object = jsonObject.getJSONObject("object");
+		String status = object.getString("status");
+		if (!"0".equals(status)) {
+			log.error("【根据模板发送短信】失败:" + object.toJSONString());
+			throw new RuntimeException("【根据模板发送短信】失败:" + object.toJSONString());
+		}
+		return true;
+	}
 }

--
Gitblit v1.7.1