Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

5 years ago · 3af7862a76
11 changed files with 11 additions and 9 deletions
--- a/epmet-auth/deploy/docker-compose-test.yml
+++ b/epmet-auth/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-auth-server:
    container_name: epmet-auth-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.29
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.30
    ports:
      - "8081:8081"
    network_mode: host # 使用现有网络
--- a/epmet-gateway/deploy/docker-compose-dev.yml
+++ b/epmet-gateway/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-gateway-server:
    container_name: epmet-gateway-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.18
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.19
    ports:
      - "8080:8080"
    network_mode: host # 使用现有网络
--- a/epmet-gateway/deploy/docker-compose-test.yml
+++ b/epmet-gateway/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-gateway-server:
    container_name: epmet-gateway-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.18
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.19
    ports:
      - "8080:8080"
    network_mode: host # 使用现有网络
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/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.18</version>
+    <version>0.3.19</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-cloud</artifactId>
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  data-report-server:
    container_name: data-report-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.17
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.19
    ports:
      - "8108:8108"
    network_mode: host # 使用现有网络
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  data-statistical-server:
    container_name: data-statistical-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.24
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.25
    ports:
      - "8108:8108"
    network_mode: host # 使用现有网络
--- 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-release/epmet-job-server:0.3.13
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.14
    ports:
      - "8084:8084"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-mine-server:
    container_name: gov-mine-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.30
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.31
    ports:
      - "8098:8098"
    network_mode: host # 使用现有网络
--- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-user-server:
    container_name: epmet-user-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.66
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.68
    ports:
      - "8087:8087"
    network_mode: host # 不会创建新的网络
--- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.2__addstaffpwd.sql
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.2__addstaffpwd.sql
@ -0,0 +1 @@
 alter table customer_staff add column PASSWORD varchar(25) COMMENT '登录密码';
--- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.2__addstaffpwdv2.sql
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.2__addstaffpwdv2.sql
@ -0,0 +1 @@
 alter table customer_staff modify column PASSWORD varchar(200) COMMENT '登录密码';
	`@ -0,0 +1 @@`
					`alter table customer_staff add column PASSWORD varchar(25) COMMENT '登录密码';`
	`@ -0,0 +1 @@`
					`alter table customer_staff modify column PASSWORD varchar(200) COMMENT '登录密码';`