diff --git a/pom.xml b/pom.xml
index 20e4b0b2..4974a225 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,15 +25,14 @@
2.2.0
1.4.0
1.2.79
- 5.8.2
- 5.9.0
+ 5.8.6
+ 5.10.0
2.11.0
1.4
3.2.2
4.1.2
2.3
0.9.1
- 2.17.0
@@ -44,7 +43,7 @@
org.springframework.boot
spring-boot-dependencies
- 2.5.6
+ 2.5.8
pom
import
@@ -151,19 +150,6 @@
${fastjson.version}
-
-
- org.apache.logging.log4j
- log4j-api
- ${log4j2.version}
-
-
-
- org.apache.logging.log4j
- log4j-to-slf4j
- ${log4j2.version}
-
-
io.jsonwebtoken
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 1dadf2ce..2ae6802e 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -3,6 +3,7 @@ package com.ruoyi.generator.util;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.velocity.VelocityContext;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.GenConstants;
@@ -270,7 +271,7 @@ public class VelocityUtils
public static String getDicts(GenTable genTable)
{
List columns = genTable.getColumns();
- List dicts = new ArrayList();
+ Set dicts = new HashSet();
for (GenTableColumn column : columns)
{
if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
index 759e763b..b75fed0d 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
@@ -30,7 +30,7 @@ public class ScheduleConfig
prop.put("org.quartz.threadPool.threadCount", "20");
prop.put("org.quartz.threadPool.threadPriority", "5");
// JobStore配置
- prop.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX");
+ prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore");
// 集群配置
prop.put("org.quartz.jobStore.isClustered", "true");
prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index b8284ab9..84ea6af6 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -204,7 +204,7 @@
-
+
立即执行
执行一次