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

疯狂的狮子li

2021-10-11 741a5b275ba3d1a9099d2c5dce94e7a192db66c1

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


 Conflicts:

	pom.xml

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java

	ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

	ruoyi-ui/package.json

	ruoyi-ui/src/views/monitor/server/index.vue

 pom.xml

@@ -19,7 +19,7 @@
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
        <druid.version>1.2.6</druid.version>
        <druid.version>1.2.8</druid.version>
        <knife4j.version>3.0.3</knife4j.version>
        <swagger-annotations.version>1.5.22</swagger-annotations.version>
        <poi.version>4.1.2</poi.version>

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -25,7 +25,6 @@
     */
    @Bean
    public CorsFilter corsFilter() {
        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
        CorsConfiguration config = new CorsConfiguration();
        config.setAllowCredentials(true);
        // 设置访问源地址
@@ -34,8 +33,12 @@
        config.addAllowedHeader("*");
        // 设置访问源请求方法
        config.addAllowedMethod("*");
        // 对接口配置跨域设置
        // 有效期 1800秒
        config.setMaxAge(1800L);
        // 添加映射路径，拦截一切请求
        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
        source.registerCorsConfiguration("/**", config);
        // 返回新的CorsFilter
        return new CorsFilter(source);
    }
}
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -150,6 +150,7 @@
                children.setComponent(menu.getComponent());
                children.setName(StringUtils.capitalize(menu.getPath()));
                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
                children.setQuery(menu.getQuery());
                childrenList.add(children);
                router.setChildren(childrenList);
            } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) {

 ruoyi-ui/package.json

@@ -41,7 +41,7 @@
    "clipboard": "2.0.6",
    "core-js": "3.8.1",
    "echarts": "4.9.0",
    "element-ui": "2.15.5",
    "element-ui": "2.15.6",
    "file-saver": "2.0.5",
    "fuse.js": "6.4.3",
    "highlight.js": "9.18.5",

 ruoyi-ui/src/views/monitor/cache/index.vue

@@ -8,34 +8,34 @@
            <table cellspacing="0" style="width: 100%">

              <tbody>

                <tr>

                  <td><div class="cell">Redis版本</div></td>

                  <td><div class="cell" v-if="cache.info">{{ cache.info.redis_version }}</div></td>

                  <td><div class="cell">运行模式</div></td>

                  <td><div class="cell" v-if="cache.info">{{ cache.info.redis_mode == "standalone" ? "单机" : "集群" }}</div></td>

                  <td><div class="cell">端口</div></td>

                  <td><div class="cell" v-if="cache.info">{{ cache.info.tcp_port }}</div></td>

                  <td><div class="cell">客户端数</div></td>

                  <td><div class="cell" v-if="cache.info">{{ cache.info.connected_clients }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">Redis版本</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.redis_version }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">运行模式</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.redis_mode == "standalone" ? "单机" : "集群" }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">端口</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.tcp_port }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">客户端数</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.connected_clients }}</div></td>

                </tr>

                <tr>

                  <td><div class="cell">运行时间(天)</div></td>

                  <td><div class="cell" v-if="cache.info">{{ cache.info.uptime_in_days }}</div></td>

                  <td><div class="cell">使用内存</div></td>

                  <td><div class="cell" v-if="cache.info">{{ cache.info.used_memory_human }}</div></td>

                  <td><div class="cell">使用CPU</div></td>

                  <td><div class="cell" v-if="cache.info">{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}</div></td>

                  <td><div class="cell">内存配置</div></td>

                  <td><div class="cell" v-if="cache.info">{{ cache.info.maxmemory_human }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">运行时间(天)</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.uptime_in_days }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">使用内存</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.used_memory_human }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">使用CPU</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">内存配置</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.maxmemory_human }}</div></td>

                </tr>

                <tr>

                  <td><div class="cell">AOF是否开启</div></td>

                  <td><div class="cell" v-if="cache.info">{{ cache.info.aof_enabled == "0" ? "否" : "是" }}</div></td>

                  <td><div class="cell">RDB是否成功</div></td>

                  <td><div class="cell" v-if="cache.info">{{ cache.info.rdb_last_bgsave_status }}</div></td>

                  <td><div class="cell">Key数量</div></td>

                  <td><div class="cell" v-if="cache.dbSize">{{ cache.dbSize }} </div></td>

                  <td><div class="cell">网络入口/出口</div></td>

                  <td><div class="cell" v-if="cache.info">{{ cache.info.instantaneous_input_kbps }}kps/{{cache.info.instantaneous_output_kbps}}kps</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">AOF是否开启</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.aof_enabled == "0" ? "否" : "是" }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">RDB是否成功</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.rdb_last_bgsave_status }}</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">Key数量</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.dbSize">{{ cache.dbSize }} </div></td>

                  <td class="el-table__cell is-leaf"><div class="cell">网络入口/出口</div></td>

                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.instantaneous_input_kbps }}kps/{{cache.info.instantaneous_output_kbps}}kps</div></td>

                </tr>

              </tbody>

            </table>