diff --git a/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/job/detail.html b/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/job/detail.html
index 8390228f4..5c33c3bb3 100644
--- a/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/job/detail.html
+++ b/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/job/detail.html
@@ -2,6 +2,7 @@
+
@@ -34,13 +35,13 @@
@@ -104,6 +105,26 @@
+
+
diff --git a/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/mggroup/token.html b/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/mggroup/token.html
index 3897091f9..9effc71b8 100644
--- a/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/mggroup/token.html
+++ b/disjob-admin/ruoyi-disjob/src/main/resources/templates/disjob/mggroup/token.html
@@ -87,11 +87,14 @@
tempElement.select();
document.execCommand('copy')
document.body.removeChild(tempElement);
+ $.modal.msgSuccess("已复制到剪贴板");
+ /*
top.layer.msg("已复制到剪贴板", {
icon: $.modal.icon(modal_status.SUCCESS),
time: 500,
shade: [0.1, '#8F8F8F']
});
+ */
return false;
}
diff --git a/disjob-dispatch/disjob-dispatch-api/src/main/java/cn/ponfee/disjob/dispatch/ExecuteTaskParam.java b/disjob-dispatch/disjob-dispatch-api/src/main/java/cn/ponfee/disjob/dispatch/ExecuteTaskParam.java
index 9c6837366..7c5cbbdd1 100644
--- a/disjob-dispatch/disjob-dispatch-api/src/main/java/cn/ponfee/disjob/dispatch/ExecuteTaskParam.java
+++ b/disjob-dispatch/disjob-dispatch-api/src/main/java/cn/ponfee/disjob/dispatch/ExecuteTaskParam.java
@@ -62,7 +62,7 @@ public class ExecuteTaskParam extends AuthenticationParam implements TimingWheel
*/
@Getter(AccessLevel.NONE)
@Setter(AccessLevel.NONE)
- private volatile transient TaskExecutor taskExecutor;
+ private transient AtomicReference taskExecutor = new AtomicReference<>();
// --------------------------------------------------------other methods
@@ -75,11 +75,11 @@ public Operations operation() {
}
public void taskExecutor(TaskExecutor taskExecutor) {
- this.taskExecutor = taskExecutor;
+ this.taskExecutor.set(taskExecutor);
}
public void stop() {
- final TaskExecutor executor = this.taskExecutor;
+ TaskExecutor executor = taskExecutor.get();
if (executor != null) {
executor.stop();
}
diff --git a/sql/mysql-disjob.sql b/sql/mysql-disjob.sql
index 17a67b9b9..8818f9724 100644
--- a/sql/mysql-disjob.sql
+++ b/sql/mysql-disjob.sql
@@ -191,7 +191,7 @@ INSERT INTO `sched_job` (`job_id`, `group`, `job_name`, `job_handler`, `job_stat
INSERT INTO `sched_job` (`job_id`, `group`, `job_name`, `job_handler`, `job_state`, `job_type`, `route_strategy`, `job_param`, `trigger_type`, `trigger_value`, `next_trigger_time`) VALUES (1003164910267351020, 'app-test', 'fixed-rate', 'cn.ponfee.disjob.test.handler.NoopJobHandler', 1, 1, 1, 'fixed-rate demo', 4, '20', unix_timestamp()*1000);
INSERT INTO `sched_job` (`job_id`, `group`, `job_name`, `job_handler`, `job_state`, `job_type`, `route_strategy`, `job_param`, `trigger_type`, `trigger_value`, `next_trigger_time`) VALUES (1003164910267351021, 'app-test', 'fixed-delay', 'cn.ponfee.disjob.test.handler.NoopJobHandler', 1, 1, 5, 'fixed-delay demo', 5, '20', unix_timestamp()*1000);
INSERT INTO `sched_job` (`job_id`, `group`, `job_name`, `job_handler`, `job_state`, `job_type`, `route_strategy`, `job_param`, `trigger_type`, `trigger_value`, `next_trigger_time`) VALUES (1003164910267351008, 'app-test', 'workflow-json-graph', '[{"source":"1:1:AJobHandler","target":"1:1:CJobHandler"},{"source":"1:1:AJobHandler","target":"1:1:DJobHandler"},{"source":"1:1:BJobHandler","target":"1:1:DJobHandler"},{"source":"1:1:BJobHandler","target":"1:1:EJobHandler"}]', 1, 2, 2, '', 2, '2023-03-18 21:30:00', unix_timestamp()*1000);
-INSERT INTO `sched_job` (`job_id`, `group`, `job_name`, `job_handler`, `job_state`, `job_type`, `route_strategy`, `job_param`, `trigger_type`, `trigger_value`, `next_trigger_time`) VALUES (1003164910267351009, 'app-test', 'prime-count-dag', 'cn.ponfee.disjob.test.handler.PrimeCountJobHandler -> cn.ponfee.disjob.test.handler.PrimeAccumulateJobHandler', 1, 2, 3, '{\"m\":1,\"n\":500000000,\"blockSize\":3000000,\"parallel\":3}', 3, '2023-09-02 18:00:00', unix_timestamp()*1000);
+INSERT INTO `sched_job` (`job_id`, `group`, `job_name`, `job_handler`, `job_state`, `job_type`, `route_strategy`, `job_param`, `trigger_type`, `trigger_value`, `next_trigger_time`) VALUES (1003164910267351009, 'app-test', 'prime-count-dag', 'cn.ponfee.disjob.test.handler.PrimeCountJobHandler -> cn.ponfee.disjob.test.handler.PrimeAccumulateJobHandler', 1, 2, 3, '{\"m\":1,\"n\":500000000,\"blockSize\":3000000,\"parallel\":3}', 2, '2023-09-02 18:00:00', unix_timestamp()*1000);
INSERT INTO `sched_job` (`job_id`, `group`, `job_name`, `job_handler`, `job_state`, `job_type`, `route_strategy`, `job_param`, `trigger_type`, `trigger_value`, `next_trigger_time`) VALUES (1003164910267351010, 'app-test', 'groovy-job', 'cn.ponfee.disjob.core.handle.impl.GroovyJobHandler', 1, 1, 4, 'import java.util.*; savepoint.save(new Date().toString() + ": " + UUID.randomUUID().toString()); return "execute at: " + new Date() + jobHandler.toString()', 1, '0/50 * * * * ?', unix_timestamp()*1000);
INSERT INTO `sched_depend` (`child_job_id`, `parent_job_id`, `sequence`) VALUES (1003164910267351007, 1003164910267351000, 1);