Commit 7506da1c by guojuxing

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

parent 38caf489
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.log4j.LogManager;
import org.apache.log4j.Logger;
......@@ -18,18 +9,27 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
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.qo.UserListQO;
import com.gic.auth.service.AuthCodeApiService;
import com.gic.auth.service.UserApiService;
import com.gic.auth.web.utils.UserPasswordUtils;
import com.gic.auth.web.vo.LoginUserVO;
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.download.utils.OperationResultUtils;
import com.gic.download.utils.log.LogUtils;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetail;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.marketing.process.api.service.sms.SmsSendApiService;
@RestController
@RequestMapping("/user")
......@@ -216,30 +216,22 @@ public class UserController {
}
@RequestMapping("modify-password")
public RestResponse modifyPassword(String oldPassword, String newPhone, String authCode, Integer authCodeId) {
ServiceResponse authCodeResult = authCodeApiService.validateAuthCode(authCodeId, authCode);
if (authCodeResult.isSuccess()) {
UserDetail userDetail = UserDetailUtils.getUserDetail();
Md5Util md5 = new Md5Util();
// password 自身作为盐值
if (oldPassword.length() != 32) {
oldPassword = md5.encrypt(oldPassword + oldPassword);
}
ServiceResponse<UserDTO> login = this.userApiService.login(userDetail.getUserInfo().getPhoneNumber(),
userDetail.getEnterpriseId(), oldPassword);
if (!login.isSuccess()) {
return EnterpriseRestResponse.failure(login);
}
ServiceResponse<String> result = userApiService.editPhoneOrPassword(login.getResult().getUserId(),
null, null, md5.encrypt(newPhone + newPhone));
if (result.isSuccess()) {
//过期验证码
authCodeApiService.expireAuthCode(authCodeId);
}
return OperationResultUtils.operationResult(result, "修改密码",
OperationResultUtils.getOperationObject(result));
public RestResponse modifyPassword(String oldPassword, String newPhone) {
UserDetail userDetail = UserDetailUtils.getUserDetail();
Md5Util md5 = new Md5Util();
// password 自身作为盐值
if (oldPassword.length() != 32) {
oldPassword = md5.encrypt(oldPassword + oldPassword);
}
return EnterpriseRestResponse.failure(authCodeResult);
ServiceResponse<UserDTO> login = this.userApiService.login(userDetail.getUserInfo().getPhoneNumber(),
userDetail.getEnterpriseId(), oldPassword);
if (!login.isSuccess()) {
return EnterpriseRestResponse.failure(login);
}
ServiceResponse<String> result = userApiService.editPhoneOrPassword(login.getResult().getUserId(),
null, null, md5.encrypt(newPhone + newPhone));
return OperationResultUtils.operationResult(result, "修改密码",
OperationResultUtils.getOperationObject(result));
}
@RequestMapping("/list-user-nopage")
......
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