From d8078aa717e766aa59be8590aa8e252bf429f72c Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 7 Dec 2021 18:34:11 +0800 Subject: [PATCH 001/149] =?UTF-8?q?=E8=AF=9D=E9=A2=98=20=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=20=E7=BB=A7=E7=BB=AD=E4=B8=8B?= =?UTF-8?q?=E6=AC=A1=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 3cd9ff7c01..07f085e351 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.300 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.301 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index fc413cf07a..995873f1e4 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.300 + 0.3.301 data-statistical com.epmet From 2bb768d6dd8db93767b6ca9ebe26b63d2e77b3b4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 7 Dec 2021 21:22:17 +0800 Subject: [PATCH 002/149] =?UTF-8?q?=E8=BF=99=E4=B8=80=E6=89=B9=E9=83=BD?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=AE=8C=E5=86=8D=E7=BB=A7=E7=BB=AD=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E7=9A=84=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 07f085e351..8bad33e39a 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.301 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.302 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 995873f1e4..f90b6ffa1a 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.301 + 0.3.302 data-statistical com.epmet From e8bb2fce86b98949a5cd58f9eaca8a5d01c6577f Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 7 Dec 2021 21:34:10 +0800 Subject: [PATCH 003/149] =?UTF-8?q?=E8=BF=99=E4=B8=80=E6=89=B9=E9=83=BD?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=AE=8C=E5=86=8D=E7=BB=A7=E7=BB=AD=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E7=9A=84=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 8bad33e39a..88b26ee90c 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.302 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.303 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index f90b6ffa1a..ee06a21330 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.302 + 0.3.303 data-statistical com.epmet From a27771287e1d990f4842b2b7877bd4301aa6be8f Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 8 Dec 2021 10:52:08 +0800 Subject: [PATCH 004/149] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 88b26ee90c..0b4f6e11a1 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.303 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.304 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index ff00165afd..a455d38811 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.303 + 0.3.304 data-statistical com.epmet From 4930b86338b40deeb6a7059fc81394b6a18cc0c1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 8 Dec 2021 12:18:18 +0800 Subject: [PATCH 005/149] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 0b4f6e11a1..0b1955f59a 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.304 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.305 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index a455d38811..1c6ab5cebe 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.304 + 0.3.305 data-statistical com.epmet From ad743a6c9264c593c374bf8a00a8e13dfcfbadbc Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 8 Dec 2021 14:03:11 +0800 Subject: [PATCH 006/149] =?UTF-8?q?=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E9=87=8C=20=E5=A6=82=E6=9E=9C=E6=98=AF03=20=E7=9F=9B=E7=9B=BE?= =?UTF-8?q?=E7=BA=A0=E7=BA=B7=20=E5=88=99=E6=B6=89=E5=8F=8A=E4=BA=BA?= =?UTF-8?q?=E6=95=B0=E5=86=992=EF=BC=88=E7=9B=AE=E5=89=8D=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E4=B8=8D=E6=94=AF=E6=8C=81=20=E6=89=80=E4=BB=A5?= =?UTF-8?q?=E5=BA=94=E4=BA=A7=E5=93=81=E9=9C=80=E6=B1=82=20=E5=A1=AB2?= =?UTF-8?q?=EF=BC=89=EF=BC=9B=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=8F=AF=E8=AF=BB=E6=80=A7=EF=BC=9B=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index 75981232fc..eb7f206513 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.13 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.14 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 79a89eac66..79621b0ab0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.13 + 0.3.14 open-data-worker com.epmet From f6fc4220af11ccfa46872132ca374bddae773cbc Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 8 Dec 2021 17:41:42 +0800 Subject: [PATCH 007/149] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BD=91=E6=A0=BCId?= =?UTF-8?q?=20=E4=BB=8E=E4=BA=8B=E4=BB=B6=E4=B8=AD=E5=A1=AB=E5=85=85=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index e7d2bcac22..a677b9ee7d 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.83 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.84 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index c04583b7d5..65421514bd 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.83 + 0.3.84 gov-project com.epmet From cf9a1bc39be1e361573853336240a515853a0616 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 10 Dec 2021 18:19:18 +0800 Subject: [PATCH 008/149] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=87=8D=E5=A4=8D=20?= =?UTF-8?q?up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index 90296e3d83..233b33c3ec 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.127 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.128 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index c12490d510..9932e17006 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.127 + 0.3.128 com.epmet resi-group From e1474e32422bb0acebcde4cdd27aba3e4b5d4813 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 11 Dec 2021 13:32:26 +0800 Subject: [PATCH 009/149] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=BB=9F=E8=AE=A1bug?= =?UTF-8?q?-=E7=BD=91=E6=A0=BC=E5=92=8C=E7=BB=84=E7=BB=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=20=E6=97=B6=E9=97=B4=E7=BA=AC=E5=BA=A6=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E9=83=BD=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=9D=A5=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 0b1955f59a..3acfa94c64 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.305 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.306 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 1c6ab5cebe..d8b6019cb8 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.305 + 0.3.306 data-statistical com.epmet From ade006bc4e10c3498f2a14a4a1a303fdc1bfac24 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 11 Dec 2021 13:49:12 +0800 Subject: [PATCH 010/149] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=BB=9F=E8=AE=A1bug?= =?UTF-8?q?-=E7=BD=91=E6=A0=BC=E5=92=8C=E7=BB=84=E7=BB=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=20=E6=97=B6=E9=97=B4=E7=BA=AC=E5=BA=A6=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E9=83=BD=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=9D=A5=20=E5=88=9A=E6=89=8D=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E4=B8=AA=E5=AF=82=E5=AF=9E=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 3acfa94c64..2fae1d1eeb 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.306 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.307 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index d8b6019cb8..7f50a6e102 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.306 + 0.3.307 data-statistical com.epmet From 869b9434682bea230876f0e02d7240c5ff47952b Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 11 Dec 2021 14:14:04 +0800 Subject: [PATCH 011/149] =?UTF-8?q?=E4=B9=8B=E5=89=8D=E6=94=B9=E9=9B=86?= =?UTF-8?q?=E6=88=90=E5=B9=B3=E5=8F=B0=E7=9A=84=E4=B8=9C=E8=A5=BF=20?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E8=A1=A8=E5=90=8D=20fact=5Ftopic=5Fissue=5Fg?= =?UTF-8?q?rid=5Fdaily=20=E5=88=B0=E6=97=B6=E5=80=99=E7=9C=8B=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E5=90=A7=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 915df72317..6893e30266 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.78 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.79 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 06f591c6c0..da2562262d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.78 + 0.3.79 data-aggregator com.epmet From 4b8a41ba6b1b916b5933f5f1ec71fd4ef9c94718 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 13 Dec 2021 10:54:20 +0800 Subject: [PATCH 012/149] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E6=80=BB=E6=95=B0=E6=8A=BD=E5=8F=96=E9=80=BB=E8=BE=91bug?= =?UTF-8?q?=EF=BC=8C=E6=97=B6=E9=97=B4=E7=BB=B4=E5=BA=A6=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=89=8D=E4=B8=80=E5=A4=A9=EF=BC=9B=E5=8E=9F=E6=9D=A5=E6=98=AF?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=A9=BA=E6=88=AA=E6=AD=A2=E5=88=B0=E4=BA=86?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E7=9A=84=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BA=86=20=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E6=AF=94?= =?UTF-8?q?=E6=83=B3=E8=A6=81=E7=9A=84=E8=A6=81=E5=A4=9A=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 2fae1d1eeb..62f6ceced9 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.307 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.308 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 7f50a6e102..0557116076 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.307 + 0.3.308 data-statistical com.epmet From d5c60b762a62006481c6dbb9e443a7540d790bbc Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 13 Dec 2021 13:55:18 +0800 Subject: [PATCH 013/149] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E6=80=BB=E6=95=B0=E6=8A=BD=E5=8F=96=E9=80=BB=E8=BE=91bug?= =?UTF-8?q?=EF=BC=8C=E6=97=B6=E9=97=B4=E7=BB=B4=E5=BA=A6=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=89=8D=E4=B8=80=E5=A4=A9=EF=BC=9B=E5=8E=9F=E6=9D=A5=E6=98=AF?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=A9=BA=E6=88=AA=E6=AD=A2=E5=88=B0=E4=BA=86?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E7=9A=84=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BA=86=20=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E6=AF=94?= =?UTF-8?q?=E6=83=B3=E8=A6=81=E7=9A=84=E8=A6=81=E5=A4=9A=20->ression:?= =?UTF-8?q?=E8=BD=AC=E8=AE=AE=E9=A2=98=E6=97=B6=E9=97=B4=20=E4=BB=8Elog?= =?UTF-8?q?=E9=87=8C=E5=8F=96=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 62f6ceced9..4612ff5123 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.308 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.309 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 0557116076..dc88df2c9e 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.308 + 0.3.309 data-statistical com.epmet From d704505d686928ccadd7fb98e33f467ea681b5fd Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 13 Dec 2021 16:12:03 +0800 Subject: [PATCH 014/149] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89=E5=85=B6=E4=BB=96=E6=96=B9=E6=B3=95=EF=BC=8C=E8=B7=91?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E8=AF=9D=E9=A2=98=E7=9A=84=20=E9=9C=80?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 4612ff5123..0a76f6cae4 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.309 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.310 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index dc88df2c9e..04943e5ccd 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.309 + 0.3.310 data-statistical com.epmet From 9b9e003fe028ded3184ceda20ac65f6ed92dbf3a Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 13 Dec 2021 16:28:45 +0800 Subject: [PATCH 015/149] =?UTF-8?q?=E8=AF=9D=E9=A2=98=20=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE=20=E9=87=8D=E6=96=B0=E8=B7=91=20=E9=9C=80?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 0a76f6cae4..85bbcf21a4 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.310 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.311 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 04943e5ccd..e641c948a6 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.310 + 0.3.311 data-statistical com.epmet From da7dc11d42d2fd74a1b197e55ede479fe141db6c Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 13 Dec 2021 21:52:20 +0800 Subject: [PATCH 016/149] =?UTF-8?q?=E8=AF=9D=E9=A2=98=20=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE=20=E9=87=8D=E6=96=B0=E8=B7=91=20=E9=9C=80?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 85bbcf21a4..17d021410b 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.311 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.312 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index e641c948a6..1879df9653 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.311 + 0.3.312 data-statistical com.epmet From f1a02583c64f8449feb7a77556a8ac7e15d2f6e2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 14 Dec 2021 13:00:55 +0800 Subject: [PATCH 017/149] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8A=BD=E5=8F=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E9=83=A8=E5=88=86=E6=8A=BD=E5=8F=96=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9bug=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 17d021410b..db8e1e2d9b 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.312 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.313 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 1879df9653..e74ba6cc13 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.312 + 0.3.313 data-statistical com.epmet From 23a60386e6fc46a0e494736fed4066b2d18317d8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 14 Dec 2021 13:12:48 +0800 Subject: [PATCH 018/149] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9bug?= =?UTF-8?q?=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index db8e1e2d9b..30be33d636 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.313 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.314 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index e74ba6cc13..0ab880d3f2 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.313 + 0.3.314 data-statistical com.epmet From 5aa15b8453b63d979fe8e866d8e0bf79d341f5f1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 16 Dec 2021 10:59:24 +0800 Subject: [PATCH 019/149] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ScreenProjectCategoryGridAndOrgDailyServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridAndOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridAndOrgDailyServiceImpl.java index fc1ed7cb21..7acbcd1238 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridAndOrgDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridAndOrgDailyServiceImpl.java @@ -175,6 +175,7 @@ public class ScreenProjectCategoryGridAndOrgDailyServiceImpl implements ScreenPr } subCustomerIds.add(customerId); List allAgencies = screenCustomerAgencyDao.selectParentSonAgency(subCustomerIds, PingYinConstant.KONG_CUN_CUSTOMER_ID); + log.info("父子客户所有的组织{}",JSON.toJSONString(allAgencies)); List> partition = ListUtils.partition(allAgencies, NumConstant.FIFTY); List allOrgCategoryList = result; partition.forEach(p -> { From 2433a6d82b3289d52a4c8eeeb70fbd6a777c2fb0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 16 Dec 2021 11:04:14 +0800 Subject: [PATCH 020/149] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 30be33d636..48937982a3 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.314 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.315 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 0ab880d3f2..81f3724aca 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.314 + 0.3.315 data-statistical com.epmet From 73d70fe348b69d831759a47982007567bbc844fa Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 16 Dec 2021 12:53:46 +0800 Subject: [PATCH 021/149] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 48937982a3..6f2a782223 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.315 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.316 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 81f3724aca..b8d674ce0a 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.315 + 0.3.316 data-statistical com.epmet From 537694d9c501e4641a95d2f678f17177a4f2a2c7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 16 Dec 2021 14:26:42 +0800 Subject: [PATCH 022/149] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 2 +- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- .../epmet-message-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-oss/epmet-oss-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml index 0fb85349bf..34d1f6b689 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.28 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.29 ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 8c073dd8c3..18492a51be 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.28 + 0.3.29 com.epmet epmet-admin diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index 789eaec898..d2885aa010 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.69 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.70 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 2ef1bea3dd..7183679161 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.69 + 0.3.70 com.epmet epmet-cloud diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 0f4b2974ec..b883c42d9f 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.195 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.196 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 84e5f4d96f..6651fb7c7a 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.195 + 0.3.196 data-report-server diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 6f2a782223..ff0626f16c 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.316 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.317 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index b8d674ce0a..8caed5df4d 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.316 + 0.3.317 data-statistical com.epmet diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index e2cec97f9c..a499ce19cf 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.64 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.65 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 034780d7d5..11634ec0ba 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.64 + 0.0.65 com.epmet epmet-heart diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml index 13962e8e3a..e1e7eba63e 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.43 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.44 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 4ebf4f1fd3..1c6394c6a3 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.43 + 0.3.44 com.epmet epmet-job diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml index b2d13dc34c..af336b0a66 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.53 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.54 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 622c443eb5..5dadc35dbe 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.53 + 0.3.54 com.epmet epmet-message diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml index 88849c5796..9843f8a236 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-prod # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2 - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.38 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.39 ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 5883128ed8..faea949c97 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.38 + 0.3.39 com.epmet epmet-oss diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 256ac7b0e6..7ab82467ed 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.132 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.133 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 0177e4b4cd..8392aa96ba 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.132 + 0.3.133 com.epmet gov-org diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml index 5ccd050436..5fd9d995af 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.64 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.65 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index dd07e01331..24132d19f8 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.64 + 0.3.65 com.epmet oper-customize diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml index d5272f463c..253215b123 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.82 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.83 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 43e3789602..4c7c11b2fd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.82 + 0.3.83 com.epmet resi-partymember diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index b252971a80..93aa804c82 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.197 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.198 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 3bc3afa499..ae953671d0 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.197 + 0.3.198 com.epmet epmet-user From d3acec605669ad03a8dbd738ac6f17af10b02d33 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 16 Dec 2021 14:37:07 +0800 Subject: [PATCH 023/149] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=20up=20+reis=E2=80=94=E2=80=94mine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-mine/resi-mine-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-mine/resi-mine-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml index 09cdf0cd4c..98ef0ddad1 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.53 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.54 ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 7fc7613eb4..ef177cadf2 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.53 + 0.3.54 com.epmet resi-mine From 29f495a1ac42d1689c661fd93d237ba6419317d5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 17 Dec 2021 10:21:21 +0800 Subject: [PATCH 024/149] =?UTF-8?q?=E5=B8=82=E5=B9=B3=E5=8F=B0=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=20mq=E5=8F=AA=E6=89=A7=E8=A1=8C=E5=B9=B3=E9=98=B4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index eb7f206513..517788f415 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.14 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.15 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 79621b0ab0..8563e74cd3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.14 + 0.3.15 open-data-worker com.epmet From 77e867cf62dcb7b7a75150c82859880607d68373 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Dec 2021 10:39:16 +0800 Subject: [PATCH 025/149] 134 --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 7ab82467ed..ee5e3fc318 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.133 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.134 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 8392aa96ba..f1fe2351bb 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.133 + 0.3.134 com.epmet gov-org From f75b58a12a848414e5f41c65e0b8bb26ee71ae24 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 17 Dec 2021 11:20:00 +0800 Subject: [PATCH 026/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-prod.yml | 2 +- epmet-auth/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index d327a24e3e..3090f3c37c 100644 --- a/epmet-auth/deploy/docker-compose-prod.yml +++ b/epmet-auth/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.96 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.97 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index dbc60cf787..9eee35a756 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.96 + 0.3.97 com.epmet epmet-cloud From bc89b763b4100bbd2f81537cb7867a17dba2f0ad Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 17 Dec 2021 12:29:38 +0800 Subject: [PATCH 027/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 93aa804c82..82163f170d 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.198 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.199 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index ae953671d0..eb64e2df2f 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.198 + 0.3.199 com.epmet epmet-user From d88bb3ea0d3227239769da820425213cae74b8e0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Dec 2021 12:52:42 +0800 Subject: [PATCH 028/149] 135 --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index ee5e3fc318..ac3695ea8b 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.134 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.135 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index f1fe2351bb..d871944520 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.134 + 0.3.135 com.epmet gov-org From 13f34035bb01624791c2c1e1f2bc67998626f10b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 17 Dec 2021 13:51:28 +0800 Subject: [PATCH 029/149] =?UTF-8?q?=E5=BA=94=E8=83=A1=E7=A7=91=E5=AE=B6?= =?UTF-8?q?=E8=A6=81=E6=B1=82=E5=B0=86=E5=B9=B3=E9=98=B4=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=BD=91=E6=A0=BC=E5=91=98=E7=9A=84=E5=9C=A8?= =?UTF-8?q?=E6=94=B9=E5=9B=9E=E5=8E=BB=EF=BC=8C=E5=89=8D=E6=9C=9F=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E6=94=B9=E7=9A=84=E6=98=AF=E8=83=A1=E5=B0=8F=E9=9B=B7?= =?UTF-8?q?=E3=80=81=E6=9E=97=E4=BC=9F=E4=BC=9F=20=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index b883c42d9f..3ab093983e 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.196 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.197 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 6651fb7c7a..b16e3034ca 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.196 + 0.3.197 data-report-server From d3656d975a6ef9333d8220766c952993bb73a4f5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 17 Dec 2021 14:17:50 +0800 Subject: [PATCH 030/149] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 6893e30266..4b95ff28fa 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.79 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.80 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index da2562262d..d074d6e5c7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.79 + 0.3.80 data-aggregator com.epmet diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 3ab093983e..9189b63371 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.197 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.198 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index b16e3034ca..525f8ad117 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.197 + 0.3.198 data-report-server diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index ff0626f16c..6f85250914 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.317 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.318 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 8caed5df4d..df562984b6 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.317 + 0.3.318 data-statistical com.epmet From 035122db4261e46b535a1a234a608a3f511d9ea0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 17 Dec 2021 15:31:03 +0800 Subject: [PATCH 031/149] =?UTF-8?q?stats=EF=BC=8Creport=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 9189b63371..f0cd676106 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.198 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.199 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 525f8ad117..9c378c8e2d 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.198 + 0.3.199 data-report-server diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 6f85250914..ba6ffd7df3 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.318 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.319 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index df562984b6..40413e7ce4 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.318 + 0.3.319 data-statistical com.epmet From 42e5f85892f79ebda8496ecae9bf13302c0742e6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 17 Dec 2021 15:57:24 +0800 Subject: [PATCH 032/149] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index ba6ffd7df3..760ae6c8b7 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.319 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.320 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 40413e7ce4..4ec58d22b8 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.319 + 0.3.320 data-statistical com.epmet From aaad6d71bc93e4a42af63d684373306e6fae15b0 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 17 Dec 2021 16:21:53 +0800 Subject: [PATCH 033/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 82163f170d..6b05b2ac95 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.199 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.200 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index eb64e2df2f..630a75b980 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.199 + 0.3.200 com.epmet epmet-user From 14c6dee3eecbe92c949893687c6d410f6ee9c51a Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Dec 2021 16:46:19 +0800 Subject: [PATCH 034/149] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=E8=8E=B7=E5=8F=96=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index ac3695ea8b..ef8c28fd77 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.135 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.136 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index d871944520..0408a2ff24 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.135 + 0.3.136 com.epmet gov-org From 16c4a9b7d87e7f3193a7fa4bc0cf0ce1a84622a3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 17 Dec 2021 17:22:52 +0800 Subject: [PATCH 035/149] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 760ae6c8b7..2093339982 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.320 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.321 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 4ec58d22b8..0ec3ca08b4 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.320 + 0.3.321 data-statistical com.epmet From d77cb8bcb35dcefd24c520033c360ba668f6591e Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 20 Dec 2021 14:50:13 +0800 Subject: [PATCH 036/149] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90v3?= =?UTF-8?q?=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 2 +- .../epmet/commons/tools/security/password/PasswordUtils.java | 2 +- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../epmet-message-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-hall/resi-hall-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml index 34d1f6b689..4254c468ef 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.29 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.30 ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 18492a51be..df1298e8d4 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.29 + 0.3.30 com.epmet epmet-admin diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/PasswordUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/PasswordUtils.java index 758a6d84ed..d7a685b2f2 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/PasswordUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/PasswordUtils.java @@ -39,7 +39,7 @@ public class PasswordUtils { public static void main(String[] args) { - String str = "admin"; + String str = "wangqing"; String password = encode(str); System.out.println(password); diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 4b95ff28fa..bbabc1a5a1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.80 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.81 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index d074d6e5c7..c0f4a23073 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.80 + 0.3.81 data-aggregator com.epmet diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index a499ce19cf..1fb4796352 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.65 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.66 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 11634ec0ba..9bb3bb4090 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.65 + 0.0.66 com.epmet epmet-heart diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml index af336b0a66..18412f0b1b 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.54 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.55 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 5dadc35dbe..bd7ead60d5 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.54 + 0.3.55 com.epmet epmet-message diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index fd568a02f5..8fb8bb7d77 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.90 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.91 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index e1f0aa429e..34e5b8c9c0 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.90 + 0.3.91 gov-issue com.epmet diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index ef8c28fd77..35c338ffa2 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.136 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.137 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 0408a2ff24..401813bb65 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.136 + 0.3.137 com.epmet gov-org diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index a677b9ee7d..79c449b5cb 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.84 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.85 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 65421514bd..b48f8f07f2 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.84 + 0.3.85 gov-project com.epmet diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index 233b33c3ec..52b502c642 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.128 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.129 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 9932e17006..a5692c398f 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.128 + 0.3.129 com.epmet resi-group diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml index 6203abc44d..cf868ff78f 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.34 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.35 ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index fda6c3856d..6917169e85 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.34 + 0.3.35 resi-hall com.epmet diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 6b05b2ac95..8af8538a81 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.200 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.201 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 630a75b980..310da3996d 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.200 + 0.3.201 com.epmet epmet-user From 8533026157d3c1082f97a11ab50f9a3bdf315d65 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 20 Dec 2021 14:56:36 +0800 Subject: [PATCH 037/149] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90v3?= =?UTF-8?q?=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/pom.xml | 2 +- epmet-gateway/src/main/resources/bootstrap.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index d2885aa010..4edd602d7a 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.70 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.71 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index a7463ec742..abf223c749 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.70 + 0.3.71 com.epmet epmet-cloud diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 632d3a0ac4..35b4f1802b 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -496,6 +496,7 @@ epmet: - /gov/project/project/platformcallback - /oper/customize/customerstartpage/homestartpage - /epmet/point/mqCallback/** + - /tduck-api/** # 外部应用认证，使用AccessToken等头进行认证 externalOpenUrls: From b4062edd7b75de41033d548de7eccb56636665e2 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Dec 2021 15:39:38 +0800 Subject: [PATCH 038/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml index ca794b67dc..593377843a 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.179 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.180 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 121cb6460b..194cf42d5d 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.179 + 0.0.180 com.epmet From 2ff54d1343e4a619f6fb75027647f350a7dfa2f1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 20 Dec 2021 15:43:38 +0800 Subject: [PATCH 039/149] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90v3?= =?UTF-8?q?=20=E6=BC=8F=E6=8E=89=E6=9C=8D=E5=8A=A1report=20=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index f0cd676106..44161b631e 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.199 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.200 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 9c378c8e2d..a5ae761938 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.199 + 0.3.200 data-report-server From 085c9d37c55df60cd86905f3e9ee8e35b0dacb29 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Dec 2021 15:50:22 +0800 Subject: [PATCH 040/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index 79c449b5cb..a2e11c760e 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.85 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.86 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index b48f8f07f2..c66f211d7c 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.85 + 0.3.86 gov-project com.epmet From 33bd9729dcb2b5f7ac10b0b81e7beba055804258 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Dec 2021 15:58:23 +0800 Subject: [PATCH 041/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml index 5fd9d995af..88f8deb3ed 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.65 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.66 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 24132d19f8..d1e566e165 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.65 + 0.3.66 com.epmet oper-customize From d4c452ce942b466de89dd2edc485cf1ad7f6c81b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Dec 2021 16:12:17 +0800 Subject: [PATCH 042/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 2093339982..1a49bb9ec2 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.321 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.322 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 0ec3ca08b4..aab035462b 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.321 + 0.3.322 data-statistical com.epmet diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml index e1e7eba63e..dfc1856d50 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.44 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.45 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 1c6394c6a3..91331e48b8 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.44 + 0.3.45 com.epmet epmet-job From 79ca678e0aa1448f770433c76b8bf05fcec0588f Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 20 Dec 2021 16:53:02 +0800 Subject: [PATCH 043/149] =?UTF-8?q?=E6=95=B0=E6=8D=AE3=E7=89=88=20?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E6=BC=8F=E6=8E=89=E7=9A=84=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-point-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml index 7203606525..f81aec41c6 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.60 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.61 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 89c84eb878..7447b67333 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.60 + 0.0.61 epmet-point com.epmet From 72f08c88e9156d8f82f3326ad475a957deebdfdd Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 20 Dec 2021 17:13:47 +0800 Subject: [PATCH 044/149] =?UTF-8?q?=E6=95=B0=E6=8D=AE3=E7=89=88=20=20?= =?UTF-8?q?=E5=88=A0=E6=8E=89=E5=B7=B2=E7=BB=8F=E6=89=A7=E8=A1=8C=E7=9A=84?= =?UTF-8?q?sql=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-point-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml index f81aec41c6..0c8f62a89e 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.61 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.62 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 7447b67333..b0d136987c 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.61 + 0.0.62 epmet-point com.epmet From 5ed0232a3c9d9d0e7743817064a3b47f88547db0 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Dec 2021 23:51:30 +0800 Subject: [PATCH 045/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-prod.yml | 2 +- epmet-auth/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index 3090f3c37c..6b9592dfa9 100644 --- a/epmet-auth/deploy/docker-compose-prod.yml +++ b/epmet-auth/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.97 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.98 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 9eee35a756..41b8b92296 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.97 + 0.3.98 com.epmet epmet-cloud From 1b4e14d58cdfac84fb79b0aa789422e287f763cc Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 21 Dec 2021 09:07:26 +0800 Subject: [PATCH 046/149] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=9B=E5=8F=8A?= =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A3=B0=E9=9F=B3=E9=99=84=E4=BB=B6=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-oss/epmet-oss-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index bbabc1a5a1..45097faa9e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.81 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.82 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index c0f4a23073..95a1c4ea73 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.81 + 0.3.82 data-aggregator com.epmet diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 44161b631e..782d545e20 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.200 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.201 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index a5ae761938..d459af344d 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.200 + 0.3.201 data-report-server diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml index 9843f8a236..2ae17d5c59 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-prod # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2 - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.39 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.40 ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index faea949c97..e27a7d8103 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.39 + 0.3.40 com.epmet epmet-oss diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 8af8538a81..f8b8b06e5c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.201 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.202 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 310da3996d..97ac312166 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.201 + 0.3.202 com.epmet epmet-user From b29af47d5633cc7c4cbf59783efae41703a7d30e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 21 Dec 2021 19:10:26 +0800 Subject: [PATCH 047/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 35c338ffa2..8cff596fc0 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.137 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.138 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 401813bb65..1c8b34e7fb 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.137 + 0.3.138 com.epmet gov-org From 9d6c5dd7f4e2b514e488343471a027929837700f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 22 Dec 2021 09:57:00 +0800 Subject: [PATCH 048/149] =?UTF-8?q?issue=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index 8fb8bb7d77..d65641b20e 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.91 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.92 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 34e5b8c9c0..97cee1fa25 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.91 + 0.3.92 gov-issue com.epmet From 5bda526622e60ce8316df7ed61466f942bb14c21 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 22 Dec 2021 10:48:21 +0800 Subject: [PATCH 049/149] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E9=97=B4=E9=9A=94=E6=94=B9=E4=B8=BA3?= =?UTF-8?q?=E5=88=86=E9=92=9F=20up=2012=EF=BC=9A00?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index f8b8b06e5c..f62cff31b6 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.202 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.203 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 97ac312166..155afac298 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.202 + 0.3.203 com.epmet epmet-user From eccf275be63fca20e68c2e26656f49e55d9284ea Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 22 Dec 2021 15:52:11 +0800 Subject: [PATCH 050/149] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 1a49bb9ec2..56ef570678 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.322 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.323 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index aab035462b..936e9caff6 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.322 + 0.3.323 data-statistical com.epmet From 106d03f581b4dfad463bf9f318b6f2864527d5dd Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 22 Dec 2021 16:55:16 +0800 Subject: [PATCH 051/149] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 56ef570678..8766bfc1d8 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.323 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.324 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 936e9caff6..93c3f023b3 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.323 + 0.3.324 data-statistical com.epmet From fbde89c7b7f9324f4a9afe868a07ff7fe214e3fa Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 12:55:43 +0800 Subject: [PATCH 052/149] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A5=BC=E5=AE=87?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=20=E5=85=88=E6=8C=89=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=20=E5=86=8D=E6=8C=89=E6=A5=BC=E5=AE=87?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=9B=E6=88=BF=E5=B1=8B=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=B0=86=E5=8D=95=E5=85=83=E5=8F=B7=E8=BD=AC=E4=B8=BA=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E6=8E=92=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 8cff596fc0..5218f37164 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.138 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.139 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 1c8b34e7fb..bfce2860f7 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.138 + 0.3.139 com.epmet gov-org From 51a5a023192b3e24c203a960dbc196a3eb3778cb Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 23 Dec 2021 13:10:58 +0800 Subject: [PATCH 053/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 8766bfc1d8..7aaaf91cf2 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.324 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.325 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 93c3f023b3..0ef2ea9c7d 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.324 + 0.3.325 data-statistical com.epmet From 0db2588a93ca47ff2039042ddfdaa6f3a15be896 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 23 Dec 2021 14:18:30 +0800 Subject: [PATCH 054/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 782d545e20..eb78df9af2 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.201 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.202 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index d459af344d..b30d9875c1 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.201 + 0.3.202 data-report-server From e1d047ffa3a846677796b1d6ef30dc758ba1f629 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 14:36:27 +0800 Subject: [PATCH 055/149] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8F=8A=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=8E=BB=E6=8E=89=20=E9=BB=98=E8=AE=A4=E8=B7=9F?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E4=B8=AD=E5=BF=83=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 5218f37164..f923bcfa82 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.139 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.140 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index bfce2860f7..8a6a2ba0ca 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.139 + 0.3.140 com.epmet gov-org From 13858303378ed4e60c687aef87b198a54f94f009 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 14:44:39 +0800 Subject: [PATCH 056/149] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E9=98=B6=E6=AE=B51=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml index 4254c468ef..733b0eeb8e 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.30 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.31 ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index df1298e8d4..8a6d93b87a 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.30 + 0.3.31 com.epmet epmet-admin diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index f62cff31b6..18e65015df 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.203 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.204 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 155afac298..11e409f511 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.203 + 0.3.204 com.epmet epmet-user From 2c0c5c5c91b93b3af6fd299d38a695b858e874a7 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 23 Dec 2021 14:50:55 +0800 Subject: [PATCH 057/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index eb78df9af2..fda34e5959 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.202 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.203 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index b30d9875c1..730b3add6d 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.202 + 0.3.203 data-report-server From 56429b2e57c4ebd52f409e13cbaf503746570f20 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 15:24:39 +0800 Subject: [PATCH 058/149] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=E6=A0=B9=E7=BB=84=E7=BB=87=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E7=82=B9=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index f923bcfa82..bed245b5fa 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.140 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.141 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 8a6a2ba0ca..cb4bc82ad5 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.140 + 0.3.141 com.epmet gov-org From 95c451f3288aec2c5f36566facf869a167382e6c Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 18:56:55 +0800 Subject: [PATCH 059/149] =?UTF-8?q?=E6=8A=8A=E5=AD=97=E5=85=B8=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E4=B8=A4=E4=B8=AA=E8=A1=A8=E6=94=B9=E6=88=90=E6=88=91?= =?UTF-8?q?=E4=BB=AC=E8=BF=99=E7=A7=8D=E7=BB=93=E6=9E=84=E7=9A=842=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 2 +- epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 8a6d93b87a..c3b038a367 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.31 + 0.3.32 com.epmet epmet-admin diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml index 02fcb1cecc..3254a018e6 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.31 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.32 ports: - "8107:8107" network_mode: host # 不会创建新的网络 From 53730d0bf9dfed4c72c329a17fbe302b21a9f119 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 19:01:45 +0800 Subject: [PATCH 060/149] =?UTF-8?q?=E6=8A=8A=E5=AD=97=E5=85=B8=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E4=B8=A4=E4=B8=AA=E8=A1=A8=E6=94=B9=E6=88=90=E6=88=91?= =?UTF-8?q?=E4=BB=AC=E8=BF=99=E7=A7=8D=E7=BB=93=E6=9E=84=E7=9A=842=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml | 2 +- epmet-openapi/epmet-openapi-scan/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml index 733b0eeb8e..550b4369e3 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.31 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.32 ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 0356318585..289dd8a2f9 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.31 + 0.3.32 epmet-openapi-scan jar From a0e1abec83c41e804016a9047f8f63c4d8290281 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 14:03:26 +0800 Subject: [PATCH 061/149] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A02=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 18e65015df..b4957c19da 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.204 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.205 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 11e409f511..79d9848546 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.204 + 0.3.205 com.epmet epmet-user From a078876d3896e79759e3943e3d80681a2a798957 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 14:36:32 +0800 Subject: [PATCH 062/149] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C=20?= =?UTF-8?q?=E6=BC=8F=E6=8E=89=E4=BA=86=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index b4957c19da..2c8cbf0e53 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.205 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.206 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 79d9848546..09784c236a 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.205 + 0.3.206 com.epmet epmet-user From 0f968588332fcfea853f0752618c17459459fc5f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 20:29:42 +0800 Subject: [PATCH 063/149] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=90=A7=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-message-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 7aaaf91cf2..e75e727ee4 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.325 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.326 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 0ef2ea9c7d..f72c3d11e2 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.325 + 0.3.326 data-statistical com.epmet diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml index 18412f0b1b..663726c112 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.55 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.56 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index bd7ead60d5..01b5aac1e0 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.55 + 0.3.56 com.epmet epmet-message diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index 517788f415..3cf0625a00 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.15 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.16 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 8563e74cd3..dbe445a623 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.15 + 0.3.16 open-data-worker com.epmet diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 2c8cbf0e53..7aed3c9d79 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.206 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.207 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 09784c236a..f5764f929a 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.206 + 0.3.207 com.epmet epmet-user From aa10a4b2c8728f1a4ecbabccdcd6bc662428f913 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 20:50:19 +0800 Subject: [PATCH 064/149] =?UTF-8?q?=E4=B8=8D=E9=BB=98=E8=AE=A4=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index 3cf0625a00..77d1e3ddcd 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.16 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.17 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index dbe445a623..c0e4e490ba 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.16 + 0.3.17 open-data-worker com.epmet From ff89e5f770ffc23d01c75c007a56a8f1406b18a6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 21:02:11 +0800 Subject: [PATCH 065/149] =?UTF-8?q?=E6=84=8F=E6=83=B3=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index 77d1e3ddcd..550036b205 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.17 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.18 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index c0e4e490ba..00b8856515 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.17 + 0.3.18 open-data-worker com.epmet From 5fef4e8d779147805fa0c7ca5c91bf4c18c3b6fc Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 26 Dec 2021 18:52:58 +0800 Subject: [PATCH 066/149] =?UTF-8?q?=E5=B9=B2=E6=8E=89=E9=82=A3=E4=B8=AA?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index e75e727ee4..fd53fb0d63 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.326 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.327 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index f72c3d11e2..f26099ef72 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.326 + 0.3.327 data-statistical com.epmet From 75ee5b1f6b46126369b6053f9f8b973c949b97ab Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 27 Dec 2021 15:41:11 +0800 Subject: [PATCH 067/149] =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=94=99=E8=AF=AF=20?= =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E4=B8=8A=E7=BA=BF=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 7aed3c9d79..ca2798e08a 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.207 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.208 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index f5764f929a..b60dd8fc80 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.207 + 0.3.208 com.epmet epmet-user From 2d06389c0a80765de0af7353db054728bfd325f3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 27 Dec 2021 18:12:10 +0800 Subject: [PATCH 068/149] =?UTF-8?q?=E6=9A=82=E6=97=B6=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E9=87=8D=E5=86=99=E4=BC=98=E5=8C=96=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index d65641b20e..d5049f3c25 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.92 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.93 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 97cee1fa25..4c8c7510c6 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.92 + 0.3.93 gov-issue com.epmet From 86ed4a89a3130041918f091912937cae0f7e0d96 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 28 Dec 2021 09:07:09 +0800 Subject: [PATCH 069/149] =?UTF-8?q?project=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index a2e11c760e..b7341fa4eb 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.86 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.87 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index c66f211d7c..62bfee097d 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.86 + 0.3.87 gov-project com.epmet From abbc38b68eb753c5f58aaa065c2ed66687ddc884 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 28 Dec 2021 09:31:48 +0800 Subject: [PATCH 070/149] =?UTF-8?q?project=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index b7341fa4eb..3f641300c8 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.87 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.88 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 62bfee097d..eb039925d1 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.87 + 0.3.88 gov-project com.epmet From 2e1cc7017023de62eef643e9125d8ad4b225dab9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 28 Dec 2021 09:39:34 +0800 Subject: [PATCH 071/149] =?UTF-8?q?project=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index 3f641300c8..edf6dc95e1 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.88 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.89 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index eb039925d1..dad92f9984 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.88 + 0.3.89 gov-project com.epmet From 47c5518343449a6340ab8f67b8279152e6e2f35a Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 28 Dec 2021 17:15:43 +0800 Subject: [PATCH 072/149] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=20?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AEid=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index fd53fb0d63..26932470da 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.327 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.328 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index f26099ef72..f1beec24f0 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.327 + 0.3.328 data-statistical com.epmet From 472c31694e560c8ba856050728820b348d7a3aa4 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 28 Dec 2021 19:57:15 +0800 Subject: [PATCH 073/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml index 593377843a..27d1f2cc2d 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.180 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.181 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 194cf42d5d..e6b96eeabe 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.180 + 0.0.181 com.epmet From b9336c8ee5d5291dcf1a7a7db774556a2b73d9bb Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 29 Dec 2021 10:36:48 +0800 Subject: [PATCH 074/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml index 27d1f2cc2d..42e3c35a93 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.181 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.182 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index e6b96eeabe..093a123478 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.181 + 0.0.182 com.epmet From cb3966ae9e8fd51ee7365db17f5057bfd9811f05 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Dec 2021 16:34:35 +0800 Subject: [PATCH 075/149] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index 550036b205..dd951ac36d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.18 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.19 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 00b8856515..61a9215489 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.18 + 0.3.19 open-data-worker com.epmet From eeb7c3c1314587156512fa41812d770828f7e9ad Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Dec 2021 18:06:25 +0800 Subject: [PATCH 076/149] =?UTF-8?q?=E6=8E=92=E5=90=8Dbug=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index fda34e5959..9a0f6f2160 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.203 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.204 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 730b3add6d..63a0c4d455 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.203 + 0.3.204 data-report-server From da97b6809e4dcc6b2feb4e7cd933be4981e2c7dc Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Dec 2021 18:18:54 +0800 Subject: [PATCH 077/149] =?UTF-8?q?url=20=E5=A4=9A=E4=BA=86=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index ca2798e08a..14d6beb1e4 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.208 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.209 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index b60dd8fc80..11e082a723 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.208 + 0.3.209 com.epmet epmet-user From 1ee5a9f773a46d4a68aabff83cbe2361445e10b7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Dec 2021 19:43:41 +0800 Subject: [PATCH 078/149] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E7=9A=84bug?= =?UTF-8?q?=20agg=20user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 45097faa9e..bd6403e011 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.82 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.83 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 95a1c4ea73..c7bef86fab 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.82 + 0.3.83 data-aggregator com.epmet diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 14d6beb1e4..a6fef1cd87 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.209 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.210 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 11e082a723..72b7e397a4 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.209 + 0.3.210 com.epmet epmet-user From ef75c0c9683ac152db63bebf8b7d8eb9c7d98e12 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Dec 2021 20:15:47 +0800 Subject: [PATCH 079/149] =?UTF-8?q?=E5=B8=82=E5=8C=97=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E6=B3=A8=E6=8E=89=E7=9A=84=E4=B8=9C=E8=A5=BF=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index edf6dc95e1..4046993160 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.89 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.90 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index dad92f9984..4eaa1e155e 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.89 + 0.3.90 gov-project com.epmet From ddff9e1115aa358d23851fa449c5b271858e3bf5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 09:32:07 +0800 Subject: [PATCH 080/149] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index dd951ac36d..f65cef3e4a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.19 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.20 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 61a9215489..8b397826b8 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.19 + 0.3.20 open-data-worker com.epmet From a5bba281aba1e36dff211549b98c7359effbecda Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Dec 2021 10:37:30 +0800 Subject: [PATCH 081/149] governcapacityrank-origin report v_205 --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 9a0f6f2160..db00802838 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.204 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.205 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 63a0c4d455..0b37541280 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.204 + 0.3.205 data-report-server From b9d37d1a436d3e7632d34f59c04a5d6f977f0a3d Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 10:41:18 +0800 Subject: [PATCH 082/149] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=96=B9=E6=A1=88=20=E7=BB=84=E7=BB=87=E6=A0=91=20=E5=85=88?= =?UTF-8?q?=E7=BC=93=E5=AD=98=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index bed245b5fa..5c3b4a28cb 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.141 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.142 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index cb4bc82ad5..07f19d7f26 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.141 + 0.3.142 com.epmet gov-org From 0a44d6736463a122b22a861cdc2414fe928723ce Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Dec 2021 10:47:27 +0800 Subject: [PATCH 083/149] 206 --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index db00802838..301a731e6e 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.205 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.206 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 0b37541280..3225f34c86 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.205 + 0.3.206 data-report-server From e2e71a3cb963bf9910fefcaa180e0585cdd81a43 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 10:56:41 +0800 Subject: [PATCH 084/149] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=96=B9=E6=A1=88=20=E7=BB=84=E7=BB=87=E6=A0=91=20=E5=85=88?= =?UTF-8?q?=E7=BC=93=E5=AD=98=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 5c3b4a28cb..3ac1d4c79b 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.142 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.143 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 07f19d7f26..f505d40784 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.142 + 0.3.143 com.epmet gov-org From 362fb83323e78107736267addf77c9798cb2029a Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 12:21:09 +0800 Subject: [PATCH 085/149] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E7=9A=84=E5=BB=B6?= =?UTF-8?q?=E8=BF=9F1s=20=E6=B6=88=E8=B4=B9=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index f65cef3e4a..6cb506e324 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.20 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.21 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 8b397826b8..91b54b897f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.20 + 0.3.21 open-data-worker com.epmet From c9dc09cef214540d8a56e3f206d86085f074a079 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 30 Dec 2021 12:24:48 +0800 Subject: [PATCH 086/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index a6fef1cd87..cac11c6719 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.210 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.211 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 72b7e397a4..a8612e1ce6 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.210 + 0.3.211 com.epmet epmet-user From 0beba733237c2ebcad4eb5fdfbc99412c827134b Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 12:47:27 +0800 Subject: [PATCH 087/149] =?UTF-8?q?=E6=B3=A8=E6=8E=89=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E6=8C=A8=E5=8D=83=E5=88=80=E7=9A=84=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index d5049f3c25..0e7daf6be2 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.93 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.94 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 4c8c7510c6..a690d6c849 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.93 + 0.3.94 gov-issue com.epmet From e9d74a7ff5e7dee5a2e0f440bed92b9822f1f322 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 30 Dec 2021 13:21:11 +0800 Subject: [PATCH 088/149] =?UTF-8?q?issue=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index 0e7daf6be2..28472163c4 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.94 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.95 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index a690d6c849..76cf76a8b1 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.94 + 0.3.95 gov-issue com.epmet From a332bfd6bf72647335f7dda10786489cb340f16c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 30 Dec 2021 13:25:20 +0800 Subject: [PATCH 089/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index cac11c6719..0beaa60270 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.211 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.212 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index a8612e1ce6..8a3e71a09a 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.211 + 0.3.212 com.epmet epmet-user From 1768f1b843ec2b3d664e2efc160c957f3406a090 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 13:29:01 +0800 Subject: [PATCH 090/149] =?UTF-8?q?=E5=AD=98=E4=BB=96=E4=B8=AA=2024?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=20=E7=BB=99=E6=88=91=E7=82=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 3ac1d4c79b..da4b269e84 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.143 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.144 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index f505d40784..ca3616dd32 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.143 + 0.3.144 com.epmet gov-org From 705fe60346f6e640a457858e113b18a113496a6d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 30 Dec 2021 13:33:31 +0800 Subject: [PATCH 091/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 0beaa60270..c0da456015 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.212 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.213 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 8a3e71a09a..801ad92ccc 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.212 + 0.3.213 com.epmet epmet-user From 10e882d8ad389f92afc206075d47b2f4184bcabf Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 13:34:19 +0800 Subject: [PATCH 092/149] =?UTF-8?q?=E5=AD=98=E4=BB=96=E4=B8=AA=2024?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=20=E7=BB=99=E6=88=91=E7=82=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index da4b269e84..b0a5ac017b 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.144 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.145 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index ca3616dd32..46132942ac 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.144 + 0.3.145 com.epmet gov-org From 9f1b46e19b8e5c3b50aceaa988355dcdf5d7f026 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 14:35:23 +0800 Subject: [PATCH 093/149] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=B8=82=E5=8C=97?= =?UTF-8?q?=E7=9A=84=E5=AE=A2=E6=88=B7=20=E6=8C=87=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=8F=8A=E6=8C=87=E6=A0=87=E5=8E=9F=E5=A7=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 26932470da..b763f2cf22 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.328 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.329 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index f1beec24f0..2cb7656dab 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.328 + 0.3.329 data-statistical com.epmet From dfac30dc7ce1ae627754c04f0b2bd9300889d96e Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 15:42:14 +0800 Subject: [PATCH 094/149] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8A=BD=E5=8F=96=20=E6=97=A5=E5=BF=97=E6=8E=92=E6=9F=A5=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index b763f2cf22..cf92caf47d 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.329 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.330 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 2cb7656dab..9ebd315b3b 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.329 + 0.3.330 data-statistical com.epmet From d1fa0d177ce8d52982291b101c16317109633643 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 15:53:58 +0800 Subject: [PATCH 095/149] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?issue=20job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml index dfc1856d50..dda39a3dc8 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.45 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.46 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 91331e48b8..4dc4c5daad 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.45 + 0.3.46 com.epmet epmet-job diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index 28472163c4..8bd2d746b8 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.95 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.97 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 76cf76a8b1..c792ecc2eb 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.95 + 0.3.97 gov-issue com.epmet From 04642f7928ad2fea8d46529fcdf30b43731be0d0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 30 Dec 2021 16:27:47 +0800 Subject: [PATCH 096/149] =?UTF-8?q?issue=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index 8bd2d746b8..fec48c1601 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.97 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.98 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index c792ecc2eb..0cebda4b7c 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.97 + 0.3.98 gov-issue com.epmet From 8cd0a156ba6a92451ecae11799a6e7ec859f3b30 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Dec 2021 17:43:01 +0800 Subject: [PATCH 097/149] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E5=88=86=E9=A1=B5=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index cf92caf47d..aae94d3144 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.330 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.331 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 9ebd315b3b..1c0a8483e1 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.330 + 0.3.331 data-statistical com.epmet From 8cbbe9776de486c34d43af9773071b4c27d7e5b8 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 30 Dec 2021 17:44:05 +0800 Subject: [PATCH 098/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index 1fb4796352..b3aef02928 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.66 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.67 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 9bb3bb4090..dc1b77e3f1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.66 + 0.0.67 com.epmet epmet-heart diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index c0da456015..c10cf7c870 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.213 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.214 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 801ad92ccc..7e388c3bc5 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.213 + 0.3.214 com.epmet epmet-user From 4b29544c47990bbcff0e3de6bd8e26d101d7c499 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 31 Dec 2021 09:44:24 +0800 Subject: [PATCH 099/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index aae94d3144..51ead22cb1 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.331 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.332 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 1c0a8483e1..36c954d7a2 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.331 + 0.3.332 data-statistical com.epmet From ed223fee80474a31f4128cfdde985c198ca3b815 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 31 Dec 2021 11:13:05 +0800 Subject: [PATCH 100/149] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E5=B8=83?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index b0a5ac017b..cb942b75d0 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.145 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.146 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 46132942ac..0ea2d91e37 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.145 + 0.3.146 com.epmet gov-org diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index 4046993160..2e24acd593 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.90 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.91 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 4eaa1e155e..7190db4168 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.90 + 0.3.91 gov-project com.epmet From e3ce28750b031b7da85258023877ca1aa3543108 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 31 Dec 2021 13:45:48 +0800 Subject: [PATCH 101/149] project-update --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index 2e24acd593..088528028e 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.91 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.92 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 7190db4168..9538442f93 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.91 + 0.3.92 gov-project com.epmet From 7c7000af626f43a65d4594cb66036f1cdea9a4e7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 31 Dec 2021 16:55:54 +0800 Subject: [PATCH 102/149] =?UTF-8?q?project=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index 088528028e..a932278957 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.92 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.93 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 9538442f93..e1488a4c8e 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.92 + 0.3.93 gov-project com.epmet From e2c1b4c89fd983ba48baeebeaca89017b0fe9d80 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 31 Dec 2021 22:27:00 +0800 Subject: [PATCH 103/149] =?UTF-8?q?=E8=AE=A9stats=20=E8=BD=BB=E8=A3=85?= =?UTF-8?q?=E4=B8=8A=E9=98=B5=20=E5=87=86=E5=A4=87=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 51ead22cb1..7d0e95acdf 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.332 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.333 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 36c954d7a2..bce763087c 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.332 + 0.3.333 data-statistical com.epmet From d58e9a84e6f919b9fa58ace36b5ed3e1f15ff238 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 1 Jan 2022 12:21:06 +0800 Subject: [PATCH 104/149] =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E5=87=BA=E6=9D=A5=20?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=97=A5=E5=BF=97=E4=BA=86=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 301a731e6e..2e3e3f82b5 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.206 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.207 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 3225f34c86..833f2a0cd3 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.206 + 0.3.207 data-report-server From a1a12fdb474767dd598cbf86037dd748c89a8afc Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 1 Jan 2022 14:44:57 +0800 Subject: [PATCH 105/149] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86=20?= =?UTF-8?q?202212=E4=B8=BA202112=20=E5=9B=A0=E4=B8=BA=E4=BB=96=E4=BB=AC?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 2e3e3f82b5..d62e40750a 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.207 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.208 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 833f2a0cd3..1c717483ea 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.207 + 0.3.208 data-report-server From 25ea688df7378ec3f6ea5bb1db9ace73f4ea902c Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 1 Jan 2022 14:55:23 +0800 Subject: [PATCH 106/149] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86=20?= =?UTF-8?q?202212=E4=B8=BA202112=20=E5=9B=A0=E4=B8=BA=E4=BB=96=E4=BB=AC?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF=202=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/data-report/data-report-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 1c717483ea..4e4b14cfd5 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.208 + 0.3.209 data-report-server From 5d020b4da29fe7b45a3b75b5b98cbba1a3e09b65 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 1 Jan 2022 14:55:30 +0800 Subject: [PATCH 107/149] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86=20?= =?UTF-8?q?202212=E4=B8=BA202112=20=E5=9B=A0=E4=B8=BA=E4=BB=96=E4=BB=AC?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF=202=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index d62e40750a..6c22db92b3 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.208 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.209 ports: - "8108:8108" network_mode: host # 使用现有网络 From 291bf2e99e290af180f8af639c8014da321e40f0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 5 Jan 2022 11:10:10 +0800 Subject: [PATCH 108/149] =?UTF-8?q?=E4=B8=AD=E9=97=B4=E5=BA=93=E4=BC=9A?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=20=E5=B9=B3=E9=98=B4=E5=92=8C=E4=B8=8B?= =?UTF-8?q?=E9=9D=A23=E4=B8=AA=E8=A1=97=E9=81=93=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E6=89=80=E4=BB=A5=E5=8E=BB=E6=8E=89=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 7d0e95acdf..cf238bab29 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.333 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.334 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index bce763087c..5985cd99c1 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.333 + 0.3.334 data-statistical com.epmet diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index 6cb506e324..bc90323bc3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.21 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.22 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 91b54b897f..802f37d762 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.21 + 0.3.22 open-data-worker com.epmet From d71a4387ccee42486694f86c4423d0ade0716e6a Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 5 Jan 2022 15:42:35 +0800 Subject: [PATCH 109/149] =?UTF-8?q?=E5=8F=91=E6=96=87=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index cf238bab29..f09a8d723c 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.334 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.335 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 5985cd99c1..463729db07 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.334 + 0.3.335 data-statistical com.epmet From 9177728c05e065d1bb835a37432b30c9ec8c9b96 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Jan 2022 09:46:25 +0800 Subject: [PATCH 110/149] =?UTF-8?q?=E9=92=89=E9=92=89=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E5=A4=84=E7=90=86screen=5Fparty=5Fuser=5Frank=5Fdata=20336?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index f09a8d723c..fcb0a57d76 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.335 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.336 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 463729db07..1b20cea6bd 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.335 + 0.3.336 data-statistical com.epmet From 3b99e27ba7af8afd66c30f3f52471a77a2dc2779 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 6 Jan 2022 17:11:03 +0800 Subject: [PATCH 111/149] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 6 +++--- .../data-statistical/data-statistical-server/pom.xml | 2 +- .../gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index bd6403e011..82f5919953 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.83 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.84 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 75523bec00..b529d2cc54 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.83 + 0.3.84 data-aggregator com.epmet diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index fcb0a57d76..02221305c2 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,17 +2,17 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.336 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.337 ports: - "8108:8108" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx1524m -jar ./data-stats.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx1724m -jar ./data-stats.jar" restart: "unless-stopped" deploy: resources: limits: cpus: '0.1' - memory: 1600M + memory: 16800M diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 1b20cea6bd..817d3c5394 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.336 + 0.3.337 data-statistical com.epmet diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index fec48c1601..3d40512d2a 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.98 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.99 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 0cebda4b7c..757ffcbafb 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.98 + 0.3.99 gov-issue com.epmet diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index a932278957..189b35361f 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.93 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.94 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 4b30b0c0a9..63c8965c77 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.93 + 0.3.94 gov-project com.epmet diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index c10cf7c870..e58d53d6db 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.214 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.215 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From f38aa56182fb8de03289cd91bf5fc0b5f9354cd5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 6 Jan 2022 17:26:42 +0800 Subject: [PATCH 112/149] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 7e388c3bc5..97bd68dab1 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.214 + 0.3.215 com.epmet epmet-user From 0fb2d7f317a004f719f305945707ad43af5aabf7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 6 Jan 2022 17:56:57 +0800 Subject: [PATCH 113/149] =?UTF-8?q?agg=20,ISSUE=EF=BC=8Cproject=EF=BC=8Cgu?= =?UTF-8?q?ide=20=EF=BC=8Chall?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-guide/resi-guide-server/pom.xml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-hall/resi-hall-server/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 82f5919953..c56ad376a2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.84 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.85 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index b529d2cc54..8d818b2f33 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.84 + 0.3.85 data-aggregator com.epmet diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index 3d40512d2a..8105b3917f 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.99 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.100 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 757ffcbafb..c09284177c 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.99 + 0.3.100 gov-issue com.epmet diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index 189b35361f..b1d20673fc 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.94 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.95 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 63c8965c77..e1873fe22e 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.94 + 0.3.95 gov-project com.epmet diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml index 15488d6f33..0405bc5164 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.33 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.34 ports: - "8091:8091" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 0f2ec5ea4f..9c057ecb24 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.33 + 0.3.34 com.epmet resi-guide diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml index cf868ff78f..6ae227458d 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.35 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.36 ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index 6917169e85..e1d8cb9996 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.35 + 0.3.36 resi-hall com.epmet From 2c0cbce0b7e537225bf444e80c95a77f1776996c Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 6 Jan 2022 18:17:27 +0800 Subject: [PATCH 114/149] report stats heart job msg point org user --- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-report/data-report-server/pom.xml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- .../epmet-message-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- .../epmet-point-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 6c22db92b3..c20b81b36d 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.209 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.210 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 4e4b14cfd5..170d4f0d63 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.209 + 0.3.210 data-report-server diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 02221305c2..a6099105ba 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.337 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.338 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 817d3c5394..3717de6775 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.337 + 0.3.338 data-statistical com.epmet diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index b3aef02928..59ce378d40 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.67 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.68 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index dc1b77e3f1..538814ffba 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.67 + 0.0.68 com.epmet epmet-heart diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml index dda39a3dc8..b1813f2660 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.46 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.47 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index e4580a3649..f772b6134b 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.46 + 0.3.47 com.epmet epmet-job diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml index 663726c112..01efd03422 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.56 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.57 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 01b5aac1e0..fe91db7f6b 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.56 + 0.3.57 com.epmet epmet-message diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml index 0c8f62a89e..d4ea51ca74 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.62 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.63 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 904781f9ed..8aea483cfd 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.62 + 0.0.63 epmet-point com.epmet diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index cb942b75d0..bef0d861b1 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.146 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.147 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 0ea2d91e37..62ce48065e 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.146 + 0.3.147 com.epmet gov-org diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index e58d53d6db..87ca47c250 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.215 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.216 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 97bd68dab1..492dd3e5a1 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.215 + 0.3.216 com.epmet epmet-user From fb5e8dbf574bf3446acc18db49860b6683ed5c0a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 6 Jan 2022 18:23:14 +0800 Subject: [PATCH 115/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index c56ad376a2..70a4694579 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.85 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.86 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 8d818b2f33..24a5d54c5b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.85 + 0.3.86 data-aggregator com.epmet From 8e77dceef5f8c35df80ec015955984329be5b672 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Jan 2022 18:35:16 +0800 Subject: [PATCH 116/149] data-agg\gov-org --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 70a4694579..515049567e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.86 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.87 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 24a5d54c5b..2fdad038a1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.86 + 0.3.87 data-aggregator com.epmet diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index bef0d861b1..37f16a9155 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.147 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.148 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 62ce48065e..62a0259c4a 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.147 + 0.3.148 com.epmet gov-org From b222b3d809cecf7e51cc7d5f28c43e3266a22855 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 6 Jan 2022 21:26:34 +0800 Subject: [PATCH 117/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index 52b502c642..354d8b1daa 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.129 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.130 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index a5692c398f..1a1462c00b 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.129 + 0.3.130 com.epmet resi-group From 2374d20fdba80e04340f7be9f63e599b34134c2e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 7 Jan 2022 09:30:18 +0800 Subject: [PATCH 118/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 515049567e..08edaf734e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.87 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.88 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 2fdad038a1..b5ea80bf3f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.87 + 0.3.88 data-aggregator com.epmet From 55643e7ed5d2f7080595749692a14c9eebf8b713 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 7 Jan 2022 10:17:54 +0800 Subject: [PATCH 119/149] again --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 87ca47c250..05deec2fc1 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.216 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.217 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 492dd3e5a1..a4cf5c6bbf 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.216 + 0.3.217 com.epmet epmet-user From 58ddced7fd0937b1263bc47e7616c25a01b8e390 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Jan 2022 10:21:48 +0800 Subject: [PATCH 120/149] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=9D=9E=E7=A9=BA=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index 59ce378d40..6a3f2dc47f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.68 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.69 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 538814ffba..6bab2eee62 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.68 + 0.0.69 com.epmet epmet-heart From 15e15e631c8cf53f85ca9afd2ecad7dbc87b1450 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Jan 2022 10:49:50 +0800 Subject: [PATCH 121/149] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E5=8D=AB=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index a6099105ba..69cd8d4c23 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.338 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.339 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 3717de6775..97baddf894 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.338 + 0.3.339 data-statistical com.epmet From b466cad0782508fb6e2d0f349fed4d2849a7d8fc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 7 Jan 2022 10:57:43 +0800 Subject: [PATCH 122/149] again --- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index 6a3f2dc47f..4a34078e21 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.69 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.70 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 6bab2eee62..cbfda4799a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.69 + 0.0.70 com.epmet epmet-heart From 38c7eea3d03189b68fc339e1317a3ea3ae0fa396 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Jan 2022 11:05:51 +0800 Subject: [PATCH 123/149] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E5=8D=AB340?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 69cd8d4c23..553bcd66bd 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.339 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.340 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 97baddf894..a0cde1d0db 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.339 + 0.3.340 data-statistical com.epmet From 812273e27014b9f9b5e9479cb2fca74919e83e71 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 7 Jan 2022 15:49:41 +0800 Subject: [PATCH 124/149] pageNo+1 up --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 08edaf734e..c928f6d525 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.88 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.89 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index b5ea80bf3f..f600245dca 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.88 + 0.3.89 data-aggregator com.epmet From c48f5c7603ef397f44c7d96c5b69fe2164390476 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Jan 2022 15:50:22 +0800 Subject: [PATCH 125/149] gov-org 149 --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 37f16a9155..196af6be0e 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.148 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.149 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 62a0259c4a..77e9e5d0f4 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.148 + 0.3.149 com.epmet gov-org From 90263a50c86072bfad3639890e601314e9533716 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 7 Jan 2022 16:16:13 +0800 Subject: [PATCH 126/149] pageNo+1 up --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index c928f6d525..9ef3d33f7e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.89 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.90 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index f600245dca..eb4351a62d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.89 + 0.3.90 data-aggregator com.epmet From 1f364bebe88e1252b399bc42183cdd3fcef5f7e2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 7 Jan 2022 16:27:10 +0800 Subject: [PATCH 127/149] pageNo+1 up --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 9ef3d33f7e..80d6e22a65 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.90 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.91 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index eb4351a62d..e0e8f56297 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.90 + 0.3.91 data-aggregator com.epmet From 24c57fb94a0ba64e28d602078b314b4b2d64d296 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Jan 2022 16:59:00 +0800 Subject: [PATCH 128/149] 150 --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 196af6be0e..599f09e148 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.149 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.150 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 77e9e5d0f4..8034bdd53e 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.149 + 0.3.150 com.epmet gov-org From 0d0039dd5ab101a0fd246cd89656db29293e1997 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Jan 2022 17:23:54 +0800 Subject: [PATCH 129/149] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=BC=96?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=90=8D=E7=A7=B0=E5=B7=B2=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E7=BB=99=E7=94=A8=E6=88=B7=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-common-service/common-service-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml index bdbb5be1ee..97adff5e39 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.41 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.42 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index f3de138c12..2e22c32c01 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.41 + 0.3.42 com.epmet epmet-common-service diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 599f09e148..2709585821 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.150 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.151 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 8034bdd53e..3d6d206b97 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.150 + 0.3.151 com.epmet gov-org From a4f62489519a142aed42d528898a32dfc5895cf8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Jan 2022 17:31:00 +0800 Subject: [PATCH 130/149] msg152 --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 2709585821..5a163dedb5 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.151 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.152 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 3d6d206b97..12eac6b8eb 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.151 + 0.3.152 com.epmet gov-org From 63e26475ef546e9d1666d7d01d07819851b94a74 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Jan 2022 20:28:38 +0800 Subject: [PATCH 131/149] up --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 5a163dedb5..a3bc86fc9d 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.152 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.153 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 12eac6b8eb..9b60904f7b 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.152 + 0.3.153 com.epmet gov-org From 3194d5015d1dfcc50b746ed8da04792c17ee14d0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 10 Jan 2022 09:09:16 +0800 Subject: [PATCH 132/149] stats up --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 553bcd66bd..9972a6190b 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.340 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.341 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index a0cde1d0db..5d4a57dc54 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.340 + 0.3.341 data-statistical com.epmet From 3c393d15256f8834e715b76d2624643ec6c366f2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 10 Jan 2022 09:10:05 +0800 Subject: [PATCH 133/149] stats up --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 9972a6190b..65cb9ed8b8 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 16800M + memory: 1800M From 1940239d56502b4710a5e2414402508bfe891728 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 10 Jan 2022 10:32:39 +0800 Subject: [PATCH 134/149] stats ext 3g up --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 79ce454ad7..60f1cf27f7 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.341 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.342 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 5d4a57dc54..4b82c11d0b 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.341 + 0.3.342 data-statistical com.epmet From 6278e555812a6fce79e514a155f3706011d8c462 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Jan 2022 10:34:41 +0800 Subject: [PATCH 135/149] =?UTF-8?q?=E6=A0=B9=E7=BB=84=E7=BB=87=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index a3bc86fc9d..b2bd4e6c11 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.153 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.154 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 9b60904f7b..c590b19f95 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.153 + 0.3.154 com.epmet gov-org From 05e68a7a5bab5335a5d9228f00de2a9cddfca846 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Jan 2022 11:17:24 +0800 Subject: [PATCH 136/149] /gov/org/agency/agencydetail up --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index b2bd4e6c11..c01bb9fd7e 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.154 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.155 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index c590b19f95..892e3b3d77 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.154 + 0.3.155 com.epmet gov-org From 73b158b2e1c02280f4973fde134850104c61dcbc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 10 Jan 2022 14:34:26 +0800 Subject: [PATCH 137/149] again --- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index 4a34078e21..611a56849a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.70 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.71 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index cbfda4799a..ad7c53072d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.70 + 0.0.71 com.epmet epmet-heart From 4f03394c729982b5a1ed9f2354067adabe5be2fc Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 10 Jan 2022 16:18:08 +0800 Subject: [PATCH 138/149] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AD=A5=E9=AA=A41=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 60f1cf27f7..38f5fcdb32 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.342 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.343 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 4b82c11d0b..da6957c966 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.342 + 0.3.343 data-statistical com.epmet From 9494bff2ee1d33ad852569855d56e54e97313f59 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 10 Jan 2022 18:23:38 +0800 Subject: [PATCH 139/149] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9=20?= =?UTF-8?q?=E5=8F=AA=E5=B7=AE=E6=9F=A5=E8=BF=9110=E5=A4=A9=E7=9A=84?= =?UTF-8?q?=E7=BB=93=E6=A1=88=E6=95=B0=E6=8D=AE=E5=92=8C=E6=9C=AA=E7=BB=93?= =?UTF-8?q?=E6=A1=88=E7=9A=84=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 38f5fcdb32..88a18a7d9f 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.343 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.344 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index da6957c966..f91c3cb849 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.343 + 0.3.344 data-statistical com.epmet From 7bff4614081e6b2ca82e26213140d2b1cebd1a32 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 11 Jan 2022 09:11:06 +0800 Subject: [PATCH 140/149] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BA=BF=E7=A8=8B=20?= =?UTF-8?q?up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 88a18a7d9f..a54a0348a6 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.344 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.345 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index f91c3cb849..6c21774ece 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.344 + 0.3.345 data-statistical com.epmet From d931ae68907dd8ffa19d81cdc510889c5c5a6ec1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 11 Jan 2022 10:34:28 +0800 Subject: [PATCH 141/149] =?UTF-8?q?heart=E5=AF=BC=E5=85=A5=E5=BE=AE?= =?UTF-8?q?=E8=B0=83=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index 611a56849a..d1ccbc081a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.71 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.72 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index ad7c53072d..ba92a6d321 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.71 + 0.0.72 com.epmet epmet-heart From 258b191140ba39e16a40004c5061e7650e4e64e0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 11 Jan 2022 16:33:51 +0800 Subject: [PATCH 142/149] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datastats/result/WorkFactResultDTO.java | 1 + .../result/PatrolDailySumResult.java | 1 + .../datastats/impl/DataStatsServiceImpl.java | 27 ++++++++----------- .../StatsStaffPatrolRecordDailyDao.xml | 3 ++- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java index 9eebe98854..0a35355dd6 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java @@ -19,6 +19,7 @@ public class WorkFactResultDTO implements Serializable { private Integer closedProjectTotal = 0; private Integer patrolTotal = 0; private String patrolTotalTime = "0"; + private Integer routineWorkCount = 0; private String orgId; private String orgName; diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDailySumResult.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDailySumResult.java index c7fbe6b7ef..af0c502590 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDailySumResult.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDailySumResult.java @@ -18,4 +18,5 @@ public class PatrolDailySumResult implements Serializable { private String orgId; private Integer patrolTotal; private Integer totalTime; + private Integer routineWorkCount; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 201f8a39b6..a8fb5ee168 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -3,12 +3,10 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; - import com.epmet.commons.tools.enums.OrgLevelEnum; - import com.epmet.commons.tools.exception.EpmetErrorCode; - import com.epmet.commons.tools.exception.EpmetException; - import com.epmet.commons.tools.exception.RenException; - import com.epmet.commons.tools.feign.ResultDataResolver; - import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.enums.OrgLevelEnum; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.dataaggre.constant.DataSourceConstant; @@ -26,22 +24,18 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; - import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; - import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO; - import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity; - import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; - import com.epmet.dataaggre.excel.CustomerDataManageExcel; +import com.epmet.dataaggre.excel.CustomerDataManageExcel; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; - import com.epmet.dataaggre.service.govorg.GovOrgService; - import com.epmet.dataaggre.service.opercrm.CustomerRelation; - import com.epmet.dto.CustomerAgencyDTO; - import com.epmet.feign.GovOrgOpenFeignClient; - import com.github.pagehelper.PageHelper; +import com.epmet.dataaggre.service.govorg.GovOrgService; +import com.epmet.dataaggre.service.opercrm.CustomerRelation; +import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -1636,6 +1630,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve private void setPatrolAttr(WorkFactResultDTO resultDTO, PatrolDailySumResult patrolRecordDTO) { if (patrolRecordDTO != null){ + resultDTO.setRoutineWorkCount(patrolRecordDTO.getRoutineWorkCount()); resultDTO.setPatrolTotal(patrolRecordDTO.getPatrolTotal()); Integer totalTime = patrolRecordDTO.getTotalTime(); if (totalTime != null || totalTime > 0){ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml index 2d0845dbf0..86aae4d681 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml @@ -6,7 +6,8 @@ SELECT #{orgId} orgId, sum(patrol_total) patrolTotal, - sum(TOTAL_TIME) totalTime + sum(TOTAL_TIME) totalTime, + sum(ROUTINE_WORK_COUNT) routineWorkCount FROM stats_staff_patrol_record_daily WHERE del_flag = '0' AND date_id =]]> #{startDateId} From eff7e69530a68441fc7ad2f91b0ac8aee82472f7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 11 Jan 2022 16:37:12 +0800 Subject: [PATCH 143/149] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=95=B0=E5=AD=97=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 80d6e22a65..9d22fdfb8c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.91 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.92 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index e0e8f56297..c66ced640a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.91 + 0.3.92 data-aggregator com.epmet From 62e2d911bd4b5196ca02e422e44fee4012989caf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Jan 2022 10:10:39 +0800 Subject: [PATCH 144/149] =?UTF-8?q?org=EF=BC=8Cuser=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index c01bb9fd7e..25ea20b467 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.155 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.156 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 892e3b3d77..9bd6cedb44 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.155 + 0.3.156 com.epmet gov-org diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 05deec2fc1..9eae5a851f 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.217 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.218 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index a4cf5c6bbf..8d021ca7a8 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.217 + 0.3.218 com.epmet epmet-user From e30be3252a58681f0dec807faf5382bd36adad84 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 12 Jan 2022 14:23:52 +0800 Subject: [PATCH 145/149] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=80=97=E6=97=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ProjectSendMessageService.java | 10 ++++- .../impl/ProjectSendMessageServiceImpl.java | 18 ++++++++ .../epmet/task/ProjectWorkMinutesTask.java | 43 +++++++++++++++++++ .../feign/GovProjectOpenFeignClient.java | 11 +++++ .../GovProjectOpenFeignClientFallback.java | 15 ++++++- .../epmet/controller/ProjectController.java | 2 +- .../service/impl/ProjectServiceImpl.java | 1 + 7 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ProjectWorkMinutesTask.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/ProjectSendMessageService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/ProjectSendMessageService.java index e005ed2543..6b8372cb76 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/ProjectSendMessageService.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/ProjectSendMessageService.java @@ -1,7 +1,6 @@ package com.epmet.service; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.ProjectDTO; import com.epmet.dto.extract.form.ExtractOriginFormDTO; /** @@ -18,4 +17,13 @@ public interface ProjectSendMessageService { * @return com.epmet.commons.tools.utils.Result */ Result projectSendMessage(ExtractOriginFormDTO formDTO); + + /** + * 项目耗时 + * @Param formDTO + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/1/12 14:04 + */ + Result projectWorkMinutes(ExtractOriginFormDTO formDTO); } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ProjectSendMessageServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ProjectSendMessageServiceImpl.java index 78418a8173..1e74d82d1f 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ProjectSendMessageServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ProjectSendMessageServiceImpl.java @@ -32,4 +32,22 @@ public class ProjectSendMessageServiceImpl implements ProjectSendMessageService projectDTO.setCustomerId(formDTO.getCustomerId()); return govProjectOpenFeignClient.sendMessageJob(projectDTO); } + + /** + * 项目耗时 + * + * @param formDTO + * @Param formDTO + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/1/12 14:04 + */ + @Override + public Result projectWorkMinutes(ExtractOriginFormDTO formDTO) { + ProjectDTO projectDTO = new ProjectDTO(); + projectDTO.setCustomerId(formDTO.getCustomerId()); + projectDTO.setId(formDTO.getObjectId()); + projectDTO.setStatus("pending"); + return govProjectOpenFeignClient.projectWorkMinutesJob(projectDTO); + } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ProjectWorkMinutesTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ProjectWorkMinutesTask.java new file mode 100644 index 0000000000..f5c230a648 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ProjectWorkMinutesTask.java @@ -0,0 +1,43 @@ +package com.epmet.task; + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.extract.form.ExtractOriginFormDTO; +import com.epmet.service.ProjectSendMessageService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/1/12 14:01 + */ +@Component("projectWorkMinutesTask") +@Slf4j +public class ProjectWorkMinutesTask implements ITask{ + @Autowired + private ProjectSendMessageService projectSendMessageService; + + /** + * 执行定时任务接口 + * + * @param params 参数，多参数使用JSON数据 + */ + @Override + public void run(String params) { + log.info("ProjectWorkMinutesTask定时任务正在执行，参数为：{}", params); + ExtractOriginFormDTO formDTO = new ExtractOriginFormDTO(); + if (StringUtils.isNotBlank(params)) { + formDTO = JSON.parseObject(params, ExtractOriginFormDTO.class); + } + Result result = projectSendMessageService.projectWorkMinutes(formDTO); + if (result.success()) { + log.info("ProjectSendMessageTask定时任务执行成功"); + } else { + log.error("ProjectSendMessageTask定时任务执行失败:" + result.getMsg()); + } + } + +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java index 7824ba71ee..e2fbb8a5c5 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java @@ -134,4 +134,15 @@ public interface GovProjectOpenFeignClient { */ @PostMapping("gov/project/resievent/queryResiEventManageRedDot/{agencyId}") Result queryResiEventManageRedDot(@PathVariable("agencyId") String agencyId); + + /** + * 计算项目耗时 + * + * @Param dto + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/1/12 13:56 + */ + @PostMapping("gov/project/project/project-work-minutes-job") + Result projectWorkMinutesJob(@RequestBody ProjectDTO dto); } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java index 41f41664c1..0843f26498 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java @@ -9,7 +9,6 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.feign.GovProjectOpenFeignClient; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; -import org.springframework.stereotype.Component; import java.util.List; @@ -132,4 +131,18 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli public Result queryResiEventManageRedDot(String agencyId) { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "queryResiEventManageRedDot", agencyId); } + + /** + * 计算项目耗时 + * + * @param dto + * @Param dto + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/1/12 13:56 + */ + @Override + public Result projectWorkMinutesJob(ProjectDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectWorkMinutesJob", dto); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index e83accbe06..077b06e22d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -320,7 +320,7 @@ public class ProjectController { * @Author zhaoqifeng * @Date 2022/1/11 17:52 */ - @PostMapping("project-Work-Minutes-Job") + @PostMapping("project-work-minutes-job") public Result projectWorkMinutesJob(@RequestBody ProjectDTO dto) { projectService.projectWorkMinutesJob(dto); return new Result(); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 357b7fc49c..b98dd0aeff 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -3078,6 +3078,7 @@ public class ProjectServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(dto.getCustomerId()), ProjectEntity::getCustomerId, dto.getCustomerId()); wrapper.eq(StringUtils.isNotBlank(dto.getId()), ProjectEntity::getId, dto.getId()); wrapper.eq(StringUtils.isNotBlank(dto.getStatus()), ProjectEntity::getStatus, dto.getStatus()); list = baseDao.selectList(wrapper); From 7fb8931d599c4aa4d97c1c85dfeafd4807cab7c1 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 12 Jan 2022 14:49:41 +0800 Subject: [PATCH 146/149] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml index 42e3c35a93..7a2eb84297 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.182 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.183 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 093a123478..0b24d1acb0 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.182 + 0.0.183 com.epmet diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index b1d20673fc..fb855657d2 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.95 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.96 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index e1873fe22e..69e7500932 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.95 + 0.3.96 gov-project com.epmet From 409c43269f477360f3f919c9b5815f77016070c1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 12 Jan 2022 17:10:07 +0800 Subject: [PATCH 147/149] =?UTF-8?q?=E6=9C=BA=E5=85=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=97=A5=E7=BB=9F=E8=AE=A1=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/entity/project/ProjectEntity.java | 3 + .../service/impl/StatsProjectServiceImpl.java | 241 +++++++++++++++++- 2 files changed, 241 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java index 20a32c24a6..8244100898 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java @@ -95,4 +95,7 @@ public class ProjectEntity extends BaseEpmetEntity { * */ private String locateDimension; + private Integer pageNo = 1; + private Integer pageSize = 20; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 3b1d1c45c8..4cbe3fd140 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.ProjectConstant; @@ -112,6 +113,8 @@ public class StatsProjectServiceImpl implements StatsProjectService { dimAgencyDTO.setCustomerId(customerId); List dimAgencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO); + /* + //2022.1.12 客户数据量大 调整计算逻辑，一千条已查询，封装数据,将这部分业务数据查询拿到子方法分页查询处理 sun //3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据) ProjectEntity projectEntity = new ProjectEntity(); projectEntity.setCustomerId(customerId); @@ -133,13 +136,14 @@ public class StatsProjectServiceImpl implements StatsProjectService { //4-3.遍历删除项目节点表查询的无效数据 processList.removeIf(next -> map.containsKey(next.getProjectId())); } - //20210721 sun end + //20210721 sun end */ //5:机关层级日月统计 if (null != dimAgencyList && dimAgencyList.size() > NumConstant.ZERO) { //5.1:执行机关日数据统计 try { - agencyDateProjectStats(customerId, dimId, date, dimAgencyList, projectList, processList); + //agencyDateProjectStats(customerId, dimId, date, dimAgencyList, projectList, processList); + agencyDateProjectStats(customerId, dimId, date, dimAgencyList); } catch (Exception e) { log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "agencyDateProjectStats", customerId, dimId.getDateId()), e); } @@ -159,7 +163,238 @@ public class StatsProjectServiceImpl implements StatsProjectService { * @Author sun * @Description 数据-项目-机关日统计 **/ - private String agencyDateProjectStats(String customerId, DimIdGenerator.DimIdBean dimId, Date date, List dimAgencyList, List projectList, List processList) { + private String agencyDateProjectStats(String customerId, DimIdGenerator.DimIdBean dimId, Date date, List dimAgencyList) { + //机关日统计数据【agencyId->FactAgencyProjectDailyEntity】 + Map mapList = new HashMap<>(); + //计算百分比使用，保留小数点后两位 + NumberFormat numberFormat = NumberFormat.getInstance(); + numberFormat.setMaximumFractionDigits(6); + //存放已结案项目Id，用于统计已结案中已解决、未解决数 + Map closeMap = new HashMap<>(); + //存放前一日已结案项目Id，用于统计日增量中已结案项目的已解决、未解决数量 + Map closeDateMap = new HashMap<>(); + + //20210721 sun 业务逻辑调整，网格删除，组织没有删除情况，相应的组织层级数据统计应舍弃以删除网格数据 start + //处理逻辑：查询已删除网格下项目Id，将已查询的项目、节点数据中的脏数据剔除【项目库有张表有网格Id，可以查出每个项目所属网格，但是关联该表后sql查询效率极低固舍弃此方案】 + //4-1.查询客户下已删除网格列表下存在的项目Id集合 + List list = customerGridService.getdelGridProjectIdList(customerId); + //20210721 sun end + + //一、先分页查询节点数据，封装每个组织的项目总数、已结案总数;日增量中项目总数、已结案总数 + ProjectEntity projectEntity = new ProjectEntity(); + projectEntity.setCustomerId(customerId); + projectEntity.setCreatedTime(date); + projectEntity.setStatus(ProjectConstant.CLOSED); + projectEntity.setPageSize(NumConstant.ONE_THOUSAND); + int pageNo = NumConstant.ONE; + List processList = new ArrayList<>(); + do { + //1.一千条一循环查询节点数据，封装每个组织对应数据 + projectEntity.setPageNo(pageNo); + processList = projectProcessService.getProcessList(projectEntity); + pageNo++; + //遍历删除项目节点表查询的无效数据 + if (list.size() > NumConstant.ZERO) { + Map map = list.stream().collect(Collectors.toMap(String::toString, v -> v, (c1, c2) -> c1)); + processList.removeIf(next -> map.containsKey(next.getProjectId())); + } + //2:遍历机关维度数据,统计每个机关各项指标数 + for (DimAgencyDTO agency : dimAgencyList) { + //2-1:存放当前机关及所有下级机关Id + Map map = new HashMap<>(); + map.put(agency.getId(), agency.getId()); + String subPids = ((null == agency.getPids() || "".equals(agency.getPids())) ? agency.getId() : agency.getPids() + ":" + agency.getId()); + dimAgencyList.forEach(sub -> { + if (sub.getPids().contains(subPids)) { + map.put(sub.getId(), sub.getId()); + } + }); + //机关下截止当前日期的项目总数、已结案总数、已结案已解决总数、已结案未解决总数 + AtomicInteger projectTotal = new AtomicInteger(0); + AtomicInteger closedTotal = new AtomicInteger(0); + //日增量中项目总数、已结案总数、已结案已解决总数、已结案未解决总数 + AtomicInteger projectIncr = new AtomicInteger(0); + AtomicInteger closedIncr = new AtomicInteger(0); + //2-2:遍历进展数据，统计截止当日的项目总量、处理中总量、已结案总量以及日增量中的项目总量、处理中总量、已结案总量 + processList.forEach(process -> { + //当前机关及下级 + if (map.containsKey(process.getAgencyId())) { + //进展表中是创建项目状态的数据总数即为客户该机关下项目总数 + if (ProjectConstant.CREATED.equals(process.getOperation())) { + projectTotal.addAndGet(1); + if (date.equals(process.getCreatedTime())) { + //日增量总数 + projectIncr.addAndGet(1); + } + } + if (ProjectConstant.CLOSE.equals(process.getOperation())) { + //截止当前日期的结案总数 + closedTotal.addAndGet(1); + closeMap.put(process.getProjectId(), process.getProjectId()); + if (date.equals(process.getCreatedTime())) { + //日增量已结案总数 + closedIncr.addAndGet(1); + closeDateMap.put(process.getProjectId(), process.getProjectId()); + } + } + } + }); + + //2-3:封装机关日数据对象 + FactAgencyProjectDailyEntity entity = new FactAgencyProjectDailyEntity(); + if (mapList.containsKey(agency.getId())) { + entity = mapList.get(agency.getId()); + entity.setProjectTotal(entity.getProjectTotal() + projectTotal.intValue()); + entity.setPendingTotal(entity.getPendingTotal() + projectTotal.intValue() - closedTotal.intValue()); + entity.setClosedTotal(entity.getClosedTotal() + closedTotal.intValue()); + if (projectTotal.intValue() > NumConstant.ZERO) { + entity.setPendingRatio(new BigDecimal(numberFormat.format((float) entity.getPendingTotal() / (float) projectTotal.intValue()))); + entity.setClosedRatio(new BigDecimal(numberFormat.format((float) closedTotal.intValue() / (float) projectTotal.intValue()))); + } + entity.setProjectIncr(entity.getProjectIncr() + projectIncr.intValue()); + entity.setPendingIncr(entity.getPendingIncr() + projectIncr.intValue()); + entity.setClosedIncr(entity.getClosedIncr() + closedIncr.intValue()); + } else { + entity.setCustomerId(customerId); + entity.setAgencyId(agency.getId()); + entity.setParentId(agency.getPid()); + entity.setDateId(dimId.getDateId()); + entity.setWeekId(dimId.getWeekId()); + entity.setMonthId(dimId.getMonthId()); + entity.setQuarterId(dimId.getQuarterId()); + entity.setYearId(dimId.getYearId()); + entity.setProjectTotal(projectTotal.intValue()); + entity.setPendingTotal(projectTotal.intValue() - closedTotal.intValue()); + entity.setClosedTotal(closedTotal.intValue()); + if (projectTotal.intValue() > NumConstant.ZERO) { + entity.setPendingRatio(new BigDecimal(numberFormat.format((float) entity.getPendingTotal() / (float) projectTotal.intValue()))); + entity.setClosedRatio(new BigDecimal(numberFormat.format((float) closedTotal.intValue() / (float) projectTotal.intValue()))); + } + entity.setProjectIncr(projectIncr.intValue()); + entity.setPendingIncr(projectIncr.intValue()); + entity.setClosedIncr(closedIncr.intValue()); + } + mapList.put(agency.getId(), entity); + } + } while (!CollectionUtil.isEmpty(processList) && processList.size() == NumConstant.ONE_THOUSAND); + + //二、再分页查询项目表数据，封装每个组织的已结案已解决总数、已结案未解决总数;日增量中已结案已解决总数、已结案未解决总数 + int num = NumConstant.ONE; + List projectList = new ArrayList<>(); + do { + //3.一千条一循环查询项目数据，封装每个组织对应数据 + projectEntity.setPageNo(num); + projectList = projectService.getProjectList(projectEntity); + num++; + //遍历删除项目主表查询的无效数据 + if (list.size() > NumConstant.ZERO) { + Map map = list.stream().collect(Collectors.toMap(String::toString, v -> v, (c1, c2) -> c1)); + projectList.removeIf(next -> map.containsKey(next.getId())); + } + + //4.遍历机关维度数据,统计每个机关各项指标数 + for (DimAgencyDTO agency : dimAgencyList) { + //4-1:存放当前机关及所有下级机关Id + Map map = new HashMap<>(); + map.put(agency.getId(), agency.getId()); + String subPids = ((null == agency.getPids() || "".equals(agency.getPids())) ? agency.getId() : agency.getPids() + ":" + agency.getId()); + dimAgencyList.forEach(sub -> { + if (sub.getPids().contains(subPids)) { + map.put(sub.getId(), sub.getId()); + } + }); + //机关下截止当前日期的已结案已解决总数、已结案未解决总数 + AtomicInteger resolvedTotal = new AtomicInteger(0); + AtomicInteger unResolvedTotal = new AtomicInteger(0); + //日增量中项目已结案已解决总数、已结案未解决总数 + AtomicInteger resolvedIncr = new AtomicInteger(0); + AtomicInteger unResolvedIncr = new AtomicInteger(0); + //4-2:遍历项目业务数据，统计截止当日的已结案已解决总量、已结案未解决总量以及日增量中的已结案已解决总量、已结案未解决总量 + projectList.forEach(project -> { + //当前机关及下级 + if (map.containsKey(project.getAgencyId())) { + if (closeMap.containsKey(project.getId())) { + //已结案已解决 + if (ProjectConstant.RESOLVED.equals(project.getClosedStatus())) { + //截止当日的已结案已解决总量 + resolvedTotal.addAndGet(1); + if (closeDateMap.containsKey(project.getId())) { + //日增量中的已结案已解决总量 + resolvedIncr.addAndGet(1); + } + } + //已结案未解决 + if (ProjectConstant.UNRESOLVED.equals(project.getClosedStatus())) { + //截止当日的已结案未解决总量 + unResolvedTotal.addAndGet(1); + if (closeDateMap.containsKey(project.getId())) { + //日增量中的已结案未解决总量 + unResolvedIncr.addAndGet(1); + } + } + } + } + }); + + //1.4:封装机关日数据对象 + FactAgencyProjectDailyEntity entity = new FactAgencyProjectDailyEntity(); + if (mapList.containsKey(agency.getId())) { + entity = mapList.get(agency.getId()); + entity.setResolvedTotal(entity.getResolvedTotal() + resolvedTotal.intValue()); + entity.setUnresolvedTotal(entity.getUnresolvedTotal() + unResolvedTotal.intValue()); + if (entity.getClosedTotal() > NumConstant.ZERO) { + entity.setResolvedRatio(new BigDecimal(numberFormat.format((float) resolvedTotal.intValue() / (float) entity.getClosedTotal()))); + entity.setUnresolvedRatio(new BigDecimal(numberFormat.format((float) unResolvedTotal.intValue() / (float) entity.getClosedTotal()))); + } + entity.setResolvedIncr(entity.getResolvedIncr() + resolvedIncr.intValue()); + entity.setUnresolvedIncr(entity.getUnresolvedIncr() + unResolvedIncr.intValue()); + + + } else { + entity.setCustomerId(customerId); + entity.setAgencyId(agency.getId()); + entity.setParentId(agency.getPid()); + entity.setDateId(dimId.getDateId()); + entity.setWeekId(dimId.getWeekId()); + entity.setMonthId(dimId.getMonthId()); + entity.setQuarterId(dimId.getQuarterId()); + entity.setYearId(dimId.getYearId()); + entity.setResolvedTotal(resolvedTotal.intValue()); + entity.setUnresolvedTotal(unResolvedTotal.intValue()); + if (entity.getClosedTotal() > NumConstant.ZERO) { + entity.setResolvedRatio(new BigDecimal(numberFormat.format((float) resolvedTotal.intValue() / (float) entity.getClosedTotal()))); + entity.setUnresolvedRatio(new BigDecimal(numberFormat.format((float) unResolvedTotal.intValue() / (float) entity.getClosedTotal()))); + } + entity.setResolvedIncr(resolvedIncr.intValue()); + entity.setUnresolvedIncr(unResolvedIncr.intValue()); + + } + mapList.put(agency.getId(), entity); + } + } while (!CollectionUtil.isEmpty(projectList) && projectList.size() == NumConstant.ONE_THOUSAND); + + List projectDateEntityList = new ArrayList<>(mapList.values()); + //2:批量保存数据，先删后增 + if (null != projectDateEntityList && projectDateEntityList.size() > NumConstant.ZERO) { + //2.1:根据客户Id、日维度Id批量物理删除一下可能存在的历史数据 + FactAgencyProjectDailyEntity delEntity = new FactAgencyProjectDailyEntity(); + delEntity.setCustomerId(customerId); + delEntity.setDateId(dimId.getDateId()); + log.info("StatsProjectServiceImpl.agencyDateProjectStats-根据客户Id、日维度Id批量删除机关项目日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId()); + factAgencyProjectDailyService.delDateProject(delEntity); + + //2.2:批量保存机关日统计数据 + log.info("StatsProjectServiceImpl.agencyDateProjectStats-批量新增机关项目日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId()); + factAgencyProjectDailyService.insertBatch(projectDateEntityList); + } + + return null; + } + + /** + * 不考虑大数据量问题的方法【暂留】sun + */ + private String agencyDateProjectStats_old(String customerId, DimIdGenerator.DimIdBean dimId, Date date, List dimAgencyList, List projectList, List processList) { //批量机关日统计新增对象 List projectDateEntityList = new ArrayList<>(); //计算百分比使用，保留小数点后两位 From 79516f3c1d99d5661303af46743ba1b2602d62b2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 12 Jan 2022 17:23:07 +0800 Subject: [PATCH 148/149] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/excel/data_template.xlsx | Bin 12070 -> 12192 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/data_template.xlsx b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/data_template.xlsx index af7104be3259cf76061860da0220c35eb9b5f781..1e868d2c929b34378f899a50c987eee5abc0ff50 100644 GIT binary patch delta 7787 zcmZ8mWl)^UwuQmn3C`ed!QB$v-7UBb8XN|9AKV>6aDux8cMTBSEd+OXIp@6hZr$_! z==!Q_?e41Ht5?_FtJEmpxONK~>|`IvDg_M%We9+R!h(W=GI#u>;^OG!%J#|8#e&t- z!QL;)SiYYf_xlE1x8#UVR`DlLauZC7a0EUVqvQq0UG`J^ zfl(4$Tzwq6iD8LmptXbwY?Phq7l*+0#WBw~%7YB-%0*;kH$XW4-kIVgSaGm1^xao9 z9pk`gfNX0_7T~OdmvAudTUgX=L!o?47iSEGdV$!xtFt7sGo(M2L>xA zF$hDZq4_fcCW#~(cCtr0E$*AAu+Gt|{b6#Vy4I_CpVC3gr>4zLzLxlEq8PWSiL ztV{LhI&c3otyrdo^(Yuduxl?TDA3Dcj3`;;kR)F2?7?>bnbE*oJ+MVIMS11ymU*Z< zrRTWtP7G5O5ppxbHu|)?<=pwfLQahc;-ye}!ZkrV7n3mM{#z4FT+KFob^jJ=qhPHt z$DLyVEszr%@lI@cuj>_ak5@$=1{U|v0V6_%D{YJY?hIe0{d4RP0~k8+h+ig`VYB5o z(ihkZiQd+yq*DC?S-B*o@cWI4boGwkQfwIKTU%aJvOG0r*Kr0};v=}QBJgBs3ZH|2 zmTh{i_7HduHr3ln(|92({R~ia_kjr6ayvU9fP}&mXyFj-%D5%MNL#F9&&`gKjBIA~ zc#nnE{6yJ}7Y*<;bngAtZKBuj!_}iLcrMiZkWd~)*+(eS{{m4luX&Y{b zrmC(cRvhq)4H66qZbFzFoO28ZgUs@Dhd;u)n-Ogfq{?aGd^G11>6v%7QOv?}1*6^U zuA;(@ZKCu?rOU!N7zG=nZAv5RLmyso?Qrl)h<4Uf8G?3wRt5{nzUisE!CL|qA0_+s z7xKq3_QLMg{Hp?1$8iy;1R_WitT+-UlG4ifABrX?!Lfj|Jo;UxsoC}N;erasG7{;t z*l8-LE$F}-gtL}~G-9lJVUFurp(G$s9urn}`mDhsp=@6|Y~`dy?}?w3|J%wMvur+E z6$+#I#QV!WuGTgG*KhptpXU(<6`)WXCx?5}ElEELh}K3OtMF8YrKnXz5#4J($?!(a z^a*HE%I$zX$uyIf1~@7gr1{KsFSCV*JF0XXNFvRGh$4*1J&S7Wr@n{ZBY&JqIN{Fa zr4VVsn@UqaxX={RRvViQX|1Gux57TA`R#aDcMqm8(M(f=bafv-f>`EPBnrsLzRkS7 zj>cDG#$DZs9_E%+rE+{Y&D^h<(xf>;G&|=e>l_N~b4$I4^{xw#FfuV3DfQD00J#RI z-AV$8_3b6^Kp}zive>b^1|Yb4D2<0(SzN__r}n%T%5QE?$T~}%p_n?yFJiTe{J=0} zOt?XgYTx07NUYc-^*htgijKC2e7rnM9-8tuDr1~aGAy27(|H3=)0-xQWT0GDEFc7a?F3b;8owBg)SLH>9WKQX#s$9e1 zc`hC0RZpCpeESDD=Wzdso;EYl!K!9WVLBP`OuhjJ*rb^z1)FW9h% z-NrN0(C_5{y>?{T?g^>{kH;8SpB9dp704m4H|(WSnRXGj^_lFozA)hEZUv3lW1e+K zDRV5}#RD0g5iZZgLd2nck(8g{z4yAunXwY+QE>~zMbrwiBVjcWWZ>=i8J`#{e5pL!b6S^&(DJL&A8}Jn0ziQJ zEXD_Nu!`k_efDd6!T4`A0DL&-poD>fl0$?*!x2KjtZ?8ItyR!AJEotp%^Ss~k87wC zR)KB7H>NYW1*1I0?SN1mD+idpa}Rq+atPvQ<5P3r$?^Mfc2oB^E%pPkkm3#nmCeUt z3X4%rJrMTw$-yxwhUAM=hUuVuQa(=Nq5tc{-0ARlB@mJ-x+lFwP?Mad`V{0S6<4RN zgOVnD*8q&G)BE*@XFWEoRhR}l+x5#2CU%y@8+JVMi{7j3QuC2HKXEyW9K^obpy$0* zt@_*BRKHd3`NK0)zSN$R9jzv?>EE*p|-il0lmOMWI;!+Aw3|>ZU+9*Xe;Th8;m}g z3K{rDskrK`%&Q!De`rXJA928Kg!)Geb8!OsX;)N--%A4l(ukYfSgd&`)=cU*+FRz- zLq4VW*)IhdE40?9aeY7nsU7jkC5j4)jfacS=?N`y%Q_Upp}VM=BwreYzD;&<(^Ys8 z9CNUXEPrrMtpMDDVoWxmdl_XV-*i)|m;O@vf;!}LNVXdr9@`{8+@k~20Qnb9k^bi?7g8kq@}ZzqBA#XX`=XcM(jt5q)uGZ7xeMSJ0|DE3q%9Md^U`^nxbGMjM)b$PJB5JgS48Ui9u~End<`#hM!e~m76JwXllYk3J0TY zXzbM?U^i1llgX6*7$cLBek}WISm35Umca;a^eH+t^!^%=6V((sC7H>T-t3*d!d5_5 zmXG3VX~Phy!d4cAnC>cQH{kPKJDCAscydywfmz4FsUyI!k>)KRF~_}Vc`Dg`{N*P} zk67jJFyDSNm_QOKm;A?Hi15L+V(N=s^hO!vE166L5&O<4f;D>jqYe_f=j=fU-sKhFdh{_l&Vfx1KUWHo5hYr_>`0ymEHmG&;i(GTN1VzTmZd~BV&@82p1Pu&hIo_-wd?7UB< z;i}aE0vng9P}5*4#UnyQ26b-1=s3-Yhj$SNPw0Lp70;D2@cecmy7CukR;4nB<5^Os zd~sGqkuPyJWtZw?c>(9h!G^pSwPWU=U~4u7NyIiSB#Pt-&1mPHWlO|{?rCV673F0| zjMlvEbHX?sg|f22f{Mfr=3d*lD*@iFZad@7!Wq(3Y=?;YE6Khlagi?jE$-_>MnW$? ztli%CHFEZme1Lf2BB(!oPY)A$;c?QAMB}t?)VP$Xolw#6Auv@`XY#F8%i;)P zSfm%O+_pXc?aro2bu{Zi!w z*}Qwlr^&r4+lx`^ei(r`Jj3fn&O+9IA4|gj3X#@c@!3f23 z>kc`X@&0coIxh(SE##-93Wlu^a&#^*7xI^t531TLDHXPCQ>>`HQN5K8NwW4#-bj)DBBE*C)qBll5*=}iS0K_ zY+oS>2$}$E3@qD}B()PuLRdzog2K^vX!GR^A(iEWML!WL62)9kG%ifA!y59zg_X4E zrVOIN6j4DIwRpPv;#H&(uu9yQ+B9|=;kTJ!WVW>HkXCnJR(eoQ=}>eMR(F(z8ojEu zD30c4d2B-m8VJElYZ>uSu8xrr!@)JU2aWcwk8jSA$FSaL8Czt;q;r%owfA}wqEfso zq6hjEr-mQCP4y@+1AfZnl^zBAJ>>FY9Td+$u8Ta7;JiLOuvr|5RdnK zSSvWUPs=M#lN8sl<_&r?ZDm!j|9t?V&m4?4w_Id6Qpo*&g!Q9q-t)v#Wc~e&?WFBJ zy7Xqb!iYJ&3&b%u#3CshZp+SmR|#$>W3*%suuAML01m(v;PdIWhBKE1aRm?qyu zsP{c+iW65#Zzy)|4TtN%vfl_Y?FVUPxww{%I5MtjVG8%LBtbawnx078Lo$Dr)*&&naDX9;BsdO-X)V1i7(cdC zhfQMV!}1ii@n_-<=^Y6ZKo}}nLfqV0C1$+%+p5kROafU00TvZJoUHeAtP4c!9TC_e zepLtWHEsZ0YtS2x#~Dd_@O^D0nU*s(0sos?bO>zuDD`9v%@7$$S*C7?#$jsU$Bz<* z^p#p>%L^(Z)6n<>T4PO5R+(H^HgAA~uKUOJU4dJLodM1V_Q)OADgG(1U#$mSeEPg` z@YOC$=wWf^+?oyzm5fbGH$HLA8yetl@al?n`6&CTXJ_1rkGr~XQ}}W0Sq<31j)1KF zwhCqy9nZRtm}eoFU8uu|5v?8JHlOq7HHHI5*U?jNK2G0|NjH}e>Zy`rL--$&AtM@y*RMNK{c_fQB z*>0oFy{bc(bwhPM+4rd^_WK4zi)Xl-nAeGFqpPUAWLRXKKsbv7g(VTpkY4u#(P0r0 z89LQlvH*Qf`JHuh(liK`#ZI6L_>DD4yKrW0{rJg<#Jm$#RZ6?5IqaO?Ly+~ivZRTJ z-x5YLrZueUpmxV(53NVclt1|D@`1{CNt})V@DyS4U2KW{?l1>t=nBTI?t>e(9rEp6 zW`%_=?}^~v`y?67@bk9p_s5GB*XF@&MWR%&b<`TTJ@21&wbr4eX6h5#EEwf4s-cgG zoEY`1B;L>Gy!;8w|g)rZEQD zX~OE|CgOZ^7MmT`WWJV=+RbP#f8T(%mfxgcA-ir!|7KOZ3rGsk){CRgz#vBD``xTS z{mwI-Ky8Z6zJ;x(4u#qEaB!~=lM!d=v#z+_mwY|AYI{dg_r7U#Aruk%>zA_~$#M-L z`UF)z`Q5JM_PgN8y3!r+&qPI&!*(SM-MWqalcI`>5cGZ){drqoqm8iS87$LUH0q3w(`^G_9nZkC_5%1b3VDM5~1zu8lGae z#{pH_##eQ@waP;6$s;DB)O-oft7-&>YJ=r=J%ca)oJyJ}i{1D}t`@y|&ou`MHbj;n z_q$B?9a&lhySry_KEkRn@|w-eG^J2$Q|I2w3np!BU;{YdHT;z#Q{vI|5Mxtu>ge>z zXehL~M27M)p4v1Iu_+|e)-#~lZP-Q33ir_st2+c#SXH(j?a)J8ypC)srB%8vpDlX_ z=bK!B*|>2f?Ng05j76vW8pv(dF%5GMoSwb;fQFntv#$ph@TSNuq2y&t4BF@rBZ|7h z*7Z~9buqcio(V7=8Dx=YSPJJbBAY;_qDw@RQUX%NWDo3_Bx6hWD4C6*I)tvWS;50b zB1+v-e}v#I!t2?xA4|1@G;W9rJhavllL$rWx%m}nGH5j|MdrUy9$`*pxvLsmWKgVs z9g(w9GFt~v;o@PlsZ--W$b_R4M7A}ZtV>7^Vm#XOy;qQdmG%P_k)l)Q=jgjZL3M^| zYCoo;3h(ycY7Kq9?F>BY^{*ujQF?bq>#GuLYnas`b>CPAgQza%bIJXt5RqItaG#gD$9%n!XWmfj5G|Qpp zMHycDC=FM2H`E<6ES(M{*9|3x7D^w;wTHD7y%4-Bh5X=r)@cALLbo#rjdzE$XDdyt zRUHQpN-7@moseL(&X>PyP8JJ^si^ORPbY6gS=HpyIf}{;2`+#;V-iXZ&0*|$6%JMt z!%lh#VpL=fxvX-Z!KIDjiSiZaq=LfNMWXx6$3$_9k}ysv$jTk{K%`)hr+G*(pco1` z3W!08(W5y6TC1V-{v5||y3895;8#7HxJv@}p$8c}0AagKYKh8Mi&?3$XmPE=hB@9m>}voTjjw0uLxM5f&w zDCE%6NgQkT-TvW)hi`%`IJW6DUjR#Q375x(qn8~yQ0NBdH6r%?Dur0Su{fxWk46+M zt>&q(5J$T(m5_s9qF}m8xsf~)D}=dXRyh2Th{YOzZn&8LJygfGO4|K|M?K!ud7rT@ zjuHPcn<;PZS71mVYHjoioykWp!mgf8XFoBV+ZBxG9xsG?CJ*Y(?QmFD(?z?pJG!Ib z6H3%EXW}bpf}WgF%qesBF8V`?xl#eJ|E>MwuHj^QXW~xZmRBDXA3hh83KLjzS!K}J zSLEg3WrSR5P?XL?NS9$M=ZaGd)a@R?kHk|T zi^a(n@&a)Re38h>>+^Z`i# zzpt#{$^!cca8cqWenbH(3Cg<~{fXM6n1y9yB|`xLVy;rWN6*Dg84#TzomM)-j6~o( zi00})jK+WC*Vr@&Db6@rHZ}t12wP@;Jnr39qofoE@)(+vDj-m!Wp6xvAG1=fzYi4O7i5r9J%Nf?u{QBf5roP{rp1Vnb6nPMN z3hPH*raf@2k-|eYQpwycP6$kA4Q1s3jH5ecIF>S=t+|GXf5is>RH0Oy5mImM3gXe{ zQ?)V6?@XG3b)a{8@1&p}%p`oLo#|tKycjnKOV*x^#%wuzWUvt>+WQ=ERslYi6aNBA{mSB5o*9?6#5wXXf&kBOG!F9|<;j^JOX&%?6}J<&(b?{cbz-_%_! zM`HXH(1}__+_tI%1mt78@r>;%ej=EOgrSVXPgBy#N#25~JXYWSRa*)8M9f?LsqNVj zprHP0qmmFax@hk=fp5OsV>MVqnVt=$|X{EkOQL_p|=yF zt`?VR;eD1aL70hnkucNwYWZR|1Jb=Ig|{lL;s5}3peRlaMEwnLB7igl7RV#%ys~`W zKg-g!I103({w0}pNKjIOGLoDeAk(i)x;Hy(Yx(eO!5~gArfXsXJEw+)Z6hn}BSjHH z>&Z%K!=U`7k$&vMm?TaDbrWzq@w0taz@@Sv9nM%7Q2r8AZ7zYWR1Kvb$&H$Z%Rr2a z#ZWInBlNIBLUU*fsW|`%EKk#<{z;$gslJzt2REZ4ibR4^=l4y^PHWCi{MrlhP^9V5 zOs%O{tPu<@HA9mdOE3ew91Ye8W4L|u==$RGOQ+Xp6>uU>`();_L)ZE!1b379+de&S zq}I|4VaHu*g~jqct2PMU>Q4$AD=q%1AKZ#ZG9X0US~Dkb9MgVI--GojG#>Ct zA5Cxd)OBv7`u=m8UqwBYN5~IK>pLHhgZLklQ1h>y%g%Wp1!AfX_zo7gC>bi(dT%=| z@@I$zHb}V)P`9$9!6`Oi18w*ntnh0os~<4VDnIF*W8lhTW7TVvQ7x}k6&wum1%gaJ zY4%f)^*WFy8rLysdB`(XYdSY^*qa{eo|+Gu!2V6c7Sr~$2G`muw*uV+ zc4qx=xv+Hviu--1KOP|u(Pgi2|6TddYVjZy{4sR$|1cEeA9i{;y4aaHI@R390hcA$=fI}INu7ag*W?M}y<4xhWZ50abqnxV4_Fo7Nlj6_Y%D1!VA zZhNB^`W22%7dp|p+GSm6!qYNa%ZfMA93cizFZ3JFnK~fqM5f$dhIcWoY@fa^?n{Jh z6|mUH#HLJ`e`fUC^7^cIR(?P|MQo0IR<4y7DpJFo09i+odTOzX~{cpa8N(S1OgI0FFpq_L-L6S|4Yf4ma@!Y91d1$si>{xja;SXh0tYUQ>FL}dHD35Q4BQ>d#KKSvXwkX*2myL^grxCKYBcCrbRVZJlUOc#YQjZU@X;Q5{vywN>!{$XNp}?EqI0m{g+p8v@&dh=E zO`l`RmAB8WyVqr``d23+i@~IjUOtHLM8Y<`#5_@K29)4|-bEnCeR^~Y(ih_-5&!C2 z!M_rU{3mr#P~i`5&x&N`frdFq=uCV?w`)r1}h$b R3;pjP6gE8gI>x^?{2#sIUaJ5A delta 7734 zcmZ9RRa_j)`n7R)cZT3HI0M1m-QC?i_~0@)gG+D;?h-r%_n^TY5+GOtLGx$t{he?B z&gqN3=vvhmRZp+3^}a=B6{d~5uwY`2{7`9F7#I^c7#Lg_7#M3eD|JsdcP|brH%}XO zKNsi3G!3O8PJ*ay#6MEwfqAW)(o*YT6I7qW%w?{CbnlFs6cp3y*8BNgI@XG@MUUQl z^#}f-|GEb_HOC&&H9TZWLO~Pv0J5}=&l`1NxM`SEYK1QuN+czj&zE%eO@RHRx2qvmFv0J!K4e!eICl!Mk{(N9x5Kh5tmdOWAPFJDg4K0i14eevzK zB7Ldz)1?lE2}cPc5tJ5Vz4$g{)g>(>nI=HjL6ehpl~CcOIA+KHyQCkTpWwjZ2^{;* zCjX1IEYw<37#<>ecNoLe2dl0Gk3jIcyeKd+s(a%5ZW=)P*G0#GgPOzBgU5n%d5uhX z){;WP{fc)sf)y6(=IH1ZDy5z-Y)=R{dgdpG0{#59ywaxQDF!u2gzPguaRP8qhJE;} zg3$`wF(EXK^*Sa(j`W&-ctozvr!@zICkiC|DCokHUkRx4^Oi}BLU5Yf!jd!80$i+5 zpX_h-@16%_%J12tJhSmU!4db)1)25_p9ZnF9!_2$XS`zTUpH@g{Wsa}BMZejHs{JO z+aMFw5cx>^X+?sxMseps-Pq5ObK#kolc)SB6*t^b;%#5_`hoA>`*@#v1hmgs*HqU! zK>4}iYiy_p-%iI1Vxe03D?t2mb}lv%%qU(QS~^!ZM7AE&Hm6Lu$g!#vQIasuqtZ2A)VfV?tTG zJM#IZtt+QRoZQr=Cxwvi43W3n1pLw}sN^#j2!juhD#vfi3=q2&vb~Xs??{~i?Irh_{_)9 zK^Vo!0WxVf{fa00!M=9_Au}w1m}w0Emfmy=NU{dpOAc)bxuGNh_dTN`mLYMU@u646 z7%^ibJV7d8J&a(ut`}qRH>5OhxLhN^rnC%+WAQ!DeQ2)E`-R#m5;MtBU0K6ssX4)) zj&_|%MxpaT!sW-2CNyFP_qd;3-8efPV#(F0RA^X!BQY|~6IiU%x$WiyGNS>wE@O*gKBeShq02;{RlI}_|?BbwZeAzH9r4q%!!qzfZ= z?pLYuRo>um#OTkYC$tCnVrnhei_{_4oJ86val{H;(;_Speh{XPUK)~Hj@(_i83y*T zTb|%zhG{gw805jxUbt#~Jbg1lHIFm!@XK0!xnkgRw@?^6*z!9rChUf|2%NPG+Ehhu8S55XUT1p#pH{ks%XL(1v$)UBtIN#Dhz=e0f zJgdZVrgZm`NQ!U6W}}DPIrmH1pn`0~#3mPSl{yLsr-p<2(N#H8)c*cX!jt`hECJG` zFxE+SMvJNzdB7EC}@9KS-2nbS2PXYP6zM8InUDUKr zfd?I5cFvj#1AAU-Lt=M~E#U|-Ud#ntU91v$5uTnuzF_~iM<92IxZS+s-uVyi)F?<` zopIN7PMlui6ETz?xf&qHEBn5Gvwz}gTb8O4iKmm+4(-24X(gB>3jZky8RF-0Bf=!^ z;2^xi0ubW+$i5Myqgw1@((j!fYbeaiW4=nS@R8`MqM>al8auzfsT|fAvulH&qcW`0 zk@Yp?zX7P!~~0NyAl=-Pce$X*->l|4!+Z{6agjcKx=r)0e-X*WP=$!Lo}$F@0@ThETw9MPnx1 zfMbTGpPM(O7BX=h>=hABj`1VTqr%Lk)4HpXIVgS5Q-f1E;zI#r@zhur*uGBzWdgXz zA5kj!c&j}9KGF|FY!;soIYQ(>Prk^KvwDpvA9zEd}X;02BT$BPdKB<=IaF`BTB)}yiF_lOP82f16SO%9%j)X z9&V7a=ioe7z3H&>HeN#sn8R00u+rmzah?v9@f+KSk7Q3!Lu-|4zO#6N;K!!#orQ~~ zO@(EYhZ+y{0iK$py*kwQ^Sr+G(+~9zCuK>2HSd2r>^0ly_V~pJA1$Q4ju$@1yu+BT z-ruUOd=AI-$2Nv_maF|xF&RZ5hy6!jfgh9a29R61YTAXn<~o4_u7FjlQxDLWh03@O zh)$@b2$k9cDmrEDe3an;3QgJ8{%u*X=2ytl;ucw}~| z&l|f?`{zd#c0?reu^rfNo!yCqdt4`58;4^5`7Y4^`FSq)H+ytI4bWwY*T=Wt$s0gy zNF~_cybZdst<1b@Cujcm3cXbeNH%B66q9c@n0wZ@l zBl%EL=SE2;UuHe_h)|!Ct~|G!-ApnH3C96;$QH|*Plq|oc!D<-8YD^kU+pdXt=1$% zCKm87O)MHu8K``7gh>X$tiQ43aQt%SsyL)(A_dJfnddk|6vkZ^G&P&`I^L6&?oN@< zGGxgvM1Y!w9|_h%1$}t;7d=F3htykK{)c5IKJ zRz9D@!A&W3-1%y&J6#1rrgd8J=J>Ls-Q^O-(cN-EBalTB>Vt%RqUzP*BPsl_*BPX{8wz>vJ2@cf)P-nn@~9nmqNHdsVpmNG|t850M+YTZD8Ukemn z3|kjyE4bfEXpT-=$IMwci^tAZ*w+7#p~nS`CYMGf-L=%7L_u8sQg`~(OIvRqu9}14 zae6$N<~0&zqoFUvfGTRE22VUNR=p-Y-H<;Xpl*OlsMBX(B&$MWEyG83$gZA9;0b4}k*czJSxj3DBb!tD0L8)Nt%9EB~SDD;Y+rF2q$3Cx! zX*$Ml9X6} z+;;j%3qop=scA9xO>w9bb;Hz1az3}`Iq!Q>n)tyGH-AOR2t*2QEs^9s-%vjH_i3Xf z>o2pGdyH^MB767mV*1)lLNZOU5M8=V(Oz595_KqWJc*VuEaeYxL z8RwfXRuKLn)#-?-k~UwCs=5bI-^ddvaji9$QquzdbfDT?a5%#Kw%0x7h^Q&n%LnjK zzg3kt0=B>UELQZ9sUF~+Z)`?ZTsvq#>iMGl;v%vjyhv|Hn$H_qtZKsokSrBeU(6;p z9GBs$yeSbsVp>aF>``)N7uWDH@uJj&h7(o_30r>jTf1)TXwe^++86i~sul@cS|sqz zzTuT78Vn4J8Vn5PKS+Cd`#als{gnrojGf%pmq}kl&Hsd%HwH7=#`AA#P8zV~4TQQf zrC=~MV!{G7K(LUXOe~E?7-N~XTY}aDDZXDJaHocTUt@;XKU!dZWO(LDeFOe(b`m&4 zGbVvT3WxgsM`G|wBB41hhT-=R3TopzZKQ(Wjth+CA$a~! zw*ZU9cb30N&UKKGQ%}8-W2-LoFjQ)E9+HTw^2i4p-R}0ozM#fPY-oak0g5!+PetgA zKpmQmH49?xuJWL};~~zF=hFt&u|cPaj0=;lk~*g~;GxfWhnUIapZD$tv~DZ)77W|{ z|y5R zP*l(hhMKaBzutv&N;0xakA%}X+>C#fS+h2>dBYy1AN8w%*+I1?np9UNup7A4&iA|J zyh}Mxs|e$hGzo5pyhZqIV@#yHapP=H5Zfsz05~noKF{>@JZH>Xb#Bb$3hTZs!hD)3Tnv@Nj=3OKgF(-*E@;IF?F+AlY+D_YpyfIt0 zRM>CB>jO_D@lA$;HKTYeO`~`YhMvsJuRRi(J}FgMfvfm)*$T9HqZQ?*=jeDw`(9r1%7i&zGuE+7Dxj=ahGvAD;zHp=c^t%S!;bznOi9gk#vmVT<)yY^hf z@`>ge>ggBX-m1&p+$>907snclp_**%UCB0mBdGSSY+FVd%L-GybVx4=zZdPa;>OhA z6NC^~jT>xX*i9~LqW?o9ErW=1Gm`Nb#2?f_EcJ)dKk)HH1Pfc8pK9dwKo?Ped=?e9 zKV(5)F29XSUyDDOrmmEDca?_KrF4j~&)F4cCP7TUVP_ieGr%&{L$IjamhTVbvTX;N zmtsVvgSXEEhC~5!3Cf;nHDID#VFMqf8Y7+3Xs{EWd3308uJc~zy>ywc_t0+rg{DxN z;KUE&abpnlsOQu+P2N}ldUUv>3?vRuf55g7Fe2W)_FqatQ-#^)ojspbnojjsjbUq7hm><3TV*Qk|!{6lujV zL8}|?L2eu;-LSRD-5O^;bB>Y}L69Ii0omKRgj_+A!2E)KVOD(`FiOxN# zuufsKuDfCB!F}%?2UL4Wqng&^u9new!83i~Y4+t}I(SKwALx?l1ZwgXB}b)-7mE|^ z3?*B#_Afp?IiVaoHf=8chEJrDu<;jBT6z?t03r1kl zdkgT4D?wMR3##3HikBU11@f>@%2_TQrOCgiyJJRbqxj%kym0aJo@$zCyd8_zU@}}2# zM_?nec8pq08nZ)}?^q71n>lvR0w%7p&fLH8VWZGR|MvDq6fbV+S{dh_tI4Og=xSU zHF*jjY2-P14&Rw;xHgV+>K_ooE-S&Tn>dj!XMo9@KUS;qteuZ;Fft#6ozIb`CcL-C7+UcThs-MCG>O@cX}GZvG*zL&@Tp*|9WBb zcQ=i+;IiHK3q{%SwTTVn2HW>Aofuqa3I<$TU!Rz$=4=)p4@H>M!I?v+cqLRGlbS0M z`kpMW8@l(!sFJC~gdYz|$KAxV0L-y6JMu{igcmWnN0!zeVPWsxCBDvThdK016UPyy zQzhb4i1;saZhlB35%a$__r9RZKq;d@obsc?t7GexpqMBB<*!^H2QFmKUJsZ+960Do z88xnK`*Tq`4>has)WDuP*h3bm7*^aVftwE<7*pv1zRP_XE-Xw8xjDTO+g7tF@lD0u zEx26Z&Dn)}QTc?Z8Mbe^hYWjc3-8Y8{JF8EEJXpwJRlYqSq-B2ROo;uul5rM9^3bg zNhBtwSv{t zIq=e^tnFs-hi21822Ku`30Y;SHpKd4^&L6;Y6itY<;-F)cUQk>{%DQ+H5I0&AcHGQ zeSY3E_nIcK=yyQv1z{N`XReWXtKu}KMjqAw?uLe0FS2e(#5Q-UQFDj?adXNh8> zqK^k^Xb}<^6!vb`o>ajBzE4}fXK0xo_LE;E5FuPz8Q-%>VR-K^0~jJQp3tUvYvZI`Icdgv)yQeKBJkn?SQHgTIQd-XA8Gta{X_2A3ylv zn;%aWr2n{?1v6Bd6^IB2U+s27|7;2cUOGQL;!lVtFgc{*l`%z;$hk|&l{i(5FUsu@ zNO&>ljqmp-zFfX1p*_+LQi$MgY5qckCW~a+M?bs#=ZW%Dx*>ZeqkeFz{(I5_K=Puu z7Mq$5Gr59I`7g{h7zrO{?;NV4fY5Q_ylR3mFW3lIMX)isJA+I7GbzHafSYQ1fO#}3?~Txsoy894bUVs|pi|1ArcLHP$q>;z6!u|8m- zn{p&u2CQT=>Q;mtEr0(Gd!HZaG99~zb!g1#!^N5NQr@~yd(-kZPr zfkfZ}oo%NDb%GG$Cu+sZrHTn0Qio^&Gz@}GDY{+$&V_dz^KJ`5PY|T8m!nlVLkL#p zVOk#=W2w?v-xF)uC{ueR?lD+1bbVMDJqS8J5Zb<{!;EOt0=NcH898>gxi8EGm?(Z}1CM^~-@y2M#41o= zI2SOq@m)JSHw-N#AsQhuKh9Q)Su`D=*#+V)^Z*fBI^OB4eegsO-o7S{wj zJSM<%`Pp1Gc_smcl+5k&Hbp1z1$t-9T~82rCFork@As04tsO*OnUwNQT?ITvBL7hl zAWFNvkPc9mxkM;edj4shgvklq4nH!yfXB~Eem>zh^;}4D2{{`->#8aQdXnXv>}!)ILq^MiLl^lIE$vJCa1Oa0pRNNAVE+r+~4`hGkU;zsC0xm(P3V8WpsNkC3}&GyR?2TdlQ0>8=4{l zk1zWkQAy}>lQ!uSMS@02;5YAN^fT3ElVrgv!nIdY!BSYH%Ye|auNHo9I|cUm5^^@CjEW+ zzuY(;gpvsp^aj&E)?|0==LKCbiwOtxZ#0;5hF-k=we7WaF(X#5`p4XnFu^Q<4Y{}} zCC=RdYRRm;7zCagl9r+$dcXV|Lz`z6^#qXJ(6I1;kV4kt&0vQBm&63!WD$egp@&kj za>F7(HCUmDe>XUx-&h67|LwZLz~H}b=wBBs4B+)H3l(J(hs}qA**Ia@pp9%GI4wr# zH%1C50uYD%zrE+LN&lHv4dnnblK*d7{&yS*^#BUOJ>Wp=fPAnt(0w2S`Ts)oub34| z$1V)p3$Ae^-oRdU)47Rs5%xQw1u6J;@<|r|B7yr{}xfBAVOc*aVY*Sn7%>` j{(lv!f8R!p{a@;UU From 15216eccf6aa99562cc0dac26202443fc75c3f2e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 12 Jan 2022 17:26:48 +0800 Subject: [PATCH 149/149] =?UTF-8?q?=E6=9C=BA=E5=85=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=97=A5=E7=BB=9F=E8=AE=A1=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/StatsProjectServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 4cbe3fd140..0d62755e2c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -336,7 +336,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { } }); - //1.4:封装机关日数据对象 + //4-3.封装机关日数据对象 FactAgencyProjectDailyEntity entity = new FactAgencyProjectDailyEntity(); if (mapList.containsKey(agency.getId())) { entity = mapList.get(agency.getId()); @@ -374,16 +374,16 @@ public class StatsProjectServiceImpl implements StatsProjectService { } while (!CollectionUtil.isEmpty(projectList) && projectList.size() == NumConstant.ONE_THOUSAND); List projectDateEntityList = new ArrayList<>(mapList.values()); - //2:批量保存数据，先删后增 + //三、批量保存数据，先删后增 if (null != projectDateEntityList && projectDateEntityList.size() > NumConstant.ZERO) { - //2.1:根据客户Id、日维度Id批量物理删除一下可能存在的历史数据 + //5:根据客户Id、日维度Id批量物理删除一下可能存在的历史数据 FactAgencyProjectDailyEntity delEntity = new FactAgencyProjectDailyEntity(); delEntity.setCustomerId(customerId); delEntity.setDateId(dimId.getDateId()); log.info("StatsProjectServiceImpl.agencyDateProjectStats-根据客户Id、日维度Id批量删除机关项目日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId()); factAgencyProjectDailyService.delDateProject(delEntity); - //2.2:批量保存机关日统计数据 + //6:批量保存机关日统计数据 log.info("StatsProjectServiceImpl.agencyDateProjectStats-批量新增机关项目日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId()); factAgencyProjectDailyService.insertBatch(projectDateEntityList); }