From 5f328014e940e9d4b9eae5772609c2d1de45c941 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Tue, 9 Aug 2022 16:54:53 +0800
Subject: [PATCH] 1.fix

---
 .../jmreport/config/JimuReportTokenService.java |  6 ++++--
 src/main/resources/logback-spring.xml           | 17 +++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

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<String, String> values = hashOperations.entries("epmet:sys:security:user:gov:web:" + userId);
+            Map<String, String> valuesFromGovWeb = hashOperations.entries("epmet:sys:security:user:gov:web:" + userId);
+            Map<String, String> 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 @@
         </rollingPolicy>
     </appender>
 
+    <!--<root>
+        <level value="DEBUG"/>
+        <appender-ref ref="DEBUG_FILE"/>
+    </root>-->
+
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test,local">
+    <!--<springProfile name="dev,test,local">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="INFO"/>
         <logger name="com.epmet.dao" level="DEBUG"/>
-        <!-- 只打印rocketmq client的日志 -->
+        &lt;!&ndash; 只打印rocketmq client的日志 &ndash;&gt;
         <logger name="RocketmqClient" level="INFO" additivity="false">
             <appender-ref ref="RocketmqClientAppender"/>
         </logger>
@@ -170,14 +175,14 @@
             <appender-ref ref="WARN_FILE"/>
             <appender-ref ref="ERROR_FILE"/>
         </root>
-    </springProfile>
+    </springProfile>-->
 
     <!-- 生产环境 -->
-    <springProfile name="prod">
+    <!--<springProfile name="prod">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="INFO"/>
-        <!-- 只打印rocketmq client的日志 -->
+        &lt;!&ndash; 只打印rocketmq client的日志 &ndash;&gt;
         <logger name="RocketmqClient" level="INFO" additivity="false">
             <appender-ref ref="RocketmqClientAppender"/>
         </logger>
@@ -188,6 +193,6 @@
             <appender-ref ref="WARN_FILE"/>
             <appender-ref ref="ERROR_FILE"/>
         </root>
-    </springProfile>
+    </springProfile>-->
 
 </configuration>