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);