root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
ldj_willow
2022-10-25 10:00:55 +08:00
parent d0b41eca0e
commit f406acfd07
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wms/hd/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java
View File

@@ -33,8 +33,6 @@ import org.nl.utils.SpringContextHolder;
import org.nl.utils.ThrowableUtil; import org.nl.utils.ThrowableUtil;
import org.quartz.DisallowConcurrentExecution; import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import org.slf4j.Marker;
import org.slf4j.MarkerFactory;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.quartz.QuartzJobBean; import org.springframework.scheduling.quartz.QuartzJobBean;
@@ -62,9 +60,6 @@ public class ExecutionJob extends QuartzJobBean {
*/ */
private final static ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll(); private final static ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll();
private static final Marker QUARTZ_MARKER = MarkerFactory.getMarker("quartz");
@Override @Override
public void executeInternal(JobExecutionContext context) { public void executeInternal(JobExecutionContext context) {
QuartzJob quartzJob = (QuartzJob) context.getMergedJobDataMap().get(QuartzJob.JOB_KEY); 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)); // EmailVo emailVo = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e));
// emailService.send(emailVo, emailService.find()); // emailService.send(emailVo, emailService.find());
} }
quartzLogRepository.save(logDto);
} finally { } finally {
log.info(QUARTZ_MARKER, logDto.toString());
//quartzLogRepository.save(log);
} }
} }

2
wms/qd/package.json
View File

@@ -102,7 +102,7 @@
"lint-staged": "8.1.5", "lint-staged": "8.1.5",
"plop": "2.3.0", "plop": "2.3.0",
"runjs": "^4.3.2", "runjs": "^4.3.2",
"sass": "^1.26.10", "sass": "~1.26.5",
"sass-loader": "^7.1.0", "sass-loader": "^7.1.0",
"script-ext-html-webpack-plugin": "2.1.3", "script-ext-html-webpack-plugin": "2.1.3",
"script-loader": "0.7.2", "script-loader": "0.7.2",