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
04e05577
Commit
04e05577
authored
Oct 11, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
0eae5882
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
MemberOpenApiController.java
...main/java/com/egolm/film/api/MemberOpenApiController.java
+2
-1
messages_zh_CN.properties
src/main/resources/i18n/messages_zh_CN.properties
+1
-1
No files found.
src/main/java/com/egolm/film/api/MemberOpenApiController.java
View file @
04e05577
...
@@ -76,8 +76,9 @@ public class MemberOpenApiController {
...
@@ -76,8 +76,9 @@ public class MemberOpenApiController {
Fc_member
member
=
memberService
.
getMemberByEmail
(
email
);
Fc_member
member
=
memberService
.
getMemberByEmail
(
email
);
String
encodePwd
=
memberService
.
encodePassword
(
member
.
getSalt
(),
password
);
String
encodePwd
=
memberService
.
encodePassword
(
member
.
getSalt
(),
password
);
memberService
.
changePassword
(
member
.
getId
(),
encodePwd
);
memberService
.
changePassword
(
member
.
getId
(),
encodePwd
);
String
name
=
member
.
getUsername
();
String
subject
=
messages
.
get
(
"email.getPassword.subject"
);
String
subject
=
messages
.
get
(
"email.getPassword.subject"
);
String
content
=
messages
.
get
(
"email.getPassword.content"
,
member
.
getRealname
()
,
password
);
String
content
=
messages
.
get
(
"email.getPassword.content"
,
name
==
null
?
""
:
name
,
password
);
emailService
.
send
(
subject
,
content
,
email
);
emailService
.
send
(
subject
,
content
,
email
);
return
Rjx
.
jsonOk
();
return
Rjx
.
jsonOk
();
}
}
...
...
src/main/resources/i18n/messages_zh_CN.properties
View file @
04e05577
email.getPassword.subject
=
\u
4E2D
\u
56FD
\u7535\u
5F71
\u8282
[
\u
627E
\u
56DE
\u
5BC6
\u7801
]
\u
90AE
\u
4EF6
email.getPassword.subject
=
\u
4E2D
\u
56FD
\u7535\u
5F71
\u8282
[
\u
627E
\u
56DE
\u
5BC6
\u7801
]
\u
90AE
\u
4EF6
email.getPassword.content
=
{0}
,
\u
60A8
\u
597D,
\u
60A8
\u7684\u
65B0
\u
5BC6
\u7801\u
662F: [{1}]
email.getPassword.content
=
{0}
\u
60A8
\u
597D,
\u
60A8
\u7684\u
65B0
\u
5BC6
\u7801\u
662F: [{1}]
sys.err
=
\u
7CFB
\u
7EDF
\u9519\u
8BEF
sys.err
=
\u
7CFB
\u
7EDF
\u9519\u
8BEF
sys.err.user_disabled
=
\u7528\u6237\u
5DF2
\u
7ECF
\u7981\u7528
sys.err.user_disabled
=
\u7528\u6237\u
5DF2
\u
7ECF
\u7981\u7528
...
...
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