Merge branch 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins

Conflicts: epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml epmet-module/epmet-third/epmet-third-server/pom.xml epmet-module/resi-group/resi-group-server/pom.xml epmet-user/epmet-user-server/deploy/docker-compose-dev.yml epmet-user/epmet-user-server/pom.xml
5 years ago · 25e7f6ff77
25 changed files with 19 additions and 27 deletions
--- 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.66
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.68
    ports:
      - "8081:8081"
    network_mode: host # 使用现有网络
--- 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.26
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.30
    ports:
      - "8080:8080"
    network_mode: host # 使用现有网络
--- 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.5
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.9
    ports:
      - "8103:8103"
    network_mode: host # 使用现有网络
--- 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.22
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.25
    ports:
      - "8084:8084"
    network_mode: host # 使用现有网络
--- 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.25
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.28
    ports:
      - "8085:8085"
    network_mode: host # 使用现有网络
--- 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.22
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.25
    ports:
      - "8083:8083"
    network_mode: host # 使用现有网络
--- 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.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.40
    ports:
      - "8112:8112"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
@ -2,7 +2,6 @@ version: "3.7"
 services:
  epmet-third-server:
    container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.130
    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.131
    ports:
      - "8110:8110"
--- 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.75
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.131
    ports:
      - "8110:8110"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@ -2,7 +2,6 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.0.130</version>
    <version>0.0.131</version>

    <parent>
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-access-server:
    container_name: gov-access-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.37
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.38
    ports:
      - "8099:8099"
    network_mode: host # 使用现有网络
--- 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.81
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.83
    ports:
      - "8092:8092"
    network_mode: host # 使用现有网络
--- 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.39
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.40
    ports:
      - "8102:8102"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-voice-server:
    container_name: gov-voice-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.60
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.68
    ports:
      - "8105:8105"
    network_mode: host # 使用现有网络
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  oper-crm-server:
    container_name: oper-crm-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.58
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.66
    ports:
      - "8090:8090"
    network_mode: host # 使用现有网络
--- 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.25
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.26
    ports:
      - "8089:8089"
    network_mode: host # 使用现有网络
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java
@ -29,9 +29,6 @@ public class ResiTopicOperationFormDTO implements Serializable {
    /**
     * 是否解决(已解决 resolved，未解决 unresolved)
     */
-    @NotBlank(message = "解决状态不能为空")
    private String closedStatus;

-
-
 }
--- 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.62
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.66
    ports:
      - "8095:8095"
    network_mode: host # 使用现有网络
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-group-server:
    container_name: resi-group-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.64
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.66
    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,6 @@
 <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.65</version>
    <version>0.3.66</version>
    <parent>
        <groupId>com.epmet</groupId>
--- 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.17
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.20
    ports:
      - "8091:8091"
    network_mode: host # 使用现有网络
--- 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,6 @@ 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.117
    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.118
    ports:
      - "8087:8087"
--- 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.102
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.118
    ports:
      - "8087:8087"
    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.116
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.118
    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,6 @@
 <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.117</version>
    <version>0.3.118</version>
    <parent>
        <groupId>com.epmet</groupId>