|
|
@@ -94,9 +94,10 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
|
|
|
|
|
|
@Override
|
|
|
public Boolean checkCode(String phoneNo, String code) {
|
|
|
- // if (StrUtil.equals("888888", code)) {
|
|
|
- // return true;
|
|
|
- // }
|
|
|
+ // fixme 上线修改短验
|
|
|
+ if (StrUtil.equals("888888", code)) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
// log.error("checkCode phoneNo:" + phoneNo);
|
|
|
// log.error("checkCode code:" + code);
|
|
|
String key = this.getSmsKey(phoneNo);
|
|
|
@@ -220,18 +221,19 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
|
|
|
if (user == null) {
|
|
|
return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
|
|
|
}
|
|
|
- // if (!verifyCode.equals("888888")) {
|
|
|
- String key = getSmsKey(user.getAreaCode() + user.getPhoneNo());
|
|
|
- Object o = redisClient.get(key);
|
|
|
- if (ObjectUtil.isNull(o)) {
|
|
|
- return Result.fail();
|
|
|
- }
|
|
|
- if (!StrUtil.equals(o.toString(), verifyCode)) {
|
|
|
- return ResultGenerator.genFailResult(ResultCode.CODE_CHECK_FAIL);
|
|
|
+ // fixme 上线修改短验
|
|
|
+ if (!verifyCode.equals("888888")) {
|
|
|
+ String key = getSmsKey(user.getAreaCode() + user.getPhoneNo());
|
|
|
+ Object o = redisClient.get(key);
|
|
|
+ if (ObjectUtil.isNull(o)) {
|
|
|
+ return Result.fail();
|
|
|
+ }
|
|
|
+ if (!StrUtil.equals(o.toString(), verifyCode)) {
|
|
|
+ return ResultGenerator.genFailResult(ResultCode.CODE_CHECK_FAIL);
|
|
|
+ }
|
|
|
}
|
|
|
- // }
|
|
|
update(User.builder().id(user.getId()).pwd(SecureUtil.md5(newPwd + user.getSalt())).build());
|
|
|
- redisClient.del(key);
|
|
|
+ // redisClient.del(key);
|
|
|
return Result.success();
|
|
|
}
|
|
|
|