diff --git a/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java b/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java index c302f871..77c2d9b8 100644 --- a/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java +++ b/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java @@ -53,31 +53,31 @@ public class TokenInterceptor implements HandlerInterceptor { //测试版本可以关闭验证 if ("false".equals(configValueUtil.getTestVersion())) { //token验证 -// if (StringUtil.isEmpty(realToken) || !redisUtil.exists(realToken)) { -// ActionResult result = ActionResult.fail(ActionResultCode.SessionOverdue.getCode(), ActionResultCode.SessionOverdue.getMessage()); -// ServletUtil.renderString(response, JsonUtil.getObjectToString(result)); -// return false; -// } -// //是否过期 -// Date exp = JwtUtil.getExp(token); -// if (exp.getTime() < System.currentTimeMillis()) { -// ActionResult result = ActionResult.fail(ActionResultCode.SessionOverdue.getCode(), ActionResultCode.SessionOverdue.getMessage()); -// ServletUtil.renderString(response, JsonUtil.getObjectToString(result)); -// return false; -// } -// //判断是否可多人登录 -// Integer singleLogin = JwtUtil.getSingleLogin(token); -// if (!"1".equals(String.valueOf(singleLogin))) { -// //是否在线 -// if (!userProvider.isOnLine()) { -// ActionResult result = ActionResult.fail(ActionResultCode.SessionOffLine.getCode(), ActionResultCode.SessionOffLine.getMessage()); -// redisUtil.remove(realToken); -// ServletUtil.renderString(response, JsonUtil.getObjectToString(result)); -// return false; -// } -// } + if (StringUtil.isEmpty(realToken) || !redisUtil.exists(realToken)) { + ActionResult result = ActionResult.fail(ActionResultCode.SessionOverdue.getCode(), ActionResultCode.SessionOverdue.getMessage()); + ServletUtil.renderString(response, JsonUtil.getObjectToString(result)); + return false; + } + //是否过期 + Date exp = JwtUtil.getExp(token); + if (exp.getTime() < System.currentTimeMillis()) { + ActionResult result = ActionResult.fail(ActionResultCode.SessionOverdue.getCode(), ActionResultCode.SessionOverdue.getMessage()); + ServletUtil.renderString(response, JsonUtil.getObjectToString(result)); + return false; + } + //判断是否可多人登录 + Integer singleLogin = JwtUtil.getSingleLogin(token); + if (!"1".equals(String.valueOf(singleLogin))) { + //是否在线 + if (!userProvider.isOnLine()) { + ActionResult result = ActionResult.fail(ActionResultCode.SessionOffLine.getCode(), ActionResultCode.SessionOffLine.getMessage()); + redisUtil.remove(realToken); + ServletUtil.renderString(response, JsonUtil.getObjectToString(result)); + return false; + } + } //增加在线过期时间 -// tokenTimeout(userInfo); + tokenTimeout(userInfo); } return true; } diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml index 16add8ea..d18fe636 100644 --- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml +++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml @@ -54,7 +54,7 @@ spring: config: #===================== 是否开启测试环境 ===================== - TestVersion: false + TestVersion: true #===================== 文件模板配置 ===================== fileType: local #文件存储类型(local-本地存储,minio-网络存储) diff --git a/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserController.java b/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserController.java index fad7352c..e6e5ede5 100644 --- a/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserController.java +++ b/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserController.java @@ -456,7 +456,7 @@ public class UserController { if ("1".equals(String.valueOf(originUser.getIsAdministrator()))) { UserInfo operatorUser = userProvider.get(); // 管理员可以修改自己,但是无法修改其他管理员 - if (operatorUser.getIsAdministrator()) { + /*if (operatorUser.getIsAdministrator()) { if (!"admin".equals(operatorUser.getUserId())) { if (!operatorUser.getUserId().equals(id)) { return ActionResult.fail("管理员只能修改自己,不能修改其他管理员"); @@ -464,7 +464,7 @@ public class UserController { } } else { return ActionResult.fail("无法修改管理员账户"); - } + }*/ } //直属主管不能是自己 if (id.equals(userUpForm.getManagerId())) {