diff --git a/lms2/nladmin-system/nlsso-server/pom.xml b/lms2/nladmin-system/nlsso-server/pom.xml
index cf9a6644b..c5effdfd0 100644
--- a/lms2/nladmin-system/nlsso-server/pom.xml
+++ b/lms2/nladmin-system/nlsso-server/pom.xml
@@ -46,7 +46,7 @@
org.dromara.dynamictp
dynamic-tp-spring-boot-starter-adapter-webserver
- 1.1.6.1
+ 1.1.7
com.github.jeffreyning
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
index 8c3328d74..a0aa0384e 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
@@ -1,5 +1,6 @@
package org.nl.system.service.quartz.config;
+import cn.hutool.core.net.NetUtil;
import lombok.RequiredArgsConstructor;
import org.nl.system.service.quartz.ISysQuartzJobService;
import org.nl.system.service.quartz.dao.SysQuartzJob;
@@ -36,5 +37,23 @@ public class JobRunner implements ApplicationRunner {
*/
@Override
public void run(ApplicationArguments applicationArguments) {
+ //本机IP
+ String localIp = NetUtil.getLocalhostStr();
+ System.out.println("本机ip:" + localIp);
+
+ log.info("--------------------注入定时任务---------------------");
+ List quartzJobs = quartzJobService.findByIsPauseIsFalse();
+ quartzJobs.forEach(job -> {
+ if (localIp.equals(job.getJob_ip())) {
+ log.info("定时任务: [{}], 执行ip: {}, 定时任务开启", job.getJob_name(), localIp);
+ System.out.println("定时任务: " + job.getJob_name() + ", 执行ip: " + localIp + ", 定时任务开启");
+ quartzManage.addJob(job);
+ } else {
+ log.info("定时任务: [{}] 未开启, 本机ip: {} 与 调度ip: {} 不同", job.getJob_name(), localIp, job.getJob_ip());
+ System.out.println("定时任务 " + job.getJob_name() + " 未开启, 本机ip: " + localIp + " 与 调度ip: " + job.getJob_ip() + " 不同");
+ }
+ });
+
+ log.info("--------------------定时任务注入完成---------------------");
}
}
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/SysQuartzJob.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/SysQuartzJob.java
index cd735b0cd..c0ae1b2c2 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/SysQuartzJob.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/SysQuartzJob.java
@@ -124,4 +124,9 @@ public class SysQuartzJob implements Serializable {
@TableField(exist = false)
private String uuid;
+
+ /**
+ * 调度IP
+ */
+ private String job_ip;
}
diff --git a/lms2/nladmin-ui/src/views/system/timing/index.vue b/lms2/nladmin-ui/src/views/system/timing/index.vue
index c57bbcfaf..1a4d5c6da 100644
--- a/lms2/nladmin-ui/src/views/system/timing/index.vue
+++ b/lms2/nladmin-ui/src/views/system/timing/index.vue
@@ -79,6 +79,9 @@
+
+
+
{{ $t('common.Yes') }}
@@ -112,6 +115,7 @@
+