update 重构 pr_172 集成邮件发送功能

疯狂的狮子Li

2022-05-02 4941aaa5c1c59f17881d3587f1679b93736bd01e

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java

@@ -6,8 +6,6 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import javax.annotation.Resource;

/**
 * JavaMail 配置
 *
@@ -16,23 +14,21 @@
@Configuration
public class MailConfig {

    @Resource
    private MailProperties mailProperties;

    /**
     * 初始化 JavaMailSender
     */
    @Bean
    @ConditionalOnProperty(value = "spring.mail.enabled", havingValue = "true")
    public MailAccount mailAccount() {
    @ConditionalOnProperty(value = "mail.enabled", havingValue = "true")
    public MailAccount mailAccount(MailProperties mailProperties) {
        MailAccount account = new MailAccount();
        account.setFrom(mailProperties.getUsername());
        account.setUser(mailProperties.getUsername());
        account.setPass(mailProperties.getPassword());
        account.setHost(mailProperties.getHost());
        account.setPort(mailProperties.getPort());
        account.setAuth(mailProperties.getAuth());
        account.setDebug(mailProperties.getDebug());
        account.setFrom(mailProperties.getFrom());
        account.setUser(mailProperties.getUser());
        account.setPass(mailProperties.getPass());
        account.setSocketFactoryPort(mailProperties.getPort());
        account.setStarttlsEnable(mailProperties.getStarttlsEnable());
        account.setSslEnable(mailProperties.getSslEnable());
        account.setTimeout(mailProperties.getTimeout());
        account.setConnectionTimeout(mailProperties.getConnectionTimeout());
        return account;
    }