From 3483dc0e90b7e47ca3be4928e691df29b3f5f07b Mon Sep 17 00:00:00 2001 From: mashuai Date: Sat, 9 Dec 2023 10:31:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=AD=E4=BF=A1id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml b/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml index 922af58..a1f24de 100644 --- a/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml +++ b/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml @@ -13,7 +13,8 @@ tencent: # 短信签名内容 signName: 作业智慧管控系统小程序 # 正文模板ID - templateId: 2014173 + # templateId: 2014173 + templateId: 2014506 # 超时时间 timeout: 1000 From bda31c5b1ed1097d80e024a947a2b11d36ef4255 Mon Sep 17 00:00:00 2001 From: nmy <849173236@qq.com> Date: Sat, 9 Dec 2023 10:42:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/zlpt/auth/service/SysLoginService.java | 4 +++- .../com/bonus/zlpt/system/config/SmsComponent.java | 8 +++++--- .../zlpt/system/controller/SmsSendController.java | 4 ++-- .../com/bonus/zlpt/system/service/ISmsService.java | 2 +- .../zlpt/system/service/impl/ISmsServiceImpl.java | 14 ++++++++++++-- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java index 81959f9..08d21e1 100644 --- a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java +++ b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java @@ -126,13 +126,15 @@ public class SysLoginService { - checkCode(phonenumber,code); + if (StringUtils.isAnyBlank(phonenumber,code,username, password)) { throw new ServiceException("用户/密码必须填写"); } + checkCode(phonenumber,code); + String mobileRegEx = "^1[3,4,5,6,7,8,9][0-9]{9}$"; Pattern pattern = Pattern.compile(mobileRegEx); Matcher matcher = pattern.matcher(phonenumber); diff --git a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/config/SmsComponent.java b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/config/SmsComponent.java index c3016f6..e6d017a 100644 --- a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/config/SmsComponent.java +++ b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/config/SmsComponent.java @@ -13,6 +13,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import java.util.Map; + /** * Description: 腾讯云短信配置 * @@ -39,7 +41,7 @@ public class SmsComponent { private String signName; @Value("${tencent.sms.templateId}") - private String templateCodeId; + private Map templateCodeIds; @Value("${tencent.sms.timeout}") private Integer timeout; @@ -92,11 +94,11 @@ public class SmsComponent { * @param code 验证码 * @param param2 分钟参数（可为空） */ - public void sendCode(String phone, String code, String param2) { + public void sendCode(String phone, String code, String param2,Integer type) { // 返回的resp是一个SendSmsResponse的实例，与请求对象对应 SendSmsResponse resp; try { - resp = getClient().SendSms(getReqTwo(phone, code,param2 ,templateCodeId)); // 模板id是自己设置好的 + resp = getClient().SendSms(getReqTwo(phone, code,param2 ,templateCodeIds.get(type))); // 模板id是自己设置好的 log.info(SendSmsResponse.toJsonString(resp)); // 把返回信息输入到日志中 } catch (TencentCloudSDKException e) { log.error("腾讯云短信发送失败"); diff --git a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/SmsSendController.java b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/SmsSendController.java index 454c7c0..d97d2b3 100644 --- a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/SmsSendController.java +++ b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/SmsSendController.java @@ -24,9 +24,9 @@ public class SmsSendController extends BaseController { private ISmsService smsService; @PostMapping("send") - public AjaxResult send(@RequestParam("phone") String phone){ + public AjaxResult send(@RequestParam("phone") String phone,@RequestParam("type") Integer type){ try { - String msg = smsService.sendCode(phone, 5 * 60 * 1000); + String msg = smsService.sendCode(phone, 5 * 60 * 1000,type); return success(msg); } catch (Exception e) { return error(e.getMessage()); diff --git a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/ISmsService.java b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/ISmsService.java index dd83e31..e1e9cb0 100644 --- a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/ISmsService.java +++ b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/ISmsService.java @@ -14,7 +14,7 @@ public interface ISmsService { * @param leastTime 短信有效时间 * @return 结果 */ - public String sendCode( String phone,int leastTime); + public String sendCode(String phone,int leastTime,Integer type); /** * 校验验证码 diff --git a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/impl/ISmsServiceImpl.java b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/impl/ISmsServiceImpl.java index b3ca0de..2380878 100644 --- a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/impl/ISmsServiceImpl.java +++ b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/impl/ISmsServiceImpl.java @@ -11,6 +11,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Random; import java.util.concurrent.TimeUnit; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Description: 短信发送接口实现 @@ -35,11 +37,19 @@ public class ISmsServiceImpl implements ISmsService { * @throws ServiceException 异常信息 */ @Override - public String sendCode(String phone, int leastTime) { + public String sendCode(String phone, int leastTime,Integer type) { if (phone == null || phone.isEmpty()) { throw new ServiceException("手机号为空"); } + String mobileRegEx = "^1[3,4,5,6,7,8,9][0-9]{9}$"; + Pattern pattern = Pattern.compile(mobileRegEx); + + Matcher matcher = pattern.matcher(phone); + + if (!matcher.matches()) { + throw new ServiceException("手机号格式错误"); + } //从redis获取有效时间 如果相差小于1分钟不可以重新发送 long expire = redisCache.getExpire(RedisConstants.REDIS_PHONE_CODE_KEY + phone); @@ -51,7 +61,7 @@ public class ISmsServiceImpl implements ISmsService { String code = getSixBitCode(); // 生成新的验证码 //存储 phone -> code到Redis中 redisCache.setCacheObject(RedisConstants.REDIS_PHONE_CODE_KEY + phone, code, Long.parseLong(leastTime+""), TimeUnit.MILLISECONDS); - smsComponent.sendCode(phone, code,""); + smsComponent.sendCode(phone, code,"",type); return "已发送验证码 " + phone; } From 41490f42af972a4a5e1cadbb734ddc7814c9a62e Mon Sep 17 00:00:00 2001 From: nmy <849173236@qq.com> Date: Sat, 9 Dec 2023 10:43:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zlpt-equip/src/main/resources/bootstrap.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/zlpt-modules/zlpt-equip/src/main/resources/bootstrap.yml b/zlpt-modules/zlpt-equip/src/main/resources/bootstrap.yml index 1eb96bb..0cc1260 100644 --- a/zlpt-modules/zlpt-equip/src/main/resources/bootstrap.yml +++ b/zlpt-modules/zlpt-equip/src/main/resources/bootstrap.yml @@ -12,16 +12,18 @@ spring: active: zlpt_cloud_dev cloud: nacos: - username: nacos - password: Bonus@admin123! +# username: nacos +# password: Bonus@admin123! discovery: # 服务注册地址 - server-addr: 192.168.1.3:8848 -# namespace: zlpt_cloud_dev +# server-addr: 192.168.1.3:8848 + server-addr: 10.40.92.74:8848 + namespace: zlpt_cloud_dev config: # 配置中心地址 - server-addr: 192.168.1.3:8848 -# namespace: zlpt_cloud_dev +# server-addr: 192.168.1.3:8848 + server-addr: 10.40.92.74:8848 + namespace: zlpt_cloud_dev # 配置文件格式 file-extension: yml # 共享配置 From 83dffa593f5a1ba2ba1ed836b383edc9e78dc190 Mon Sep 17 00:00:00 2001 From: nmy <849173236@qq.com> Date: Sat, 9 Dec 2023 10:43:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml b/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml index a1f24de..707339f 100644 --- a/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml +++ b/zlpt-modules/zlpt-system/src/main/resources/bootstrap.yml @@ -13,8 +13,9 @@ tencent: # 短信签名内容 signName: 作业智慧管控系统小程序 # 正文模板ID - # templateId: 2014173 - templateId: 2014506 + templateCodeIds: + 1: 2014173 + 2: 2014506 # 超时时间 timeout: 1000