diff --git a/epmet-module/gov-grid/gov-grid-server/Dockerfile b/epmet-module/gov-grid/gov-grid-server/Dockerfile
index eac05300ee..def4428089 100644
--- a/epmet-module/gov-grid/gov-grid-server/Dockerfile
+++ b/epmet-module/gov-grid/gov-grid-server/Dockerfile
@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
EXPOSE 8097
-ENTRYPOINT ["java","-Xms32m","-Xmx250m","-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/gov-grid/gov-grid-server/docker-compose.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
similarity index 62%
rename from epmet-module/gov-grid/gov-grid-server/docker-compose.yml
rename to epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index cedb451dc3..f991b5c676 100644
--- a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -2,12 +2,14 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-dev
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.14
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.15
ports:
- "8097:8097"
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/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index 0401f32b80..74644a8a45 100644
--- 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">
4.0.0
- 0.3.14
+ 0.3.15
com.epmet
gov-grid
@@ -126,13 +126,13 @@
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
diff --git a/epmet-module/gov-issue/gov-issue-server/Dockerfile b/epmet-module/gov-issue/gov-issue-server/Dockerfile
index b2cda1b84a..c3261f957f 100644
--- a/epmet-module/gov-issue/gov-issue-server/Dockerfile
+++ b/epmet-module/gov-issue/gov-issue-server/Dockerfile
@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
EXPOSE 8101
-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/gov-issue/gov-issue-server/docker-compose.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
similarity index 62%
rename from epmet-module/gov-issue/gov-issue-server/docker-compose.yml
rename to epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
index 95f65aac18..3ef4936f03 100644
--- a/epmet-module/gov-issue/gov-issue-server/docker-compose.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
@@ -2,12 +2,14 @@ version: "3.7"
services:
gov-issue-server:
container_name: gov-issue-server-dev
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-issue-server:0.3.0
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.0
ports:
- "8101:8101"
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/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index 98fa317a75..92e8943234 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -128,19 +128,19 @@
-
+
- epmet
- elink@833066
+ epmet_gov_issue_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