Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-auth
Overview
Overview
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
base_platform_enterprise
gic-platform-auth
Commits
7506da1c
Commit
7506da1c
authored
Nov 22, 2019
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
个人资料修改密码修改:去掉验证码校验
parent
38caf489
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
18 deletions
+10
-18
UserController.java
...main/java/com/gic/auth/web/controller/UserController.java
+10
-18
No files found.
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/UserController.java
View file @
7506da1c
package
com
.
gic
.
auth
.
web
.
controller
;
package
com
.
gic
.
auth
.
web
.
controller
;
import
com.gic.auth.constant.UserConstants
;
import
com.gic.auth.dto.AuthCodeDTO
;
import
com.gic.auth.service.AuthCodeApiService
;
import
com.gic.auth.web.vo.LoginUserVO
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.Md5Util
;
import
com.gic.enterprise.utils.CreateRandomUtils
;
import
com.gic.enterprise.utils.UserDetail
;
import
com.gic.marketing.process.api.service.sms.SmsSendApiService
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
import
org.apache.log4j.Logger
;
...
@@ -18,18 +9,27 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -18,18 +9,27 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.auth.constant.UserConstants
;
import
com.gic.auth.dto.AuthCodeDTO
;
import
com.gic.auth.dto.UserDTO
;
import
com.gic.auth.dto.UserDTO
;
import
com.gic.auth.qo.UserListQO
;
import
com.gic.auth.qo.UserListQO
;
import
com.gic.auth.service.AuthCodeApiService
;
import
com.gic.auth.service.UserApiService
;
import
com.gic.auth.service.UserApiService
;
import
com.gic.auth.web.utils.UserPasswordUtils
;
import
com.gic.auth.web.utils.UserPasswordUtils
;
import
com.gic.auth.web.vo.LoginUserVO
;
import
com.gic.auth.web.vo.UserDetailVO
;
import
com.gic.auth.web.vo.UserDetailVO
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.Md5Util
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.download.utils.OperationResultUtils
;
import
com.gic.download.utils.OperationResultUtils
;
import
com.gic.download.utils.log.LogUtils
;
import
com.gic.download.utils.log.LogUtils
;
import
com.gic.enterprise.error.ErrorCode
;
import
com.gic.enterprise.error.ErrorCode
;
import
com.gic.enterprise.response.EnterpriseRestResponse
;
import
com.gic.enterprise.response.EnterpriseRestResponse
;
import
com.gic.enterprise.utils.CreateRandomUtils
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
import
com.gic.enterprise.utils.UserDetail
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
com.gic.marketing.process.api.service.sms.SmsSendApiService
;
@RestController
@RestController
@RequestMapping
(
"/user"
)
@RequestMapping
(
"/user"
)
...
@@ -216,9 +216,7 @@ public class UserController {
...
@@ -216,9 +216,7 @@ public class UserController {
}
}
@RequestMapping
(
"modify-password"
)
@RequestMapping
(
"modify-password"
)
public
RestResponse
modifyPassword
(
String
oldPassword
,
String
newPhone
,
String
authCode
,
Integer
authCodeId
)
{
public
RestResponse
modifyPassword
(
String
oldPassword
,
String
newPhone
)
{
ServiceResponse
authCodeResult
=
authCodeApiService
.
validateAuthCode
(
authCodeId
,
authCode
);
if
(
authCodeResult
.
isSuccess
())
{
UserDetail
userDetail
=
UserDetailUtils
.
getUserDetail
();
UserDetail
userDetail
=
UserDetailUtils
.
getUserDetail
();
Md5Util
md5
=
new
Md5Util
();
Md5Util
md5
=
new
Md5Util
();
// password 自身作为盐值
// password 自身作为盐值
...
@@ -232,15 +230,9 @@ public class UserController {
...
@@ -232,15 +230,9 @@ public class UserController {
}
}
ServiceResponse
<
String
>
result
=
userApiService
.
editPhoneOrPassword
(
login
.
getResult
().
getUserId
(),
ServiceResponse
<
String
>
result
=
userApiService
.
editPhoneOrPassword
(
login
.
getResult
().
getUserId
(),
null
,
null
,
md5
.
encrypt
(
newPhone
+
newPhone
));
null
,
null
,
md5
.
encrypt
(
newPhone
+
newPhone
));
if
(
result
.
isSuccess
())
{
//过期验证码
authCodeApiService
.
expireAuthCode
(
authCodeId
);
}
return
OperationResultUtils
.
operationResult
(
result
,
"修改密码"
,
return
OperationResultUtils
.
operationResult
(
result
,
"修改密码"
,
OperationResultUtils
.
getOperationObject
(
result
));
OperationResultUtils
.
getOperationObject
(
result
));
}
}
return
EnterpriseRestResponse
.
failure
(
authCodeResult
);
}
@RequestMapping
(
"/list-user-nopage"
)
@RequestMapping
(
"/list-user-nopage"
)
public
RestResponse
listUserNoPage
(
UserListQO
params
)
{
public
RestResponse
listUserNoPage
(
UserListQO
params
)
{
...
...
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