Commit 52ebcaaad75e36f4981fb22b93dcf5848326a090
1 parent
3590336b
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/
Showing
1 changed file
with
1 additions
and
5 deletions
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java
| @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; | @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; | ||
| 5 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 5 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 7 | import cn.iocoder.yudao.framework.sms.core.client.SmsClient; | 7 | import cn.iocoder.yudao.framework.sms.core.client.SmsClient; |
| 8 | -import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory; | ||
| 9 | import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; | 8 | import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; |
| 10 | import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; | 9 | import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; |
| 11 | import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateCreateReqVO; | 10 | import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateCreateReqVO; |
| @@ -54,9 +53,6 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | @@ -54,9 +53,6 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | ||
| 54 | @Resource | 53 | @Resource |
| 55 | private SmsChannelService smsChannelService; | 54 | private SmsChannelService smsChannelService; |
| 56 | 55 | ||
| 57 | - @Resource | ||
| 58 | - private SmsClientFactory smsClientFactory; | ||
| 59 | - | ||
| 60 | @Override | 56 | @Override |
| 61 | public Long createSmsTemplate(SmsTemplateCreateReqVO createReqVO) { | 57 | public Long createSmsTemplate(SmsTemplateCreateReqVO createReqVO) { |
| 62 | // 校验短信渠道 | 58 | // 校验短信渠道 |
| @@ -174,7 +170,7 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | @@ -174,7 +170,7 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | ||
| 174 | @VisibleForTesting | 170 | @VisibleForTesting |
| 175 | void validateApiTemplate(Long channelId, String apiTemplateId) { | 171 | void validateApiTemplate(Long channelId, String apiTemplateId) { |
| 176 | // 获得短信模板 | 172 | // 获得短信模板 |
| 177 | - SmsClient smsClient = smsClientFactory.getSmsClient(channelId); | 173 | + SmsClient smsClient = smsChannelService.getSmsClient(channelId); |
| 178 | Assert.notNull(smsClient, String.format("短信客户端(%d) 不存在", channelId)); | 174 | Assert.notNull(smsClient, String.format("短信客户端(%d) 不存在", channelId)); |
| 179 | SmsCommonResult<SmsTemplateRespDTO> templateResult = smsClient.getSmsTemplate(apiTemplateId); | 175 | SmsCommonResult<SmsTemplateRespDTO> templateResult = smsClient.getSmsTemplate(apiTemplateId); |
| 180 | // 校验短信模板是否正确 | 176 | // 校验短信模板是否正确 |