diff --git a/deployment.yaml b/deployment.yaml index d05c631..c22feee 100644 --- a/deployment.yaml +++ b/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: diff --git a/pom.xml b/pom.xml index 8d287cc..400f1a7 100644 --- a/pom.xml +++ b/pom.xml @@ -16,15 +16,15 @@ https://github.com/YunaiV/ruoyi-vue-pro - 3.0.45 - 3.0.44 - 3.0.44 - 3.0.44 - 3.0.44 - 3.0.44 - 3.0.44 - 3.0.44 - 3.0.44 + 3.0.46 + 3.0.46 + 3.0.46 + 3.0.46 + 3.0.46 + 3.0.46 + 3.0.46 + 3.0.46 + 3.0.46 17 ${java.version} @@ -269,7 +269,14 @@ qsj + dev + + 172.16.46.63:30848 qsj + DEFAULT_GROUP + nacos + P@ssword25 + 1.0.0 diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsExecutionListener.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsExecutionListener.java index 9f247ea..748a941 100644 --- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsExecutionListener.java +++ b/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 fieldExtensions = listener.getFieldExtensions(); //节点执行监听里配置的扩展字段 diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java index c53559b..0c410a4 100644 --- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java +++ b/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 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 result = qmsApi.bpmCallback(qmsBpmDTO); @@ -68,8 +68,8 @@ public class QmsTaskListener implements TaskListener { } /* - * 判断是否退回发起节点 - * */ + * 判断是否退回发起节点 + * */ private String checkFirstActivityReject(String activityId, List instances){ if(!activityId.contains("001")) return "0"; diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/resources/logback-spring.xml b/zt-module-bpm/zt-module-bpm-server/src/main/resources/logback-spring.xml index 0e55141..590fafc 100644 --- a/zt-module-bpm/zt-module-bpm-server/src/main/resources/logback-spring.xml +++ b/zt-module-bpm/zt-module-bpm-server/src/main/resources/logback-spring.xml @@ -5,6 +5,10 @@ + + + +       @@ -56,18 +60,43 @@ + + + ${LOG_DIR}-error.log + + ERROR + ACCEPT + DENY + + + ${LOG_DIR}-error.%d{yyyy-MM-dd}.log + 30 + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + - - + + + + + + + + +