Merge remote-tracking branch 'origin/dev' into dev

deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-jmreport:
     container_name: epmet-jmreport
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-jmreport:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-jmreport-server:version_placeholder
     ports:
       - "8118:8118"
     network_mode: host # 使用现有网络

deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-jmreport:
     container_name: epmet-jmreport
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-jmreport:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-jmreport-server:version_placeholder
     ports:
       - "8118:8118"
     network_mode: host # 使用现有网络

src/main/java/com/epmet/jmreport/config/JimuReportTokenService.java

@@ -71,10 +71,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) {

src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java

@@ -1,5 +1,6 @@
 package com.epmet.jmreport.converter;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.jeecg.modules.jmreport.desreport.render.handler.convert.ApiDataConvertAdapter;
@@ -53,7 +54,27 @@ public abstract class BaseApiResultConvertAdapter implements ApiDataConvertAdapt
      */
     @Override
     public String getTotal(JSONObject jsonObject) {
-        return "10";
+        Object data = jsonObject.get("data");
+
+        if (data == null) {
+            // 没有数据返回
+            return "0";
+        }
+
+        if (data instanceof JSONObject) {
+            // data是个对象，还要解析里层的
+            JSONObject dataJO = (JSONObject) data;
+            if (!dataJO.containsKey("total")) {
+                // 就是单个对象，详情查询等
+                return null;
+            } else {
+                // 返回的是pageData对象，取出pages来返回
+                return dataJO.getString("pages");
+            }
+        } else {
+            // data就是个列表
+            return null;
+        }
     }
 
     /**

src/main/java/com/epmet/jmreport/converter/ListApiResultConverter.java

@@ -14,7 +14,7 @@ public class ListApiResultConverter extends BaseApiResultConvertAdapter {
     public String getData(JSONObject jsonObject) {
         JSONArray list = jsonObject.getJSONArray("data");
         if (list == null) {
-            return "0";
+            return null;
         }
         return list.toJSONString();
     }

src/main/resources/logback-spring.xml

@@ -3,7 +3,7 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/admin"/>
+    <property name="log.path" value="logs/jmreport"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
@@ -134,60 +134,13 @@
         </filter>
     </appender>
 
-    <!--  rocketmq client 的日志appender  -->
+    <!--日志从INFO级别开始打-->
-    <appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <root>
-        <!-- 正在记录的日志文档的路径及文档名 -->
+        <level value="INFO"/>
-        <file>${log.path}/rocketmqclient.log</file>
+        <!--console控制台日志已经在logback-base.xml中配置了，此处不需要重复配置-->
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-    </appender>
-
-    <!-- 开发、测试环境 -->
-    <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的日志 -->
-        <logger name="RocketmqClient" level="INFO" additivity="false">
-            <appender-ref ref="RocketmqClientAppender"/>
-        </logger>
-        <root level="INFO">
         <appender-ref ref="DEBUG_FILE"/>
         <appender-ref ref="INFO_FILE"/>
         <appender-ref ref="WARN_FILE"/>
         <appender-ref ref="ERROR_FILE"/>
     </root>
-    </springProfile>
-
-    <!-- 生产环境 -->
-    <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的日志 -->
-        <logger name="RocketmqClient" level="INFO" additivity="false">
-            <appender-ref ref="RocketmqClientAppender"/>
-        </logger>
-        <root level="INFO">
-            <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="DEBUG_FILE"/>
-            <appender-ref ref="INFO_FILE"/>
-            <appender-ref ref="WARN_FILE"/>
-            <appender-ref ref="ERROR_FILE"/>
-        </root>
-    </springProfile>
-
 </configuration>