From 4aa37e731f4fafe3c2c17a60da56659a4ca58b84 Mon Sep 17 00:00:00 2001 From: whois Date: Tue, 16 Aug 2022 16:22:06 +0800 Subject: [PATCH] =?UTF-8?q?bug=20fix=EF=BC=9A=E7=9F=AD=E4=BF=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/resource/controller/SysSmsController.java | 4 ++-- .../java/com/ruoyi/resource/dubbo/RemoteSmsServiceImpl.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysSmsController.java b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysSmsController.java index 7dcf3aef..9918cae8 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysSmsController.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysSmsController.java @@ -44,8 +44,8 @@ public class SysSmsController extends BaseController { */ @GetMapping("/code") public R smsCaptcha(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) { - if (smsProperties.getEnabled()) { - R.fail("当前系统没有开启短信功能！"); + if (!smsProperties.getEnabled()) { + return R.fail("当前系统没有开启短信功能！"); } String key = CacheConstants.CAPTCHA_CODE_KEY + phonenumber; String code = RandomUtil.randomNumbers(4); diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/dubbo/RemoteSmsServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/dubbo/RemoteSmsServiceImpl.java index 02eb9de8..33583045 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/dubbo/RemoteSmsServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/dubbo/RemoteSmsServiceImpl.java @@ -1,7 +1,6 @@ package com.ruoyi.resource.dubbo; import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.sms.config.properties.SmsProperties; @@ -37,8 +36,8 @@ public class RemoteSmsServiceImpl implements RemoteSmsService { * @param param 模板对应参数 */ public SysSms send(String phones, String templateId, Map param) throws ServiceException { - if (smsProperties.getEnabled()) { - R.fail("当前系统没有开启短信功能！"); + if (!smsProperties.getEnabled()) { + throw new ServiceException("当前系统没有开启短信功能！"); } SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class); SmsResult smsResult = smsTemplate.send(phones, templateId, param);