diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/filter/IpFilter.java b/bonus-gateway/src/main/java/com/bonus/gateway/filter/IpFilter.java index 21a3956..68638cb 100644 --- a/bonus-gateway/src/main/java/com/bonus/gateway/filter/IpFilter.java +++ b/bonus-gateway/src/main/java/com/bonus/gateway/filter/IpFilter.java @@ -14,7 +14,7 @@ import reactor.core.publisher.Mono; import javax.annotation.Resource; import java.net.InetAddress; import java.net.UnknownHostException; -import java.time.LocalTime; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Map; @@ -120,19 +120,19 @@ public class IpFilter implements GlobalFilter, Ordered { } return result; } - public static boolean isCurrentTimeInRange(String start, String end) { - // 定义时间格式 - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss"); + public static boolean isCurrentTimeInRange(String startDateTime, String endDateTime) { + // 定义日期时间格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - // 将字符串转换为 LocalTime - LocalTime startTime = LocalTime.parse(start, formatter); - LocalTime endTime = LocalTime.parse(end, formatter); + // 将字符串转换为 LocalDateTime + LocalDateTime start = LocalDateTime.parse(startDateTime, 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); } /** diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java index 580ab2a..7c904d8 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java @@ -514,6 +514,10 @@ public class SysUserController extends BaseController { return AjaxResult.success(false); } + /** + * 查询被锁定的用户 + * @return + */ @GetMapping("/getLockUser") public AjaxResult getLockUser() { @@ -523,11 +527,22 @@ public class SysUserController extends BaseController { Map map = new HashMap<>(); map.put("userName", key.split(":")[1]); long time = redisService.getExpire(key); - map.put("time", time+1); + map.put("time", time/60+1); list.add(map); } // 3. 如果都不需要操作,返回成功 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(); + } + }