Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -157,6 +157,8 @@ public class AuthorizationServiceImpl implements AuthorizationService {
|
|||||||
HandoverRecord entity = getHandoverRecord(isStaff, shopInfo, shopStaff);
|
HandoverRecord entity = getHandoverRecord(isStaff, shopInfo, shopStaff);
|
||||||
handoverRecordService.initHandoverRecord(entity);
|
handoverRecordService.initHandoverRecord(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
redisService.del(RedisCst.LOGIN_CODE + loginDTO.uuid());
|
||||||
return new LoginVO(StpKit.USER.getTokenInfo(), promissionList, loginDTO.loginType(), shopInfo);
|
return new LoginVO(StpKit.USER.getTokenInfo(), promissionList, loginDTO.loginType(), shopInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
|
|||||||
throw new ApiNotPrintException("验证码错误");
|
throw new ApiNotPrintException("验证码错误");
|
||||||
}
|
}
|
||||||
|
|
||||||
userInfo.setPayPwd(SecureUtil.md5(userInfo.getId() + userInfoPwdEditDTO.getPayPwd()));
|
userInfo.setPayPwd(SecureUtil.md5(userInfoPwdEditDTO.getPayPwd()));
|
||||||
boolean b = updateById(userInfo);
|
boolean b = updateById(userInfo);
|
||||||
if (b) {
|
if (b) {
|
||||||
redisService.del(key);
|
redisService.del(key);
|
||||||
|
|||||||
Reference in New Issue
Block a user