Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
sentinel
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
曲欣亮
sentinel
Commits
2279fd65
Commit
2279fd65
authored
Dec 17, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
bed43d86
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
EmailService.java
src/main/java/com/egolm/film/api/service/EmailService.java
+1
-1
EmailServiceImpl.java
...ava/com/egolm/film/api/service/impl/EmailServiceImpl.java
+2
-2
No files found.
src/main/java/com/egolm/film/api/service/EmailService.java
View file @
2279fd65
...
...
@@ -13,6 +13,6 @@ public interface EmailService {
* @param member_film_id
* @param template
*/
Map
<
String
,
Object
>
sendByTemplate_01
(
Long
member_film_id
,
String
template
);
Map
<
String
,
Object
>
sendByTemplate_01
(
Long
member_film_id
,
String
prefix
);
}
src/main/java/com/egolm/film/api/service/impl/EmailServiceImpl.java
View file @
2279fd65
...
...
@@ -74,7 +74,7 @@ public class EmailServiceImpl implements EmailService {
@Autowired
Messages
messages
;
public
Map
<
String
,
Object
>
sendByTemplate_01
(
Long
member_film_id
,
String
template
)
{
public
Map
<
String
,
Object
>
sendByTemplate_01
(
Long
member_film_id
,
String
prefix
)
{
Map
<
String
,
Object
>
map
=
new
HashMap
<
String
,
Object
>();
Integer
adminid
=
(
Integer
)
adminTokenService
.
getToken
().
getId
();
Fc_member_film
memberFilm
=
filmService
.
queryMemberFilmById
(
member_film_id
);
...
...
@@ -84,7 +84,7 @@ public class EmailServiceImpl implements EmailService {
locale
=
new
Locale
(
"en"
,
"US"
);
}
String
subject
=
messages
.
get
(
"email.getPassword.subject"
,
locale
);
String
content
=
Common
.
getStringAsStream
(
template
+
"_"
+
locale
.
getLanguage
().
toLowerCase
()
+
"_"
+
locale
.
getCountry
().
toUpperCase
()
+
".txt"
);
String
content
=
Common
.
getStringAsStream
(
prefix
+
"_"
+
locale
.
getLanguage
().
toLowerCase
()
+
"_"
+
locale
.
getCountry
().
toUpperCase
()
+
".txt"
);
String
filmName
=
null
;
if
(
locale
.
getLanguage
().
toLowerCase
().
equals
(
"zh"
))
{
filmName
=
memberFilm
.
getCn_name
();
...
...
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