bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

用户登录问题修改

This commit is contained in:
jiang 2024-11-07 15:04:22 +08:00
parent 59dc67b8d4
commit b428ef318e
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bonus-gateway/src/main/java/com/bonus/gateway/filter/IpFilter.java
View File

@ -14,7 +14,7 @@ import reactor.core.publisher.Mono;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.time.LocalTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -120,19 +120,19 @@ public class IpFilter implements GlobalFilter, Ordered {
} }
return result; return result;
} }
public static boolean isCurrentTimeInRange(String start, String end) { public static boolean isCurrentTimeInRange(String startDateTime, String endDateTime) {
// 定义时间格式 // 定义日期时间格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 将字符串转换为 LocalTime // 将字符串转换为 LocalDateTime
LocalTime startTime = LocalTime.parse(start, formatter); LocalDateTime start = LocalDateTime.parse(startDateTime, formatter);
LocalTime endTime = LocalTime.parse(end, formatter); LocalDateTime end = LocalDateTime.parse(endDateTime, formatter);
// 获取当前时间 // 获取当前日期和时间
LocalTime currentTime = LocalTime.now(); LocalDateTime currentDateTime = LocalDateTime.now();
// 检查当前时间是否在指定的时间范围内 // 检查当前日期和时间是否在指定的范围内
return !currentTime.isBefore(startTime) && !currentTime.isAfter(endTime); return !currentDateTime.isBefore(start) && !currentDateTime.isAfter(end);
} }
/** /**

17
bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
View File

@ -514,6 +514,10 @@ public class SysUserController extends BaseController {
return AjaxResult.success(false); return AjaxResult.success(false);
} }
/**
* 查询被锁定的用户
* @return
*/
@GetMapping("/getLockUser") @GetMapping("/getLockUser")
public AjaxResult getLockUser() { public AjaxResult getLockUser() {
@ -523,11 +527,22 @@ public class SysUserController extends BaseController {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("userName", key.split(":")[1]); map.put("userName", key.split(":")[1]);
long time = redisService.getExpire(key); long time = redisService.getExpire(key);
map.put("time", time+1); map.put("time", time/60+1);
list.add(map); list.add(map);
} }
// 3. 如果都不需要操作，返回成功 // 3. 如果都不需要操作，返回成功
return AjaxResult.success(list); return AjaxResult.success(list);
} }
@PostMapping("/delLockUser")
public AjaxResult delLockUser(@RequestBody String[] userName) {
for (String name : userName) {
String key = CacheConstants.REDIS_KEY + name;
if (redisService.hasKey(key)) {
redisService.deleteObject(key);
}
}
return AjaxResult.success();
}
} }