From d737a229856becf58cbc7b61b34426caf9056553 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 25 Apr 2023 15:27:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java
index 6b0d1d1..d51c025 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java
@@ -21,6 +21,8 @@
import cn.gistack.sm.sms.constant.SmsConstant;
import com.alibaba.fastjson.JSON;
import org.aspectj.lang.annotation.Before;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -29,10 +31,14 @@
import java.util.List;
import java.util.Random;
+import static cn.gistack.common.cache.CacheNames.PHONE_KEY;
import static cn.gistack.sm.sms.constant.SmsConstant.*;
@Component
public class SmsUtils {
+
+ @Autowired
+ private BladeRedis bladeRedis;
/**
* 固定内容发送
@@ -50,30 +56,18 @@
return JSON.toJSONString(request);
}
-// public static void main(String[] args) {
-// SMSSendRequest sendRequest = new SMSSendRequest();
-// sendRequest.setMessageContent("你有一项编号为12349的事务需要处理;");
-// sendRequest.setTemplateId("2431012234034");
-// sendRequest.setUserNumber("15170720695");
-// String s = sendMsg(sendRequest);
-// System.out.println("s = " + s);
-// }
-
/**
* 获取随机字符串
* @return
*/
public static String getRandNumber() {
- // 计算token
-// Date date = new Date();
-// String dateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(date);
Random random = new Random();
//把随机生成的数字转成字符串
String str = String.valueOf(random.nextInt(9));
for (int i = 0; i < 5; i++) {
str += random.nextInt(9);
}
- return String.valueOf(System.currentTimeMillis()) + str;
+ return str;
}
/**
@@ -86,7 +80,6 @@
DynSMSAPI api = (DynSMSAPI) provider.getApi(ApiEnum.SENDDYNSMS);
api.setRequestUrl(SmsConstant.HOST + SmsConstant.sendVarUrl);
//请求参数
-// sendRequest.setDynData(new String[][]{{"手机号码", "编号"}, {"13000000000", "456"}});
sendRequest.setSerialNumber(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()));
ComResult<DynSMSSendDataResult> result = api.request(sendRequest);
return JSON.toJSONString(result);
--
Gitblit v1.9.3