diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-dev.yml b/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-dev.yml index 5e6365f..63dc77d 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-dev.yml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-dev.yml @@ -1,15 +1,15 @@ version: "3.7" services: - pli-power-axis-server: - container_name: pli-power-axis-server-dev - image: 192.168.1.140:5000/epmet-cloud-dev/pli-power-axis-server:version_placeholder + pli-power-base-server: + container_name: pli-power-base-server-dev + image: 192.168.1.140:5000/epmet-cloud-dev/pli-power-base-server:version_placeholder ports: - "8096:8096" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/dev:/logs" environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./pli-power-axis.jar" + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./pli-power-base.jar" restart: "unless-stopped" deploy: resources: diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-prod.yml b/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-prod.yml index 0e9603b..9a1e02c 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-prod.yml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-prod.yml @@ -1,15 +1,15 @@ version: "3.7" services: - pli-power-axis-server: - container_name: pli-power-axis-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/pli-power-axis-server:0.3.83 + pli-power-base-server: + container_name: pli-power-base-server-prod + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/pli-power-base-server:0.3.83 ports: - "8096:8096" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./pli-power-axis.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./pli-power-base.jar" restart: "unless-stopped" deploy: resources: diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-test.yml b/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-test.yml index 6acd88e..cdecc4b 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-test.yml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-test.yml @@ -1,15 +1,15 @@ version: "3.7" services: - pli-power-axis-server: - container_name: pli-power-axis-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/pli-power-axis-server:version_placeholder + pli-power-base-server: + container_name: pli-power-base-server-test + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/pli-power-base-server:version_placeholder ports: - "8096:8096" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/test:/logs" environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./pli-power-axis.jar" + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./pli-power-base.jar" restart: "unless-stopped" deploy: resources: diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml index 26b8c7e..6759f10 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml @@ -5,7 +5,7 @@ 0.3.83 com.epmet - pli-power-axis + pli-power-base 2.0.0 pli-power-base-server @@ -19,7 +19,7 @@ com.epmet - pli-power-axis-client + pli-power-base-client 2.0.0 @@ -115,7 +115,7 @@ - epmet_pli_power + epmet_pli_power_user EpmEt-db-UsEr 0 @@ -139,7 +139,7 @@ 8 10 60 - pli-power-axis- + pli-power-base- callerRunsPolicy false @@ -189,7 +189,7 @@ 8 10 60 - pli-power-axis- + pli-power-base- callerRunsPolicy false @@ -239,7 +239,7 @@ 8 10 60 - pli-power-axis- + pli-power-base- callerRunsPolicy true @@ -287,7 +287,7 @@ 8 10 60 - pli-power-axis- + pli-power-base- callerRunsPolicy true diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/logback-spring.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/logback-spring.xml index 857ec70..46271c1 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/logback-spring.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + diff --git a/epmet-plugins-module/pli-power-base/pom.xml b/epmet-plugins-module/pli-power-base/pom.xml index 15c8638..e134460 100644 --- a/epmet-plugins-module/pli-power-base/pom.xml +++ b/epmet-plugins-module/pli-power-base/pom.xml @@ -12,7 +12,7 @@ com.epmet pli-power-base pom - 插件:动力主轴 + 插件:数字底座动力主轴 pli-power-base-client