Sfoglia il codice sorgente

fix: 修复 无法注入mailProperties 导致 resource 模块无法启动问题

lishuyan 3 anni fa
parent
commit
1d24864379

+ 1 - 1
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());