From f406acfd07d6a208cef0fe038114e20847b1df6f Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Tue, 25 Oct 2022 10:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/modules/quartz/utils/ExecutionJob.java | 9 ++------- wms/qd/package.json | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java index 8a66de6..79aeca7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java @@ -33,8 +33,6 @@ import org.nl.utils.SpringContextHolder; import org.nl.utils.ThrowableUtil; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import org.slf4j.Marker; -import org.slf4j.MarkerFactory; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.quartz.QuartzJobBean; @@ -62,9 +60,6 @@ public class ExecutionJob extends QuartzJobBean { */ private final static ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll(); - private static final Marker QUARTZ_MARKER = MarkerFactory.getMarker("quartz"); - - @Override public void executeInternal(JobExecutionContext context) { QuartzJob quartzJob = (QuartzJob) context.getMergedJobDataMap().get(QuartzJob.JOB_KEY); @@ -129,9 +124,9 @@ public class ExecutionJob extends QuartzJobBean { // EmailVo emailVo = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e)); // emailService.send(emailVo, emailService.find()); } + quartzLogRepository.save(logDto); } finally { - log.info(QUARTZ_MARKER, logDto.toString()); - //quartzLogRepository.save(log); + } } diff --git a/wms/qd/package.json b/wms/qd/package.json index e64c9b9..4614d04 100644 --- a/wms/qd/package.json +++ b/wms/qd/package.json @@ -102,7 +102,7 @@ "lint-staged": "8.1.5", "plop": "2.3.0", "runjs": "^4.3.2", - "sass": "^1.26.10", + "sass": "~1.26.5", "sass-loader": "^7.1.0", "script-ext-html-webpack-plugin": "2.1.3", "script-loader": "0.7.2",