diff --git a/epmet-module/resi-group/resi-group-server/Dockerfile b/epmet-module/resi-group/resi-group-server/Dockerfile index f349a97319..b4a767cfc8 100644 --- a/epmet-module/resi-group/resi-group-server/Dockerfile +++ b/epmet-module/resi-group/resi-group-server/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8095 -ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file +ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml similarity index 62% rename from epmet-module/resi-group/resi-group-server/docker-compose.yml rename to epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 479cc485a8..dc71bd436d 100644 --- a/epmet-module/resi-group/resi-group-server/docker-compose.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,12 +2,14 @@ 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.16 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.17 ports: - "8095:8095" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/dev:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar" deploy: resources: limits: diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 952ccc1abd..50c65c32b0 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.16 + 0.3.17 com.epmet resi-group @@ -143,19 +143,19 @@ - + - epmet - elink@833066 + epmet_resi_group_user + EpmEt-db-UsEr 0 - r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com + 192.168.1.130 6379 - EpmEtrEdIs!q@w + 123456 true - 192.168.10.150:8848 - 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b false @@ -173,19 +173,19 @@ - + epmet elink@833066 - 1 - 10.10.10.248 + 0 + r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com 6379 - 123456 + EpmEtrEdIs!q@w true - 122.152.200.70:8848 - fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + 192.168.10.150:8848 + 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae false diff --git a/epmet-module/resi-guide/resi-guide-server/Dockerfile b/epmet-module/resi-guide/resi-guide-server/Dockerfile index 42c62e7b07..10b908b3bf 100644 --- a/epmet-module/resi-guide/resi-guide-server/Dockerfile +++ b/epmet-module/resi-guide/resi-guide-server/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8091 -ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file +ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/docker-compose.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml similarity index 62% rename from epmet-module/resi-guide/resi-guide-server/docker-compose.yml rename to epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml index 8cc981ff60..9d64c409ea 100644 --- a/epmet-module/resi-guide/resi-guide-server/docker-compose.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml @@ -2,12 +2,14 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-guide-server:0.3.4 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.5 ports: - "8091:8091" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/dev:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar" deploy: resources: limits: diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index b3cc31066a..ae79f88be8 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.4 + 0.3.5 com.epmet resi-guide @@ -148,19 +148,19 @@ - + - epmet - elink@833066 + epmet_resi_guide_user + EpmEt-db-UsEr 0 - r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com + 192.168.1.130 6379 - EpmEtrEdIs!q@w + 123456 true - 192.168.10.150:8848 - 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b false @@ -178,19 +178,19 @@ - + epmet elink@833066 0 - 10.10.10.248 + r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com 6379 - 123456 + EpmEtrEdIs!q@w true - 122.152.200.70:8848 - fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + 192.168.10.150:8848 + 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae false