Просмотр исходного кода

升级spring-boot到最新版本2.5.8

RuoYi лет назад: 4
Родитель
Сommit
74a02ca3dc

+ 1 - 15
pom.xml

@@ -17,7 +17,7 @@
17
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19
         <java.version>1.8</java.version>
19
         <java.version>1.8</java.version>
20
-        <spring-boot.version>2.5.6</spring-boot.version>
20
+        <spring-boot.version>2.5.8</spring-boot.version>
21
         <spring-cloud.version>2020.0.4</spring-cloud.version>
21
         <spring-cloud.version>2020.0.4</spring-cloud.version>
22
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
22
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
23
         <alibaba.nacos.version>2.0.3</alibaba.nacos.version>
23
         <alibaba.nacos.version>2.0.3</alibaba.nacos.version>
@@ -40,7 +40,6 @@
40
         <common-pool.version>2.10.0</common-pool.version>
40
         <common-pool.version>2.10.0</common-pool.version>
41
         <commons-collections.version>3.2.2</commons-collections.version>
41
         <commons-collections.version>3.2.2</commons-collections.version>
42
         <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
42
         <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
43
-        <log4j2.version>2.17.0</log4j2.version>
44
     </properties>
43
     </properties>
45
 
44
 
46
     <!-- 依赖声明 -->
45
     <!-- 依赖声明 -->
@@ -191,19 +190,6 @@
191
                 <version>${common-pool.version}</version>
190
                 <version>${common-pool.version}</version>
192
             </dependency>
191
             </dependency>
193
 
192
 
194
-            <!-- log4j日志组件 -->
195
-            <dependency>
196
-                <groupId>org.apache.logging.log4j</groupId>
197
-                <artifactId>log4j-api</artifactId>
198
-                <version>${log4j2.version}</version>
199
-            </dependency>
200
-            
201
-            <dependency>
202
-                <groupId>org.apache.logging.log4j</groupId>
203
-                <artifactId>log4j-to-slf4j</artifactId>
204
-                <version>${log4j2.version}</version>
205
-            </dependency>
206
-
207
             <!-- 核心模块 -->
193
             <!-- 核心模块 -->
208
             <dependency>
194
             <dependency>
209
                 <groupId>com.ruoyi</groupId>
195
                 <groupId>com.ruoyi</groupId>

+ 1 - 1
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java

@@ -29,7 +29,7 @@ public class ScheduleConfig
29
         prop.put("org.quartz.threadPool.threadCount", "20");
29
         prop.put("org.quartz.threadPool.threadCount", "20");
30
         prop.put("org.quartz.threadPool.threadPriority", "5");
30
         prop.put("org.quartz.threadPool.threadPriority", "5");
31
         // JobStore配置
31
         // JobStore配置
32
-        prop.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX");
32
+        prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore");
33
         // 集群配置
33
         // 集群配置
34
         prop.put("org.quartz.jobStore.isClustered", "true");
34
         prop.put("org.quartz.jobStore.isClustered", "true");
35
         prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
35
         prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");

+ 1 - 1
ruoyi-ui/src/views/monitor/job/index.vue

@@ -204,7 +204,7 @@
204
             </el-form-item>
204
             </el-form-item>
205
           </el-col>
205
           </el-col>
206
           <el-col :span="24">
206
           <el-col :span="24">
207
-            <el-form-item label="错误策略" prop="misfirePolicy">
207
+            <el-form-item label="执行策略" prop="misfirePolicy">
208
               <el-radio-group v-model="form.misfirePolicy" size="small">
208
               <el-radio-group v-model="form.misfirePolicy" size="small">
209
                 <el-radio-button label="1">立即执行</el-radio-button>
209
                 <el-radio-button label="1">立即执行</el-radio-button>
210
                 <el-radio-button label="2">执行一次</el-radio-button>
210
                 <el-radio-button label="2">执行一次</el-radio-button>