liuchengqian/fire_point
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

火点重构-完善地物类型百分比

Browse Source
This commit is contained in:
liuchengqian 2023-04-14 10:07:43 +08:00
parent e2a7b8aff8
commit d003946437
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java
View File

@ -76,14 +76,6 @@ public class CustomAuthenticationProvider implements AuthenticationProvider {
if (userEntity.getActiveFlag() != 0) {
throw new DisabledException("您的账号未激活，详情请联系客服人员。");
}
// // 检查用户是否在VIP时间范围内
// boolean inVipTimeRange = VipTimeRangeUtils.checkIfInVipTimeRange(userEntity.getVipTimeRangeJson());
// // 检查用户是否在试用期范围内
// boolean inTryTimeRange = VipTimeRangeUtils.checkIfInTryTimeRange(userEntity.getAddTime(), userEntity.getDayNum());
// //既不在VIP时间范围内 也不在试用期范围内
// if ((!inVipTimeRange) && (!inTryTimeRange)) {
// throw new DisabledException("您的账号已到期，详情请联系客服人员。");
// }
// 认证逻辑
String encryptPassword = encry256(password + userEntity.getSalt());
@ -98,8 +90,7 @@ public class CustomAuthenticationProvider implements AuthenticationProvider {
customAuthenticationProvider.sysUserService.updateLoginNum(userEntity.getId(), userEntity.getLoginNum() + 1);
customAuthenticationProvider.sysUserService.updateLoginLastTime(userEntity.getId(), DateTimeUtil.dateTimeToString(LocalDateTime.now()));
// 生成令牌
Authentication authToken = new UsernamePasswordAuthenticationToken(userName, encryptPassword, permissions);
return authToken;
return new UsernamePasswordAuthenticationToken(userName, encryptPassword, permissions);
} else {
throw new BadCredentialsException("用户密码错误，请重新输入");
}

1
src/main/java/com/xkrs/utilsnew/BufferAnalysisUtils.java
View File

@ -18,7 +18,6 @@ import java.util.Map;
public class BufferAnalysisUtils {
private BufferAnalysisUtils() {
}