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

5 years ago · 2058018e5e
15 changed files with 15 additions and 15 deletions
--- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-job-server:
    container_name: epmet-job-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-job-server:0.3.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.1
    ports:
      - "8084:8084"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-grid-server:
    container_name: gov-grid-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.20
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.21
    ports:
      - "8097:8097"
    network_mode: host # 使用现有网络
--- 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.20
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.21
    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.20</version>
+    <version>0.3.21</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>gov-grid</artifactId>
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-issue-server:
    container_name: gov-issue-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.17
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.18
    ports:
      - "8101:8101"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-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">
-    <version>0.3.17</version>
+    <version>0.3.18</version>
    <parent>
        <artifactId>gov-issue</artifactId>
        <groupId>com.epmet</groupId>
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-org-server:
    container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.45
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.46
    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.45</version>
+    <version>0.3.46</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>gov-org</artifactId>
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  oper-crm-server:
    container_name: oper-crm-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.8
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.9
    ports:
      - "8090:8090"
    network_mode: host # 使用现有网络
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-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.8</version>
+    <version>0.3.9</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>oper-crm</artifactId>
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-partymember-server:
    container_name: resi-partymember-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.28
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.29
    ports:
      - "8096:8096"
    network_mode: host # 使用现有网络
--- 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.26
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.28
    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.28</version>
+    <version>0.3.29</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>resi-partymember</artifactId>
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-user-server:
    container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.29
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.30
    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.29</version>
+    <version>0.3.30</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-user</artifactId>