Merge branch 'refs/heads/zt-test' into test

# Conflicts:
#	pom.xml

pom.xml

@@ -16,15 +16,15 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.43</revision>
+        <revision>3.0.45</revision>
-        <business.supply.version>3.0.43</business.supply.version>
+        <business.supply.version>3.0.44</business.supply.version>
-        <business.base.version>3.0.43</business.base.version>
+        <business.base.version>3.0.44</business.base.version>
-        <business.logistic.version>3.0.43</business.logistic.version>
+        <business.logistic.version>3.0.44</business.logistic.version>
-        <business.manage.version>3.0.43</business.manage.version>
+        <business.manage.version>3.0.44</business.manage.version>
-        <business.qms.version>3.0.43</business.qms.version>
+        <business.qms.version>3.0.44</business.qms.version>
-        <business.mes.version>3.0.43</business.mes.version>
+        <business.mes.version>3.0.44</business.mes.version>
-        <business.capital.version>3.0.43</business.capital.version>
+        <business.capital.version>3.0.44</business.capital.version>
-        <business.product.version>3.0.43</business.product.version>
+        <business.product.version>3.0.44</business.product.version>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -229,8 +229,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>dev</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
+                <config.username>nacos</config.username>
-                <config.password/>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -242,8 +242,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>prod</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
+                <config.username>nacos</config.username>
-                <config.password/>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>

zt-module-bpm/zt-module-bpm-server/Dockerfile

@@ -1,7 +1,6 @@
 ## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性
 
-ARG BASE_IMAGE=172.16.46.66:10043/base-service/skywalking-agent-jre:9.7.0
+FROM 172.16.46.66:10043/base-service/eclipse-temurin:21-jre
-FROM ${BASE_IMAGE}
 
 ## 创建目录，并使用它作为工作目录
 RUN mkdir -p /zt-module-bpm-server
@@ -11,15 +10,10 @@ COPY ./target/zt-module-bpm-server.jar app.jar
 
 ## 设置 TZ 时区
 ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖
-ENV TZ=Asia/Shanghai
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m"
-ENV JAVA_OPTS="-Xms512m -Xmx512m"
-ENV SW_AGENT_HOME=/opt/skywalking/agent
-ENV SW_AGENT_NAME=zt-module-bpm-server
-ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES=172.16.46.63:30201
-ENV AGENT_JAVA_OPTS="-javaagent:${SW_AGENT_HOME}/skywalking-agent.jar -Dskywalking.agent.service_name=${SW_AGENT_NAME} -Dskywalking.collector.backend_service=${SW_AGENT_COLLECTOR_BACKEND_SERVICES}"
 
 ## 暴露后端项目的 48080 端口
 EXPOSE 48083
 
 ## 启动后端项目
-CMD java ${AGENT_JAVA_OPTS} ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar
+CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar

zt-module-bpm/zt-module-bpm-server/pom.xml

@@ -54,6 +54,12 @@
             <version>${business.qms.version}</version>
         </dependency>
 
+<!--        qms模块api-->
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-qms-api</artifactId>
+            <version>${business.qms.version}</version>
+        </dependency>
         <!-- 业务组件 -->
         <dependency>
             <groupId>com.zt.plat</groupId>

zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java

@@ -1,11 +1,10 @@
 package com.zt.plat.module.bpm.service.qms.listener;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.qms.api.task.QmsApi;
 import com.zt.plat.module.qms.api.task.dto.QmsBpmDTO;
 import com.zt.plat.module.qms.enums.ErrorCodeConstants;
-import com.alibaba.fastjson.JSONObject;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.delegate.TaskListener;
 import org.flowable.task.service.delegate.DelegateTask;