From 5f328014e940e9d4b9eae5772609c2d1de45c941 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 9 Aug 2022 16:54:53 +0800 Subject: [PATCH 1/5] 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 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 @@ - + --> From 58804b8bb7ae2306357cf5a4f6fe3994f54c2b27 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 9 Aug 2022 23:32:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BA=86=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E9=85=8D=E7=BD=AE=E3=80=822.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86API=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=99=A8#getTotal()=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseApiResultConvertAdapter.java | 22 +++++- .../converter/ListApiResultConverter.java | 2 +- src/main/resources/logback-spring.xml | 70 +++---------------- 3 files changed, 31 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java b/src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java index 3e14b06..e39a575 100644 --- a/src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java +++ b/src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java @@ -53,7 +53,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("list")) { + // 就是单个对象，详情查询等 + return null; + } else { + // 返回的是pageData对象，取出pages来返回 + return dataJO.getString("pages"); + } + } else { + // todo data就是个列表，不知道返回什么，需要测试 + return null; + } } /** diff --git a/src/main/java/com/epmet/jmreport/converter/ListApiResultConverter.java b/src/main/java/com/epmet/jmreport/converter/ListApiResultConverter.java index d1381b2..f0562e6 100644 --- a/src/main/java/com/epmet/jmreport/converter/ListApiResultConverter.java +++ b/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(); } diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 6d53291..e2ccf15 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -3,7 +3,7 @@ - + @@ -134,65 +134,13 @@ - - - - ${log.path}/rocketmqclient.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - + + + - --> - - - - - - - + + + + From 0032c60616c269ce160c12eccb7cbf485983d99d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 10 Aug 2022 09:35:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=80=BB?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jmreport/converter/BaseApiResultConvertAdapter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java b/src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java index e39a575..6bf9fdf 100644 --- a/src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java +++ b/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; @@ -63,7 +64,7 @@ public abstract class BaseApiResultConvertAdapter implements ApiDataConvertAdapt if (data instanceof JSONObject) { // data是个对象，还要解析里层的 JSONObject dataJO = (JSONObject) data; - if (!dataJO.containsKey("list")) { + if (!dataJO.containsKey("total")) { // 就是单个对象，详情查询等 return null; } else { @@ -71,7 +72,7 @@ public abstract class BaseApiResultConvertAdapter implements ApiDataConvertAdapt return dataJO.getString("pages"); } } else { - // todo data就是个列表，不知道返回什么，需要测试 + // data就是个列表 return null; } } From 55748a910f84121c33572da3948bb28e4aecdecb Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 10 Aug 2022 17:11:50 +0800 Subject: [PATCH 4/5] - --- deploy/docker-compose-dev.yml | 2 +- deploy/docker-compose-prod.yml | 4 ++-- deploy/docker-compose-test.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/docker-compose-dev.yml b/deploy/docker-compose-dev.yml index 83d666d..00dfb37 100644 --- a/deploy/docker-compose-dev.yml +++ b/deploy/docker-compose-dev.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/dev:/logs" environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -Dspring.profiles.active=dev -jar ./epmet-jmreport.jar" + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-jmreport.jar" restart: "unless-stopped" logging: driver: local diff --git a/deploy/docker-compose-prod.yml b/deploy/docker-compose-prod.yml index c6359fb..e5f649f 100644 --- a/deploy/docker-compose-prod.yml +++ b/deploy/docker-compose-prod.yml @@ -2,14 +2,14 @@ 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 # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx512m -Dspring.profiles.active=prod -jar ./epmet-jmreport.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-jmreport.jar" restart: "unless-stopped" logging: driver: local diff --git a/deploy/docker-compose-test.yml b/deploy/docker-compose-test.yml index 6bc0fe3..a5890fe 100644 --- a/deploy/docker-compose-test.yml +++ b/deploy/docker-compose-test.yml @@ -2,14 +2,14 @@ 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 # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/test:/logs" environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -Dspring.profiles.active=test -jar ./epmet-jmreport.jar" + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-jmreport.jar" restart: "unless-stopped" logging: driver: local From b048d903bcd741def02dfb04eab38b4dedaf7be4 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 11 Aug 2022 09:04:39 +0800 Subject: [PATCH 5/5] - --- deploy/docker-compose-dev.yml | 2 +- deploy/docker-compose-prod.yml | 2 +- deploy/docker-compose-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/docker-compose-dev.yml b/deploy/docker-compose-dev.yml index 00dfb37..83d666d 100644 --- a/deploy/docker-compose-dev.yml +++ b/deploy/docker-compose-dev.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/dev:/logs" environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-jmreport.jar" + RUN_INSTRUCT: "java -Xms32m -Xmx200m -Dspring.profiles.active=dev -jar ./epmet-jmreport.jar" restart: "unless-stopped" logging: driver: local diff --git a/deploy/docker-compose-prod.yml b/deploy/docker-compose-prod.yml index e5f649f..51f7e12 100644 --- a/deploy/docker-compose-prod.yml +++ b/deploy/docker-compose-prod.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-jmreport.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx512m -Dspring.profiles.active=prod -jar ./epmet-jmreport.jar" restart: "unless-stopped" logging: driver: local diff --git a/deploy/docker-compose-test.yml b/deploy/docker-compose-test.yml index a5890fe..825d8b2 100644 --- a/deploy/docker-compose-test.yml +++ b/deploy/docker-compose-test.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/test:/logs" environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-jmreport.jar" + RUN_INSTRUCT: "java -Xms32m -Xmx200m -Dspring.profiles.active=test -jar ./epmet-jmreport.jar" restart: "unless-stopped" logging: driver: local