升级oshi到最新版本6.4.6

RuoYi

2023-10-21 cb94b207444682e26e92747605948b5ad52ee7a9

 pom.xml

@@ -5,7 +5,7 @@


    <groupId>com.ruoyi</groupId>

    <artifactId>ruoyi</artifactId>

    <version>3.8.2</version>

    <version>3.8.6</version>

    <packaging>jar</packaging>



    <name>ruoyi</name>

@@ -15,7 +15,7 @@
    <parent>

        <groupId>org.springframework.boot</groupId>

        <artifactId>spring-boot-starter-parent</artifactId>

        <version>2.5.14</version>

        <version>2.5.15</version>

        <relativePath />

    </parent>



@@ -24,19 +24,17 @@
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

        <java.version>1.8</java.version>

        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>

        <mybatis.spring.boot.starter.version>2.2.2</mybatis.spring.boot.starter.version>

        <pagehelper.spring.boot.starter.version>1.4.1</pagehelper.spring.boot.starter.version>

        <fastjson.version>2.0.7</fastjson.version>

        <druid.version>1.2.11</druid.version>

        <commons.io.version>2.11.0</commons.io.version>

        <commons.fileupload.version>1.4</commons.fileupload.version>

        <pagehelper.spring.boot.starter.version>1.4.6</pagehelper.spring.boot.starter.version>

        <fastjson.version>2.0.39</fastjson.version>

        <druid.version>1.2.16</druid.version>

        <commons.io.version>2.13.0</commons.io.version>

        <commons.collections.version>3.2.2</commons.collections.version>

        <bitwalker.version>1.21</bitwalker.version>

        <jwt.version>0.9.1</jwt.version>

        <kaptcha.version>2.3.2</kaptcha.version>

        <kaptcha.version>2.3.3</kaptcha.version>

        <swagger.version>3.0.0</swagger.version>

        <poi.version>4.1.2</poi.version>

        <oshi.version>6.1.6</oshi.version>

        <oshi.version>6.4.6</oshi.version>

        <velocity.version>2.3</velocity.version>

    </properties>



@@ -99,13 +97,6 @@
            <scope>runtime</scope>

        </dependency>



        <!-- SpringBoot集成mybatis框架 -->

        <dependency>

            <groupId>org.mybatis.spring.boot</groupId>

            <artifactId>mybatis-spring-boot-starter</artifactId>

            <version>${mybatis.spring.boot.starter.version}</version>

        </dependency>



        <!-- pagehelper 分页插件 -->

        <dependency>

            <groupId>com.github.pagehelper</groupId>

@@ -137,13 +128,6 @@
            <groupId>commons-io</groupId>

            <artifactId>commons-io</artifactId>

            <version>${commons.io.version}</version>

        </dependency>



        <!-- 文件上传工具类 -->

        <dependency>

            <groupId>commons-fileupload</groupId>

            <artifactId>commons-fileupload</artifactId>

            <version>${commons.fileupload.version}</version>

        </dependency>



        <!-- 解析客户端操作系统、浏览器等 -->

@@ -241,12 +225,12 @@


        <!-- 验证码 -->

        <dependency>

            <groupId>com.github.penggle</groupId>

            <groupId>pro.fessional</groupId>

            <artifactId>kaptcha</artifactId>

            <version>${kaptcha.version}</version>

            <exclusions>

                <exclusion>

                    <artifactId>javax.servlet-api</artifactId>

                    <artifactId>servlet-api</artifactId>

                    <groupId>javax.servlet</groupId>

                </exclusion>

            </exclusions>