From 1d248643798fc53910a16ecfe7955f815ddcdfb4 Mon Sep 17 00:00:00 2001
From: lishuyan <1206770390@qq.com>
Date: Fri, 31 Mar 2023 17:25:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8D=20=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=B3=A8=E5=85=A5mailProperties=20=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=20resource=20=E6=A8=A1=E5=9D=97=E6=97=A0=E6=B3=95=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/common/mail/config/MailConfiguration.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfiguration.java b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfiguration.java
index c455e142..5ed27067 100644
--- a/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfiguration.java
+++ b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfiguration.java
@@ -13,11 +13,11 @@ import org.springframework.context.annotation.Bean;
  * @author Michelle.Chung
  */
 @AutoConfiguration
-@ConditionalOnProperty(value = "mail.enabled", havingValue = "true")
 @EnableConfigurationProperties(MailProperties.class)
 public class MailConfiguration {
 
     @Bean
+    @ConditionalOnProperty(value = "mail.enabled", havingValue = "true")
     public MailAccount mailAccount(MailProperties mailProperties) {
         MailAccount account = new MailAccount();
         account.setHost(mailProperties.getHost());