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

5 years ago · b3ffc5d42e
12 changed files with 21 additions and 21 deletions
--- 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.50
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.51
    ports:
      - "8101:8101"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-issue-server:
    container_name: gov-issue-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.50
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.51
    ports:
      - "8101:8101"
    network_mode: host # 使用现有网络
--- 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.50
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.51
    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.50</version>
+    <version>0.3.51</version>
    <parent>
        <artifactId>gov-issue</artifactId>
        <groupId>com.epmet</groupId>
@ -147,7 +147,7 @@
                <nacos.ip/>

                <spring.flyway.enabled>false</spring.flyway.enabled>
-                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/epmetscan/api</openapi.scan.server.url>
+                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>

                <!--测试钉钉 机器人地址-->
                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
@ -184,7 +184,7 @@
                <nacos.ip/>

                <spring.flyway.enabled>true</spring.flyway.enabled>
-                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/epmetscan/api</openapi.scan.server.url>
+                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>

                <!--测试钉钉 机器人地址-->
                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
@ -218,7 +218,7 @@
                <nacos.ip/>

                <spring.flyway.enabled>true</spring.flyway.enabled>
-                <openapi.scan.server.url>https://epmet-open.elinkservice.cn:7040/epmetscan/api</openapi.scan.server.url>
+                <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
            </properties>
        </profile>
    </profiles>
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-project-server:
    container_name: gov-project-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.37
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.38
    ports:
      - "8102:8102"
    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.37
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.38
    ports:
      - "8102:8102"
    network_mode: host # 使用现有网络
--- 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.37
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.38
    ports:
      - "8102:8102"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-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.37</version>
+    <version>0.3.38</version>
    <parent>
        <artifactId>gov-project</artifactId>
        <groupId>com.epmet</groupId>
@ -147,7 +147,7 @@
                <nacos.ip/>

                <spring.flyway.enabled>false</spring.flyway.enabled>
-                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/epmetscan/api</openapi.scan.server.url>
+                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
            </properties>
        </profile>
        <profile>
@ -180,7 +180,7 @@
                <nacos.ip/>

                <spring.flyway.enabled>true</spring.flyway.enabled>
-                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/epmetscan/api</openapi.scan.server.url>
+                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
            </properties>
        </profile>
        <profile>
@ -210,7 +210,7 @@
                <nacos.ip/>

                <spring.flyway.enabled>true</spring.flyway.enabled>
-                <openapi.scan.server.url>https://epmet-open.elinkservice.cn:7040/epmetscan/api</openapi.scan.server.url>
+                <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
            </properties>
        </profile>
    </profiles>
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-group-server:
    container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.60
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.61
    ports:
      - "8095:8095"
    network_mode: host # 使用现有网络
--- 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.60
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.61
    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.60
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.61
    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.60</version>
+    <version>0.3.61</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>resi-group</artifactId>
@ -150,7 +150,7 @@
                <nacos.ip/>

                <spring.flyway.enabled>false</spring.flyway.enabled>
-                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/epmetscan/api</openapi.scan.server.url>
+                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
            </properties>
        </profile>
        <profile>
@ -182,7 +182,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <spring.flyway.enabled>true</spring.flyway.enabled>
-                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/epmetscan/api</openapi.scan.server.url>
+                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
            </properties>
        </profile>
        <profile>
@ -211,7 +211,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <spring.flyway.enabled>true</spring.flyway.enabled>
-                <openapi.scan.server.url>https://epmet-open.elinkservice.cn:7040/epmetscan/api</openapi.scan.server.url>
+                <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
            </properties>
        </profile>
    </profiles>