Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
1
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
741d5686
authored
May 14, 2018
by
chongli
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.6.7' of 192.168.10.6:caosy/fun-golf-service into f-6.6.7
parents
0a801e4b
af0ad187
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
src/main/java/com/ctrip/fun/golf/task/GameRewardNumAlertTask.java
src/main/resources/email.properties
src/test/java/xml/request/insureRequest.xml
src/main/java/com/ctrip/fun/golf/task/GameRewardNumAlertTask.java
View file @
741d5686
...
...
@@ -71,8 +71,8 @@ public class GameRewardNumAlertTask implements Job {
MailObject
mailObject
=
this
.
jobWarningMail
.
getMailObject
();
mailObject
.
setSubject
(
"赛事奖品库存报警"
);
mailObject
.
setContent
(
content
);
mailObject
.
setTo
(
"awmsz@ctrip.com"
);
mailObject
.
setCopyto
(
"iw
tech@ctrip
.com"
);
mailObject
.
setTo
(
"awmsz@ctrip
iwan
.com"
);
mailObject
.
setCopyto
(
"iw
antech@ctripiwan
.com"
);
this
.
jobWarningMail
.
send
(
mailObject
);
logger
.
info
(
"sync GameRewardNumAlertTask: sent!"
);
}
else
{
...
...
src/main/resources/email.properties
View file @
741d5686
smtp
=
smtp.ctripiwan.com
from
=
caosy
@ctripiwan.com
from
=
lyhuang
@ctripiwan.com
to
=
iwan@ctripiwan.com
subject
=
Job
\u
5F02
\u
5E38
content
=
<h2>Exception Info:</h2></br>
...
...
src/test/java/xml/request/insureRequest.xml
View file @
741d5686
...
...
@@ -51,7 +51,7 @@
<linkManName>
刘静
</linkManName>
<linkManSexCode>
F
</linkManSexCode>
<linkManMobileTelephone>
18116316597
</linkManMobileTelephone>
<linkManEmail>
liu_ja@
Ctrip
.com
</linkManEmail>
<linkManEmail>
liu_ja@
ctripiwan
.com
</linkManEmail>
</groupPersonnelInfo>
</insuranceApplicantInfo>
<subjectInfo>
...
...
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