From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: 星期三, 18 一月 2023 17:09:43 +0800 Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ; --- ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java similarity index 72% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java rename to ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java index 20769aa..44a95b6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java @@ -1,21 +1,23 @@ -package com.ruoyi.framework.config; +package com.ruoyi.common.mail.config; import cn.hutool.extra.mail.MailAccount; -import com.ruoyi.framework.config.properties.MailProperties; +import com.ruoyi.common.mail.config.properties.MailProperties; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * JavaMail 閰嶇疆 * * @author Michelle.Chung */ -@Configuration +@AutoConfiguration +@ConditionalOnProperty(value = "mail.enabled", havingValue = "true") +@EnableConfigurationProperties(MailProperties.class) public class MailConfig { @Bean - @ConditionalOnProperty(value = "mail.enabled", havingValue = "true") public MailAccount mailAccount(MailProperties mailProperties) { MailAccount account = new MailAccount(); account.setHost(mailProperties.getHost()); -- Gitblit v1.9.3