diff --git a/src/main/java/com/epmet/jmreport/config/JimuReportTokenService.java b/src/main/java/com/epmet/jmreport/config/JimuReportTokenService.java index c44ebd7..ccc4658 100644 --- a/src/main/java/com/epmet/jmreport/config/JimuReportTokenService.java +++ b/src/main/java/com/epmet/jmreport/config/JimuReportTokenService.java @@ -74,10 +74,12 @@ public class JimuReportTokenService implements JmReportTokenServiceI { byte[] jsonByte = Base64.getDecoder().decode(parts[1]); Object userId = JSON.parseObject(new String(jsonByte)).get("userId"); + // 同时判断运营端和工作端web HashOperations hashOperations = redisTemplate.opsForHash(); - Map values = hashOperations.entries("epmet:sys:security:user:gov:web:" + userId); + Map valuesFromGovWeb = hashOperations.entries("epmet:sys:security:user:gov:web:" + userId); + Map valuesFromOperWeb = hashOperations.entries("epmet:sys:security:user:oper:web:" + userId); - if (values.size() == 0) { + if (valuesFromGovWeb.size() == 0 && valuesFromOperWeb.size() == 0) { return false; } } catch (Exception e) { diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 3d27fa4..6d53291 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -154,13 +154,18 @@ + + - + + <!– 只打印rocketmq client的日志 –> @@ -170,14 +175,14 @@ - + --> - + + <!– 只打印rocketmq client的日志 –> @@ -188,6 +193,6 @@ - + -->