Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-09-25 6101a3bf0d3f7e8de375a0b9bfa7ce71a111144c

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java

	ruoyi-ui/src/assets/styles/sidebar.scss

 pom.xml

@@ -25,7 +25,8 @@
        <kaptcha.version>2.3.2</kaptcha.version>

        <pagehelper.boot.version>1.2.5</pagehelper.boot.version>

        <fastjson.version>1.2.73</fastjson.version>

        <oshi.version>3.9.1</oshi.version>

        <oshi.version>5.2.5</oshi.version>

        <jna.version>5.5.0</jna.version>

        <commons.io.version>2.5</commons.io.version>

        <commons.fileupload.version>1.3.3</commons.fileupload.version>

        <poi.version>3.17</poi.version>

@@ -81,6 +82,16 @@
                <artifactId>oshi-core</artifactId>

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

            </dependency>



            <dependency>

                <groupId>net.java.dev.jna</groupId>

                <artifactId>jna</artifactId>

            </dependency>



            <dependency>

                <groupId>net.java.dev.jna</groupId>

                <artifactId>jna-platform</artifactId>

            </dependency>

            

            <!-- swagger2-->

            <dependency>


 ruoyi-framework/pom.xml

@@ -65,16 +65,6 @@
            <artifactId>oshi-core</artifactId>

        </dependency>



        <dependency>

            <groupId>net.java.dev.jna</groupId>

            <artifactId>jna</artifactId>

        </dependency>



        <dependency>

            <groupId>net.java.dev.jna</groupId>

            <artifactId>jna-platform</artifactId>

        </dependency>



        <!-- 系统模块-->

        <dependency>

            <groupId>com.ruoyi</groupId>


 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java

@@ -189,7 +189,7 @@
    private void setSysFiles(OperatingSystem os)
    {
        FileSystem fileSystem = os.getFileSystem();
        OSFileStore[] fsArray = fileSystem.getFileStores();
        List<OSFileStore> fsArray = fileSystem.getFileStores();
        for (OSFileStore fs : fsArray)
        {
            long free = fs.getUsableSpace();

 ruoyi-ui/src/assets/styles/sidebar.scss

@@ -63,6 +63,12 @@
      width: 100% !important;
    }

    .el-menu-item, .el-submenu__title {
      overflow: hidden !important;
      text-overflow: ellipsis !important;
      white-space: nowrap !important;
    }

    // menu hover
    .submenu-title-noDropdown,
    .el-submenu__title {