Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
392cd48b
Unverified
Commit
392cd48b
authored
Jul 26, 2022
by
gaogao110
Committed by
GitHub
Jul 26, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix mail alert params bug (#774)
* Fix mail alert params bug * Update MailSender.java
parent
3b3695e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
8 deletions
+19
-8
MailSender.java
...email/src/main/java/com/dlink/alert/email/MailSender.java
+19
-8
No files found.
dlink-alert/dlink-alert-email/src/main/java/com/dlink/alert/email/MailSender.java
View file @
392cd48b
...
...
@@ -102,13 +102,10 @@ public final class MailSender {
requireNonNull
(
mailPasswd
,
EmailConstants
.
NAME_MAIL_PASSWD
+
mustNotNull
);
mailUseStartTLS
=
config
.
get
(
EmailConstants
.
NAME_MAIL_SMTP_STARTTLS_ENABLE
);
requireNonNull
(
mailUseStartTLS
,
EmailConstants
.
NAME_MAIL_SMTP_STARTTLS_ENABLE
+
mustNotNull
);
mailUseSSL
=
config
.
get
(
EmailConstants
.
NAME_MAIL_SMTP_SSL_ENABLE
);
requireNonNull
(
mailUseSSL
,
EmailConstants
.
NAME_MAIL_SMTP_SSL_ENABLE
+
mustNotNull
);
sslTrust
=
config
.
get
(
EmailConstants
.
NAME_MAIL_SMTP_SSL_TRUST
);
requireNonNull
(
sslTrust
,
EmailConstants
.
NAME_MAIL_SMTP_SSL_TRUST
+
mustNotNull
);
showType
=
config
.
get
(
EmailConstants
.
NAME_SHOW_TYPE
);
requireNonNull
(
showType
,
EmailConstants
.
NAME_SHOW_TYPE
+
mustNotNull
);
...
...
@@ -276,11 +273,25 @@ public final class MailSender {
Properties
props
=
new
Properties
();
props
.
setProperty
(
EmailConstants
.
MAIL_SMTP_HOST
,
mailSmtpHost
);
props
.
setProperty
(
EmailConstants
.
MAIL_SMTP_PORT
,
mailSmtpPort
);
props
.
setProperty
(
EmailConstants
.
MAIL_SMTP_AUTH
,
enableSmtpAuth
);
props
.
setProperty
(
EmailConstants
.
MAIL_TRANSPORT_PROTOCOL
,
mailProtocol
);
props
.
setProperty
(
EmailConstants
.
MAIL_SMTP_STARTTLS_ENABLE
,
mailUseStartTLS
);
props
.
setProperty
(
EmailConstants
.
MAIL_SMTP_SSL_ENABLE
,
mailUseSSL
);
props
.
setProperty
(
EmailConstants
.
MAIL_SMTP_SSL_TRUST
,
sslTrust
);
if
(
StringUtils
.
isNotEmpty
(
enableSmtpAuth
)){
props
.
setProperty
(
EmailConstants
.
MAIL_SMTP_AUTH
,
enableSmtpAuth
);
}
if
(
StringUtils
.
isNotEmpty
(
mailProtocol
)){
props
.
setProperty
(
EmailConstants
.
MAIL_TRANSPORT_PROTOCOL
,
mailProtocol
);
}
if
(
StringUtils
.
isNotEmpty
(
mailUseSSL
)){
props
.
setProperty
(
EmailConstants
.
MAIL_SMTP_SSL_ENABLE
,
mailUseSSL
);
}
if
(
StringUtils
.
isNotEmpty
(
mailUseStartTLS
)){
props
.
setProperty
(
EmailConstants
.
MAIL_SMTP_STARTTLS_ENABLE
,
mailUseStartTLS
);
}
if
(
StringUtils
.
isNotEmpty
(
sslTrust
)){
props
.
setProperty
(
EmailConstants
.
MAIL_SMTP_SSL_TRUST
,
sslTrust
);
}
Authenticator
auth
=
new
Authenticator
()
{
@Override
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment