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

5 years ago · 658096023b
13 changed files with 13 additions and 13 deletions
--- a/epmet-module/epmet-message/epmet-message-server/docker-compose.yml
+++ b/epmet-module/epmet-message/epmet-message-server/docker-compose.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-message-server:
    container_name: epmet-message-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:0.3.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:0.3.2
    ports:
      - "8085:8085"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.1</version>
+    <version>0.3.2</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-message</artifactId>
--- a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml
+++ b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-grid-server:
    container_name: gov-grid-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.3
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.4
    ports:
      - "8097:8097"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-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">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.3</version>
+    <version>0.3.4</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>gov-grid</artifactId>
--- a/epmet-module/gov-org/gov-org-server/docker-compose.yml
+++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-org-server:
    container_name: gov-org-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.7
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.9
    ports:
      - "8092:8092"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.7</version>
+    <version>0.3.9</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>gov-org</artifactId>
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql
@ -102,8 +102,8 @@ ALTER TABLE customer_grid  MODIFY COLUMN LATITUDE VARCHAR(32) DEFAULT NULL COMME
 ALTER TABLE customer_grid  MODIFY COLUMN AREA_CODE VARCHAR(32) DEFAULT NULL COMMENT '所属地区码（所属组织地区码）';
 alter table customer_grid drop column GRID_CODE;
 alter table customer_grid drop column SORT;
+alter table customer_grid drop column ORG_ID;

-alter table customer_grid add column ORG_ID varchar(64) NOT NULL COMMENT '所属组织机构ID（customer_organization.id）';
 alter table customer_grid add column MANAGE_DISTRICT varchar(255) DEFAULT "" NOT NULL COMMENT '管辖区域';
 alter table customer_grid add column TOTAL_USER INT(11) DEFAULT 0 NOT NULL COMMENT '当前网格总人数';
 ALTER TABLE customer_agency ADD (
--- a/epmet-module/resi-group/resi-group-server/docker-compose.yml
+++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-group-server:
    container_name: resi-group-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.2
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.3
    ports:
      - "8095:8095"
    network_mode: host # 使用现有网络
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.2</version>
+    <version>0.3.3</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>resi-group</artifactId>
--- a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-partymember-server:
    container_name: resi-partymember-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.2
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.3
    ports:
      - "8096:8096"
    network_mode: host # 使用现有网络
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.2</version>
+    <version>0.3.3</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>resi-partymember</artifactId>
--- a/epmet-user/epmet-user-server/docker-compose.yml
+++ b/epmet-user/epmet-user-server/docker-compose.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-user-server:
    container_name: epmet-user-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.5
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.7
    ports:
      - "8087:8087"
    network_mode: host # 不会创建新的网络
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.5</version>
+    <version>0.3.7</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-user</artifactId>