From 5e310f7595c9661518c3482bb2f551af01ad8e7f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Jun 2020 17:28:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/docker-compose-test.yml | 4 +-- .../deploy/docker-compose-test.yml | 4 +-- .../gov-issue/gov-issue-server/pom.xml | 2 +- .../db/migration/V0.0.2__partybranch.sql | 15 +++++++++ .../deploy/docker-compose-test.yml | 4 +-- .../gov-project/gov-project-server/pom.xml | 2 +- .../deploy/docker-compose-test.yml | 4 +-- .../deploy/docker-compose-test.yml | 2 +- .../db/migration/V0.0.2__partybranch.sql | 31 +++++++++++++++++++ 9 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml index 889491379c..08aedd497f 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.30 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.36 ports: - "8097:8097" network_mode: host # 使用现有网络 @@ -14,4 +14,4 @@ services: resources: limits: cpus: '0.1' - memory: 400M \ No newline at end of file + memory: 350M \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml index 7825e009a5..56d3dd745b 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.42 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.43 ports: - "8101:8101" network_mode: host # 使用现有网络 @@ -14,4 +14,4 @@ services: resources: limits: cpus: '0.1' - memory: 400M \ No newline at end of file + memory: 350M \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index e92c8aa434..2dd11868f2 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.42 + 0.3.43 gov-issue com.epmet diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql new file mode 100644 index 0000000000..673171b04e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql @@ -0,0 +1,15 @@ +CREATE TABLE `customer_party_branch` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `PARTY_BRANCH_NAME` varchar(20) NOT NULL COMMENT '支部名称', + `PROFILE` varchar(500) NOT NULL COMMENT '概要', + `GRID_ID` varchar(64) NOT NULL COMMENT '党支部所属网格id', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `TOTAL_PARTY_MEMBER` int(10) NOT NULL COMMENT '党员总数', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', + `REVISION` int(10) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党支部信息'; \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml index d55974b2db..16ec28dfbb 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.27 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.28 ports: - "8102:8102" network_mode: host # 使用现有网络 @@ -14,4 +14,4 @@ services: resources: limits: cpus: '0.1' - memory: 400M \ No newline at end of file + memory: 350M \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 6bec282580..382580cd85 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.27 + 0.3.28 gov-project com.epmet diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml index 36b6cb3e26..75870071a0 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.54 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.55 ports: - "8105:8105" network_mode: host # 使用现有网络 @@ -14,4 +14,4 @@ services: resources: limits: cpus: '0.1' - memory: 400M \ No newline at end of file + memory: 350M \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml index 01ea60963d..4eaf11b7e0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.44 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.50 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql new file mode 100644 index 0000000000..a91d0feea2 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql @@ -0,0 +1,31 @@ +CREATE TABLE `partymember_auth_record` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `PARTYMEMBER_BASE_INFO_ID` varchar(64) NOT NULL COMMENT 'partymember_base_info.id', + `USER_ID` varchar(64) NOT NULL COMMENT '认证居民id', + `AUTH_TIME` datetime NOT NULL COMMENT '认证时间(和partymember_info表时间一致)', + `GRID_ID` varchar(64) NOT NULL COMMENT '认证网格id', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '认证客户id', + `AUTH_DESC` varchar(255) NOT NULL COMMENT '认证的描述：账户于2020年10月30号在海泊桥社区-第一网格激活', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', + `REVISION` int(10) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党员认证记录表'; + + + +CREATE TABLE `party_branch_members` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `BRANCH_ID` varchar(64) NOT NULL COMMENT '党支部id，customer_party_branch.id', + `PARTYMEMBER_BASE_INFO_ID` varchar(64) NOT NULL COMMENT '党员库表主键,partymember_base_info.id', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', + `REVISION` int(10) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党支部党员关系表'; \ No newline at end of file From be61ba7a578e318bdd6a9073c773d88429686d91 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Jun 2020 18:50:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?govorg=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 --- .../gov-org-server/deploy/docker-compose-test.yml | 2 +- .../db/migration/V0.0.2__partybranch.sql | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml index 8df1c9c874..57f13f3fc7 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.66 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.67 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql deleted file mode 100644 index 673171b04e..0000000000 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql +++ /dev/null @@ -1,15 +0,0 @@ -CREATE TABLE `customer_party_branch` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `PARTY_BRANCH_NAME` varchar(20) NOT NULL COMMENT '支部名称', - `PROFILE` varchar(500) NOT NULL COMMENT '概要', - `GRID_ID` varchar(64) NOT NULL COMMENT '党支部所属网格id', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', - `TOTAL_PARTY_MEMBER` int(10) NOT NULL COMMENT '党员总数', - `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', - `REVISION` int(10) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党支部信息'; \ No newline at end of file