From 0e771a6c1b732772eaf0ebcea7a26f9098755d7d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 27 十二月 2021 12:38:59 +0800
Subject: [PATCH] 升级spring-boot到最新版本2.5.8
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java | 2 +-
pom.xml | 16 +---------------
ruoyi-ui/src/views/monitor/job/index.vue | 2 +-
3 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 58658db..4974a22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
<poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
- <log4j2.version>2.17.0</log4j2.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -44,7 +43,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.5.6</version>
+ <version>2.5.8</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -149,19 +148,6 @@
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
- </dependency>
-
- <!-- log4j鏃ュ織缁勪欢 -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>${log4j2.version}</version>
</dependency>
<!-- Token鐢熸垚涓庤В鏋�-->
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 e35eb26..04db2c9 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
@@ -29,7 +29,7 @@
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 b8284ab..84ea6af 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -204,7 +204,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="閿欒绛栫暐" prop="misfirePolicy">
+ <el-form-item label="鎵ц绛栫暐" prop="misfirePolicy">
<el-radio-group v-model="form.misfirePolicy" size="small">
<el-radio-button label="1">绔嬪嵆鎵ц</el-radio-button>
<el-radio-button label="2">鎵ц涓�娆�</el-radio-button>
--
Gitblit v1.9.3