补充变更

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:
+  pli-power-base-server:
-    container_name: pli-power-axis-server-dev
+    container_name: pli-power-base-server-dev
-    image: 192.168.1.140:5000/epmet-cloud-dev/pli-power-axis-server:version_placeholder
+    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:

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:
+  pli-power-base-server:
-    container_name: pli-power-axis-server-prod
+    container_name: pli-power-base-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/pli-power-axis-server:0.3.83
+    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:

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:
+  pli-power-base-server:
-    container_name: pli-power-axis-server-test
+    container_name: pli-power-base-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/pli-power-axis-server:version_placeholder
+    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:

epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml

@@ -5,7 +5,7 @@
     <version>0.3.83</version>
     <parent>
         <groupId>com.epmet</groupId>
-        <artifactId>pli-power-axis</artifactId>
+        <artifactId>pli-power-base</artifactId>
         <version>2.0.0</version>
     </parent>
     <artifactId>pli-power-base-server</artifactId>
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
-            <artifactId>pli-power-axis-client</artifactId>
+            <artifactId>pli-power-base-client</artifactId>
             <version>2.0.0</version>
         </dependency>
         <dependency>
@@ -115,7 +115,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_pli_power?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_pli_power</spring.datasource.druid.username>
+                <spring.datasource.druid.username>epmet_pli_power_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -139,7 +139,7 @@
                 <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
                 <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
-                <thread.threadPool.thread-name-prefix>pli-power-axis-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.thread-name-prefix>pli-power-base-</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
@@ -189,7 +189,7 @@
                 <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
                 <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
-                <thread.threadPool.thread-name-prefix>pli-power-axis-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.thread-name-prefix>pli-power-base-</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
@@ -239,7 +239,7 @@
                 <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
                 <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
-                <thread.threadPool.thread-name-prefix>pli-power-axis-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.thread-name-prefix>pli-power-base-</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
@@ -287,7 +287,7 @@
                 <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
                 <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
-                <thread.threadPool.thread-name-prefix>pli-power-axis-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.thread-name-prefix>pli-power-base-</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/logback-spring.xml

@@ -2,7 +2,7 @@
 <configuration>
     <include resource="org/springframework/boot/logging/logback/base.xml"/>
 
-    <property name="log.path" value="logs/pli-power-axis"/>
+    <property name="log.path" value="logs/pli-power-base"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>

epmet-plugins-module/pli-power-base/pom.xml

@@ -12,7 +12,7 @@
     <groupId>com.epmet</groupId>
     <artifactId>pli-power-base</artifactId>
     <packaging>pom</packaging>
-    <description>插件：动力主轴</description>
+    <description>插件：数字底座动力主轴</description>
 
     <modules>
         <module>pli-power-base-client</module>