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

疯狂的狮子li

2020-10-03 cc59e5ad89bd7dbf8b31040a472c4f6ca35ffd32

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


 Conflicts:

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

 pom.xml

@@ -86,11 +86,13 @@
            <dependency>

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

                <artifactId>jna</artifactId>

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

            </dependency>



            <dependency>

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

                <artifactId>jna-platform</artifactId>

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

            </dependency>

            

            <!-- swagger2-->


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

@@ -126,11 +126,11 @@
        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
        {
            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
        }
        else if (menu.getMenuId().equals(menu.getParentId()))
        {
            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
        }
        menu.setUpdateBy(SecurityUtils.getUsername());
        return toAjax(menuService.updateMenu(menu));