Merge remote-tracking branch 'origin/release' into release

2 years ago · a463c32fb9
parent b50eb3b3f3 caa1f1b84f
commit a463c32fb9
1 changed files with 2 additions and 2 deletions
--- a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java
@ -297,8 +297,8 @@ public class SnEmailGatherTask {
            props.setProperty(mail_host, mail_protocol_type+"."+mailSuffix); // pop3服务器
            props.setProperty(mail_port, port); // 端口
        }else {
-            props.setProperty(mail_protocol, mail_protocol_type2); // 协议
-            props.setProperty(mail_host, mail_protocol_type2+"."+mailSuffix); // pop3服务器
+            props.setProperty(mail_protocol, mail_protocol_type); // 协议
+            props.setProperty(mail_host, mail_protocol_type+"."+mailSuffix); // pop3服务器
            props.setProperty(mail_port, port); // 端口
        }
        Session session = Session.getInstance(props);