Commit 7506da1c by guojuxing

个人资料修改密码修改:去掉验证码校验

parent 38caf489
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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment