diff --git a/epmet-module/gov-project/gov-project-server/Dockerfile b/epmet-module/gov-project/gov-project-server/Dockerfile
index adb8530981..88b6575415 100644
--- a/epmet-module/gov-project/gov-project-server/Dockerfile
+++ b/epmet-module/gov-project/gov-project-server/Dockerfile
@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
EXPOSE 8102
-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-project/gov-project-server/docker-compose.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
similarity index 62%
rename from epmet-module/gov-project/gov-project-server/docker-compose.yml
rename to epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
index 71d21eb11b..5b96274ddd 100644
--- a/epmet-module/gov-project/gov-project-server/docker-compose.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
@@ -2,12 +2,14 @@ version: "3.7"
services:
gov-project-server:
container_name: gov-project-server-dev
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-project-server:0.3.0
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.0
ports:
- "8102:8102"
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-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index a1329fba1c..d38d4c7cf5 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -128,19 +128,19 @@
-
+
- epmet
- elink@833066
+ epmet_gov_project_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
@@ -158,19 +158,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
diff --git a/epmet-module/oper-access/oper-access-server/Dockerfile b/epmet-module/oper-access/oper-access-server/Dockerfile
index bde41338e6..48f2a3dea5 100644
--- a/epmet-module/oper-access/oper-access-server/Dockerfile
+++ b/epmet-module/oper-access/oper-access-server/Dockerfile
@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
EXPOSE 8093
-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/oper-access/oper-access-server/docker-compose.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
similarity index 62%
rename from epmet-module/oper-access/oper-access-server/docker-compose.yml
rename to epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
index 5cfa3206cd..745631afde 100644
--- a/epmet-module/oper-access/oper-access-server/docker-compose.yml
+++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
@@ -2,12 +2,14 @@ version: "3.7"
services:
oper-access-server:
container_name: oper-access-server-dev
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:0.3.4
+ image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:0.3.5
ports:
- "8093:8093"
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/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml
index 55dbb0f047..cf93d6439a 100644
--- a/epmet-module/oper-access/oper-access-server/pom.xml
+++ b/epmet-module/oper-access/oper-access-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">
- 0.3.4
+ 0.3.5
oper-access
com.epmet
@@ -105,13 +105,13 @@
- epmet_oper_access_user
- EpmEt-db-UsEr
-
- 0
- 192.168.1.130
- 6379
- 123456
+ epmet_oper_access_user
+ EpmEt-db-UsEr
+
+ 0
+ 192.168.1.130
+ 6379
+ 123456
false
122.152.200.70:8848
@@ -133,19 +133,19 @@
-
+
- epmet
- elink@833066
+ epmet_oper_access_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
@@ -163,19 +163,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