diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/express/config/ExpressAutoConfiguration.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/express/config/ExpressAutoConfiguration.java index 0e3f3319..08c68e6c 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/express/config/ExpressAutoConfiguration.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/express/config/ExpressAutoConfiguration.java @@ -1,15 +1,9 @@ package org.linlinjava.litemall.core.express.config; -import com.github.qcloudsms.SmsSingleSender; import org.linlinjava.litemall.core.express.ExpressService; -import org.linlinjava.litemall.core.notify.NotifyService; -import org.linlinjava.litemall.core.notify.TencentSmsSender; -import org.linlinjava.litemall.core.notify.WxTemplateSender; -import org.linlinjava.litemall.core.notify.config.NotifyProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.mail.javamail.JavaMailSenderImpl; @Configuration @EnableConfigurationProperties(ExpressProperties.class) diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/notify/TencentSmsSender.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/notify/TencentSmsSender.java index 26685223..afee89cf 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/notify/TencentSmsSender.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/notify/TencentSmsSender.java @@ -12,7 +12,6 @@ import java.io.IOException; /* * 腾讯云短信服务 */ -@Service public class TencentSmsSender implements SmsSender { private final Log logger = LogFactory.getLog(TencentSmsSender.class); diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/notify/config/NotifyAutoConfiguration.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/notify/config/NotifyAutoConfiguration.java index d53a7aaa..17b31377 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/notify/config/NotifyAutoConfiguration.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/notify/config/NotifyAutoConfiguration.java @@ -7,6 +7,7 @@ import org.linlinjava.litemall.core.notify.WxTemplateSender; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.JavaMailSenderImpl; @Configuration @@ -25,30 +26,46 @@ public class NotifyAutoConfiguration { NotifyProperties.Mail mailConfig = properties.getMail(); if(mailConfig.isEnable()) { - JavaMailSenderImpl mailSender = new JavaMailSenderImpl(); - mailSender.setHost(mailConfig.getHost()); - mailSender.setUsername(mailConfig.getUsername()); - mailSender.setPassword(mailConfig.getPassword()); - notifyService.setMailSender(mailSender); + notifyService.setMailSender(mailSender()); notifyService.setSendFrom(mailConfig.getSendfrom()); notifyService.setSendTo(mailConfig.getSendto()); } NotifyProperties.Sms smsConfig = properties.getSms(); if(smsConfig.isEnable()){ - TencentSmsSender smsSender = new TencentSmsSender(); - smsSender.setSender(new SmsSingleSender(smsConfig.getAppid(), smsConfig.getAppkey())); - notifyService.setSmsSender(smsSender); + notifyService.setSmsSender(tencentSmsSender()); notifyService.setSmsTemplate(smsConfig.getTemplate()); } NotifyProperties.Wx wxConfig = properties.getWx(); if(wxConfig.isEnable()){ - WxTemplateSender wxTemplateSender = new WxTemplateSender(); - notifyService.setWxTemplateSender(wxTemplateSender); + notifyService.setWxTemplateSender(wxTemplateSender()); notifyService.setWxTemplate(wxConfig.getTemplate()); } return notifyService; } + @Bean + public JavaMailSender mailSender(){ + NotifyProperties.Mail mailConfig = properties.getMail(); + JavaMailSenderImpl mailSender = new JavaMailSenderImpl(); + mailSender.setHost(mailConfig.getHost()); + mailSender.setUsername(mailConfig.getUsername()); + mailSender.setPassword(mailConfig.getPassword()); + return mailSender; + } + + @Bean + public WxTemplateSender wxTemplateSender(){ + WxTemplateSender wxTemplateSender = new WxTemplateSender(); + return wxTemplateSender; + } + + @Bean + public TencentSmsSender tencentSmsSender(){ + NotifyProperties.Sms smsConfig = properties.getSms(); + TencentSmsSender smsSender = new TencentSmsSender(); + smsSender.setSender(new SmsSingleSender(smsConfig.getAppid(), smsConfig.getAppkey())); + return smsSender; + } }