|
|
@ -12,9 +12,11 @@ import org.springframework.web.bind.annotation.PutMapping;
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
import com.ruoyi.common.constant.Constants;
|
|
|
|
import com.ruoyi.common.constant.UserConstants;
|
|
|
|
import com.ruoyi.common.constant.UserConstants;
|
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
|
import com.ruoyi.common.utils.ServletUtils;
|
|
|
|
import com.ruoyi.common.utils.ServletUtils;
|
|
|
|
|
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
|
import com.ruoyi.framework.aspectj.lang.annotation.Log;
|
|
|
|
import com.ruoyi.framework.aspectj.lang.annotation.Log;
|
|
|
|
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
|
|
|
|
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
|
|
|
|
import com.ruoyi.framework.security.LoginUser;
|
|
|
|
import com.ruoyi.framework.security.LoginUser;
|
|
|
@ -100,6 +102,11 @@ public class SysMenuController extends BaseController
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
|
|
|
|
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
|
|
|
|
|
|
|
|
&& !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
|
|
|
|
|
|
|
|
}
|
|
|
|
menu.setCreateBy(SecurityUtils.getUsername());
|
|
|
|
menu.setCreateBy(SecurityUtils.getUsername());
|
|
|
|
return toAjax(menuService.insertMenu(menu));
|
|
|
|
return toAjax(menuService.insertMenu(menu));
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -116,6 +123,11 @@ public class SysMenuController extends BaseController
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
|
|
|
|
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
|
|
|
|
|
|
|
|
&& !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
|
|
|
|
|
|
|
|
}
|
|
|
|
menu.setUpdateBy(SecurityUtils.getUsername());
|
|
|
|
menu.setUpdateBy(SecurityUtils.getUsername());
|
|
|
|
return toAjax(menuService.updateMenu(menu));
|
|
|
|
return toAjax(menuService.updateMenu(menu));
|
|
|
|
}
|
|
|
|
}
|
|
|
|