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
273b3229
Commit
273b3229
authored
Jun 24, 2022
by
Forus0322
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Fix-638][Alert]Fix problems about the email alarm notification, cannot customize the nickname.
parent
7246b1f5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
MailSender.java
...email/src/main/java/com/dlink/alert/email/MailSender.java
+5
-5
No files found.
dlink-alert/dlink-alert-email/src/main/java/com/dlink/alert/email/MailSender.java
View file @
273b3229
...
...
@@ -37,7 +37,7 @@ public final class MailSender {
private
final
String
mailProtocol
=
"SMTP"
;
private
final
String
mailSmtpHost
;
private
final
String
mailSmtpPort
;
private
final
String
mailSender
Email
;
private
final
String
mailSender
NickName
;
private
final
String
enableSmtpAuth
;
private
final
String
mailUser
;
private
final
String
mailPasswd
;
...
...
@@ -70,8 +70,8 @@ public final class MailSender {
mailSmtpPort
=
config
.
get
(
EmailConstants
.
NAME_MAIL_SMTP_PORT
);
requireNonNull
(
mailSmtpPort
,
EmailConstants
.
NAME_MAIL_SMTP_PORT
+
mustNotNull
);
mailSender
Email
=
config
.
get
(
EmailConstants
.
NAME_MAIL_SENDER
);
requireNonNull
(
mailSender
Email
,
EmailConstants
.
NAME_MAIL_SENDER
+
mustNotNull
);
mailSender
NickName
=
config
.
get
(
EmailConstants
.
NAME_MAIL_SENDER
);
requireNonNull
(
mailSender
NickName
,
EmailConstants
.
NAME_MAIL_SENDER
+
mustNotNull
);
enableSmtpAuth
=
config
.
get
(
EmailConstants
.
NAME_MAIL_SMTP_AUTH
);
...
...
@@ -137,7 +137,7 @@ public final class MailSender {
try
{
Session
session
=
getSession
();
email
.
setMailSession
(
session
);
email
.
setFrom
(
mail
SenderEmail
);
email
.
setFrom
(
mail
User
,
mailSenderNickName
);
email
.
setCharset
(
EmailConstants
.
UTF_8
);
if
(
CollectionUtils
.
isNotEmpty
(
receivers
))
{
// receivers mail
...
...
@@ -230,7 +230,7 @@ public final class MailSender {
// 2. creating mail: Creating a MimeMessage
MimeMessage
msg
=
new
MimeMessage
(
session
);
// 3. set sender
msg
.
setFrom
(
new
InternetAddress
(
mail
SenderEmail
));
msg
.
setFrom
(
new
InternetAddress
(
mail
User
));
// 4. set receivers
for
(
String
receiver
:
receivers
)
{
msg
.
addRecipients
(
Message
.
RecipientType
.
TO
,
InternetAddress
.
parse
(
receiver
));
...
...
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