From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/util/SmsUtils.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/util/SmsUtils.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/util/SmsUtils.java
index 146cdfb..8328313 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/util/SmsUtils.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/util/SmsUtils.java
@@ -10,6 +10,7 @@
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
import cn.com.flaginfo.sdk.cmc.common.ApiEnum;
+import cn.gistack.alerts.sms.dto.DynSMSSendRequestDTO;
import cn.gistack.common.constant.SmsConstant;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Component;
@@ -52,7 +53,8 @@
*/
public static boolean validator(String phone) {
if (null!=phone && !phone.equals("")) {
- String regex = "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}$";
+// String regex = "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}$";
+ String regex = "^1[3456789]\\d{9}$";
if (phone.length() != 11) {
return false;
} else {
@@ -90,6 +92,7 @@
api.setRequestUrl(SmsConstant.HOST + SmsConstant.sendVarUrl);
//请求参数
sendRequest.setSerialNumber(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()));
+
ComResult<DynSMSSendDataResult> result = api.request(sendRequest);
// 返回
return result;
--
Gitblit v1.9.3