Sfoglia il codice sorgente

将邮件配置写入yml文件中

husj 1 mese fa
parent
commit
27f1875676

+ 0 - 24
src/main/java/top/husj/husj_wx/properties/MailProperties.java

@@ -1,24 +0,0 @@
-package top.husj.husj_wx.properties;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Data
-@Component
-public class MailProperties {
-    @Value("${mail.host}")
-    private String host;
-
-    @Value("${mail.port}")
-    private String port;
-
-    @Value("${mail.username}")
-    private String username;
-
-    @Value("${mail.password}")
-    private String password;
-
-    @Value("${mail.alert-to}")
-    private String alertTo;
-}

+ 7 - 7
src/main/java/top/husj/husj_wx/service/AccessTokenService.java

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
-import top.husj.husj_wx.properties.MailProperties;
+import top.husj.husj_wx.properties.EmailProperties;
 import top.husj.husj_wx.properties.WeChatProperties;
 import top.husj.husj_wx.utils.AccessTokenUtil;
 import top.husj.husj_wx.utils.EmailUtil;
@@ -19,7 +19,7 @@ public class AccessTokenService {
     @Autowired
     private WeChatProperties weChatProperties;
     @Autowired
-    private MailProperties mailProperties;
+    private EmailProperties emailProperties;
 
     /**
      * 刷新access_token的核心逻辑
@@ -47,12 +47,12 @@ public class AccessTokenService {
         } catch (Exception e) {
             log.error("获取access_token时发生异常: ", e);
             EmailUtil emailUtil = new EmailUtil(
-                    mailProperties.getHost(),
-                    mailProperties.getPort(),
-                    mailProperties.getUsername(),
-                    mailProperties.getPassword()
+                    emailProperties.getHost(),
+                    emailProperties.getPort(),
+                    emailProperties.getUsername(),
+                    emailProperties.getPassword()
             );
-            emailUtil.sendTextEmail(mailProperties.getAlertTo(), "微信公众号token获取失败请检查", "微信公众号token获取失败请检查");
+            emailUtil.sendTextEmail(emailProperties.getNotifyTo(), "微信公众号token获取失败请检查", "微信公众号token获取失败请检查");
         }
     }
 

+ 0 - 6
src/main/resources/application.yml

@@ -32,9 +32,3 @@ email:
   password: 15629747218hsjH
   notifyTo: 807244836@qq.com
 
-mail:
-  host: smtp.030208.xyz
-  port: "465"
-  username: husj@030208.xyz
-  password: 15629747218hsjH
-  alert-to: 807244836@qq.com