代码合并

deployment.yaml

@@ -27,6 +27,13 @@ spec:
           env:
             - name: TZ
               value: Asia/Shanghai
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - "/bin/sh"
+                  - "-c"
+                  - "sleep 35"
           readinessProbe:
             httpGet:
               path: /actuator/health
@@ -48,7 +55,7 @@ spec:
             limits:
               cpu: "1"
               memory: "2048Mi"
-      terminationGracePeriodSeconds: 30
+      terminationGracePeriodSeconds: 40
   strategy:
     type: RollingUpdate
     rollingUpdate:

pom.xml

@@ -16,15 +16,15 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.45</revision>
+        <revision>3.0.46</revision>
-        <business.supply.version>3.0.44</business.supply.version>
+        <business.supply.version>3.0.46</business.supply.version>
-        <business.base.version>3.0.44</business.base.version>
+        <business.base.version>3.0.46</business.base.version>
-        <business.logistic.version>3.0.44</business.logistic.version>
+        <business.logistic.version>3.0.46</business.logistic.version>
-        <business.manage.version>3.0.44</business.manage.version>
+        <business.manage.version>3.0.46</business.manage.version>
-        <business.qms.version>3.0.44</business.qms.version>
+        <business.qms.version>3.0.46</business.qms.version>
-        <business.mes.version>3.0.44</business.mes.version>
+        <business.mes.version>3.0.46</business.mes.version>
-        <business.capital.version>3.0.44</business.capital.version>
+        <business.capital.version>3.0.46</business.capital.version>
-        <business.product.version>3.0.44</business.product.version>
+        <business.product.version>3.0.46</business.product.version>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -269,7 +269,14 @@
         <profile>
             <id>qsj</id>
             <properties>
+                <env.name>dev</env.name>
+                <!--Nacos 配置-->
+                <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>qsj</config.namespace>
+                <config.group>DEFAULT_GROUP</config.group>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
+                <config.version>1.0.0</config.version>
             </properties>
         </profile>
     </profiles>

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

@@ -56,7 +56,7 @@ public class QmsExecutionListener implements JavaDelegate {
         variables.put("currentActivityInsId", currentActivityInsId);
         variables.put("processInstanceId", insId);
         JSONObject jsonObject = new JSONObject(variables);
-        log.error("============[QmsExecutionListener][execution({})] 参数有：{}", execution.getId(), JSONObject.toJSONString(variables));
+//        log.error("============[QmsExecutionListener][execution({})] 参数有：{}", execution.getId(), JSONObject.toJSONString(variables));
         String businessKey = execution.getProcessInstanceBusinessKey();
         FlowableListener listener = execution.getCurrentFlowableListener();
         List<FieldExtension> fieldExtensions = listener.getFieldExtensions();   //节点执行监听里配置的扩展字段

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

@@ -57,7 +57,7 @@ public class QmsTaskListener implements TaskListener {
         //todo 判断退回
         Map<String, Object> execVariables = runtimeService.getVariables(delegateTask.getExecutionId());
         variables.put("rejectToFirstActivity", rejectToFirstActivity);
-        log.error("================[QmsTaskListener][delegateTask({})] 参数有：{}", delegateTask.getId(), JSONObject.toJSONString(variables));
+//        log.error("================[QmsTaskListener][delegateTask({})] 参数有：{}", delegateTask.getId(), JSONObject.toJSONString(variables));
         JSONObject jsonObject = new JSONObject(variables);
         QmsBpmDTO qmsBpmDTO = new QmsBpmDTO(processInsId, "", jsonObject, state);
         CommonResult<JSONObject> result = qmsApi.bpmCallback(qmsBpmDTO);
@@ -68,8 +68,8 @@ public class QmsTaskListener implements TaskListener {
     }
 
     /*
-    * 判断是否退回发起节点
+     * 判断是否退回发起节点
-    * */
+     * */
     private String checkFirstActivityReject(String activityId, List<HistoricActivityInstance> instances){
         if(!activityId.contains("001"))
             return "0";

zt-module-bpm/zt-module-bpm-server/src/main/resources/logback-spring.xml

@@ -5,6 +5,10 @@
     <springProperty scope="context" name="zt.info.base-package" source="zt.info.base-package"/>
     <!-- 格式化输出：%d 表示日期，%X{tid} SkWalking 链路追踪编号，%thread 表示线程名，%-5level：级别从左显示 5 个字符宽度，%msg：日志消息，%n是换行符 -->
     <property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) | %boldYellow(%thread [%tid]) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
+    <!--应用名称-->
+    <springProperty scope="context" name="spring.application.name" source="spring.application.name"/>
+    <!-- 日志输出路径 -->
+    <property name="LOG_DIR" value="${user.home}/logs/${spring.application.name}"/>
 
     <!-- 控制台 Appender -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">　　　　　
@@ -56,18 +60,43 @@
         </encoder>
     </appender>
 
+    <!-- ERROR 级别日志 -->
+    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_DIR}-error.log</file>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_DIR}-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>30</maxHistory> <!-- 保留30天的日志 -->
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!--logback的日志级别 FATAL > ERROR > WARN > INFO > DEBUG-->
     <!-- 本地环境 -->
-    <springProfile name="local">
+    <springProfile name="local,dev">
-        <root level="INFO">
+        <root level="WARN">
             <appender-ref ref="STDOUT"/>
+            <appender-ref ref="ERROR"/>
             <appender-ref ref="GRPC"/> <!-- 本地环境下，如果不想接入 SkyWalking 日志服务，可以注释掉本行 -->
             <appender-ref ref="ASYNC"/>  <!-- 本地环境下，如果不想打印日志，可以注释掉本行 -->
         </root>
+        <!--针对不同的业务路径,配置dao层的sql打印日志级别为DEBUG-->
+        <logger name="com.zt.plat.module.bpm.dal.mysql" level="DEBUG" additivity="false">
+            <appender-ref ref="STDOUT"/>
+        </logger>
     </springProfile>
+
     <!-- 其它环境 -->
     <springProfile name="dev,test,stage,prod,default">
         <root level="INFO">
             <appender-ref ref="STDOUT"/>
+            <appender-ref ref="ERROR"/>
             <appender-ref ref="ASYNC"/>
             <appender-ref ref="GRPC"/>
         </root>