Преглед на файлове

升级oshi到最新版本6.3.2

RuoYi преди 2 години
родител
ревизия
faa4bfaef3
променени са 3 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 1 1
      pom.xml
  2. 2 2
      ruoyi-framework/pom.xml
  3. 1 1
      ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java

+ 1 - 1
pom.xml

@@ -26,7 +26,7 @@
         <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
         <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.4.3</pagehelper.boot.version>
         <pagehelper.boot.version>1.4.3</pagehelper.boot.version>
         <fastjson.version>1.2.83</fastjson.version>
         <fastjson.version>1.2.83</fastjson.version>
-        <oshi.version>6.3.0</oshi.version>
+        <oshi.version>6.3.2</oshi.version>
         <commons.io.version>2.11.0</commons.io.version>
         <commons.io.version>2.11.0</commons.io.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <poi.version>4.1.2</poi.version>
         <poi.version>4.1.2</poi.version>

+ 2 - 2
ruoyi-framework/pom.xml

@@ -17,8 +17,8 @@
 
 
     <dependencies>
     <dependencies>
 
 
-         <!-- SpringBoot Web容器 -->
-         <dependency>
+        <!-- SpringBoot Web容器 -->
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         </dependency>

+ 1 - 1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java

@@ -66,7 +66,7 @@ public abstract class AbstractQuartzJob implements Job
      * 执行后
      * 执行后
      *
      *
      * @param context 工作执行上下文对象
      * @param context 工作执行上下文对象
-     * @param sysScheduleJob 系统计划任务
+     * @param sysJob 系统计划任务
      */
      */
     protected void after(JobExecutionContext context, SysJob sysJob, Exception e)
     protected void after(JobExecutionContext context, SysJob sysJob, Exception e)
     {
     {