diff --git a/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java b/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java index 9de1ea2..b27d4e2 100644 --- a/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java +++ b/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java @@ -77,10 +77,15 @@ public class TokenController { String token = SecurityUtils.getToken(request); if (StringUtils.isNotEmpty(token)) { String username = JwtUtils.getUserName(token); + String userPlatform = JwtUtils.getUserPlatform(token); // 删除用户缓存记录 AuthUtil.logoutByToken(token); // 记录用户退出日志 - sysLoginService.logout(username); + if ("user".equals(userPlatform)) { + uLoginService.logout(username); + } else { + sysLoginService.logout(username); + } } return R.ok(); } @@ -115,13 +120,14 @@ public class TokenController { uLoginService.checkRepeat(form); return R.ok(); } - if ("sys".equals(form.getAuthType())) {} + if ("sys".equals(form.getAuthType())) { + } return R.fail("auth.authentication.type.not.supported"); } @GetMapping("health") public R health(HttpServletRequest request) { // check health - return R.ok(null,"auth.is.healthy"); - } + return R.ok(null, "auth.is.healthy"); + } } diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java index bd64134..3e33ea5 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java @@ -48,7 +48,9 @@ public class UClientServiceImpl extends ServiceImpl impl } boolean flag = this.saveOrUpdate(uClient); // 登录时如果当前用户有可用套餐和余额授权当前设备访问wifi,且根据套餐限制带宽 - accountService.authClientAndRateLimit(uClientBo); + if (StrUtil.isNotBlank(uClientBo.getClientName()) && StrUtil.isNotBlank(uClientBo.getSiteId())) { + accountService.authClientAndRateLimit(uClientBo); + } return flag; }