From c9d45e30486348af54a62a4931b4ab71b4dfeea5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 30 Jun 2023 15:57:28 +0800
Subject: [PATCH] 代码整理
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java
index 0f712c5..a1032b1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java
@@ -17,18 +17,15 @@
import com.alibaba.excel.EasyExcel;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import static cn.gistack.alerts.sms.util.SmsUtils.validator;
import static cn.gistack.common.cache.CacheNames.PHONE_KEY;
/**
@@ -177,24 +174,6 @@
}
/**
- * 校验手机号码
- */
- 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}$";
- if (phone.length() != 11) {
- return false;
- } else {
- Pattern p = Pattern.compile(regex);
- Matcher m = p.matcher(phone);
- boolean isMatch = m.matches();
- return isMatch;
- }
- }
- return false;
- }
-
- /**
* 保存验证码到 redis
* @param userNumber
* @param randNumber
@@ -299,7 +278,7 @@
* @param endTime 短信内容填报截止时间
* @return
*/
- @GetMapping("/import-send-rain-sms")
+ @PostMapping("/import-send-rain-sms")
public R importSendRainSms(MultipartFile file,String startTime,String endTime){
ExcelListener<SendRainSmsExcel> listener = new ExcelListener<>();
//headRowNumber(1)从第2行开始读取，使用getDatas()方法取出数据
--
Gitblit v1.9.3