From e0a505eac9b9bfc84559c06cf457a7f08aaa8773 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 5 Jan 2021 15:10:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E7=9A=84url=E4=BB=A5/view=E5=BC=80?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/dashboard/DashboardViewController.java | 4 ++-- .../guns/modular/error/ErrorViewController.java | 2 +- .../modular/index/controller/IndexViewController.java | 10 +++++----- .../guns/modular/login/LoginViewController.java | 2 +- src/main/webapp/assets/common/js/common.js | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/cn/stylefeng/guns/modular/dashboard/DashboardViewController.java b/src/main/java/cn/stylefeng/guns/modular/dashboard/DashboardViewController.java index 7e59a4f5..872e6da0 100644 --- a/src/main/java/cn/stylefeng/guns/modular/dashboard/DashboardViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/dashboard/DashboardViewController.java @@ -22,7 +22,7 @@ public class DashboardViewController { * @author fengshuonan * @date 2018/12/24 22:43 */ - @GetResource(name = "工作台", path = "/dashboard/workplace", requiredPermission = false) + @GetResource(name = "工作台", path = "/view/dashboard/workplace", requiredPermission = false) public String platform() { return "/modular/blackboard/board_platform.html"; } @@ -33,7 +33,7 @@ public class DashboardViewController { * @author fengshuonan * @date 2020/12/29 21:27 */ - @GetResource(name = "分析页面", path = "/dashboard/analysis", requiredPermission = false) + @GetResource(name = "分析页面", path = "/view/dashboard/analysis", requiredPermission = false) public String analyse() { return "/modular/blackboard/board_analyse.html"; } diff --git a/src/main/java/cn/stylefeng/guns/modular/error/ErrorViewController.java b/src/main/java/cn/stylefeng/guns/modular/error/ErrorViewController.java index 600e4f5e..06ab88e0 100644 --- a/src/main/java/cn/stylefeng/guns/modular/error/ErrorViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/error/ErrorViewController.java @@ -21,7 +21,7 @@ public class ErrorViewController { * @author fengshuonan * @date 2021/1/1 21:21 */ - @GetResource(name = "跳转到session超时页面", path = "/global/sessionError", requiredPermission = false, requiredLogin = false) + @GetResource(name = "跳转到session超时页面", path = "/view/global/sessionError", requiredPermission = false, requiredLogin = false) public String errorPageInfo(Model model) { model.addAttribute("tips", "登陆超时，请您重新登陆！"); return "/login.html"; diff --git a/src/main/java/cn/stylefeng/guns/modular/index/controller/IndexViewController.java b/src/main/java/cn/stylefeng/guns/modular/index/controller/IndexViewController.java index c9fe7e60..da910b78 100644 --- a/src/main/java/cn/stylefeng/guns/modular/index/controller/IndexViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/index/controller/IndexViewController.java @@ -30,7 +30,7 @@ public class IndexViewController { * @author fengshuonan * @date 2020/12/13 17:19 */ - @GetResource(name = "首页界面", path = "/", requiredLogin = false, requiredPermission = false) + @GetResource(name = "首页界面", path = "/", requiredLogin = false, requiredPermission = false, viewFlag = true) public String indexView(Model model) { // 当前用户已经登录，跳转到首页 @@ -49,7 +49,7 @@ public class IndexViewController { * @author fengshuonan * @date 2020/12/29 21:53 */ - @GetResource(name = "个人中心界面", path = "/personal", requiredLogin = false) + @GetResource(name = "个人中心界面", path = "/view/personal", requiredLogin = false) public String personal(Model model) { model.addAllAttributes(indexService.createPersonInfoRenderAttributes()); return "/modular/index/personal_info.html"; @@ -61,7 +61,7 @@ public class IndexViewController { * @author fengshuonan * @date 2020/12/29 21:34 */ - @GetResource(name = "锁屏界面", path = "/lock", requiredPermission = false) + @GetResource(name = "锁屏界面", path = "/view/lock", requiredPermission = false) public String lock() { return "/modular/index/lock_screen.html"; } @@ -72,7 +72,7 @@ public class IndexViewController { * @author fengshuonan * @date 2020/12/29 21:42 */ - @GetResource(name = "主题切换界面", path = "/theme", requiredPermission = false) + @GetResource(name = "主题切换界面", path = "/view/theme", requiredPermission = false) public String theme() { return "/modular/index/theme.html"; } @@ -83,7 +83,7 @@ public class IndexViewController { * @author fengshuonan * @date 2020/12/29 21:42 */ - @GetResource(name = "修改密码界面", path = "/changePassword", requiredPermission = false) + @GetResource(name = "修改密码界面", path = "/view/changePassword", requiredPermission = false) public String changePassword() { return "/modular/index/change_password.html"; } diff --git a/src/main/java/cn/stylefeng/guns/modular/login/LoginViewController.java b/src/main/java/cn/stylefeng/guns/modular/login/LoginViewController.java index 58d3ef6a..1ed4beb0 100644 --- a/src/main/java/cn/stylefeng/guns/modular/login/LoginViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/login/LoginViewController.java @@ -37,7 +37,7 @@ public class LoginViewController { * @author fengshuonan * @date 2020/12/27 17:10 */ - @GetResource(name = "登录界面", path = "/login", requiredPermission = false, requiredLogin = false) + @GetResource(name = "登录界面", path = "/view/login", requiredPermission = false, requiredLogin = false) public String login() { if (LoginContext.me().hasLogin()) { return "redirect:/"; diff --git a/src/main/webapp/assets/common/js/common.js b/src/main/webapp/assets/common/js/common.js index 7bb086b0..b202bdf6 100644 --- a/src/main/webapp/assets/common/js/common.js +++ b/src/main/webapp/assets/common/js/common.js @@ -158,7 +158,7 @@ layui.config({ complete: function (XMLHttpRequest, textStatus) { //如果超时就处理 ，指定要跳转的页面 if (XMLHttpRequest.getResponseHeader("Guns-Session-Timeout") === "true") { - window.location = Feng.ctxPath + "/global/sessionError"; + window.location = Feng.ctxPath + "/view/global/sessionError"; } } }); From da1a60f216c33f4dcf5370f735f311230c3407ad Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 5 Jan 2021 16:35:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=86=E5=9B=BE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E4=B8=8A/view=E5=BC=80=E5=A4=B4=EF=BC=8C?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=88=97=E8=A1=A8=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/pages/index.html | 2 +- src/main/webapp/pages/layout/_header.html | 6 +++--- src/main/webapp/pages/layout/_sidebar.html | 18 +++++++++--------- .../pages/modular/index/lock_screen.html | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/webapp/pages/index.html b/src/main/webapp/pages/index.html index 0f34acf5..e7d9e2ff 100644 --- a/src/main/webapp/pages/index.html +++ b/src/main/webapp/pages/index.html @@ -63,7 +63,7 @@ type: 2, title: "修改密码", shade: 0, - content: '${ctxPath}/changePassword' + content: '${ctxPath}/view/changePassword' }); }); diff --git a/src/main/webapp/pages/layout/_header.html b/src/main/webapp/pages/layout/_header.html index 9764a549..ba49b134 100644 --- a/src/main/webapp/pages/layout/_header.html +++ b/src/main/webapp/pages/layout/_header.html @@ -29,7 +29,7 @@
  • - +
  • @@ -38,7 +38,7 @@
    - 个人中心 + 个人中心
    修改密码 @@ -50,7 +50,7 @@
  • - +
    • \ No newline at end of file diff --git a/src/main/webapp/pages/layout/_sidebar.html b/src/main/webapp/pages/layout/_sidebar.html index c42d05f9..e716562e 100644 --- a/src/main/webapp/pages/layout/_sidebar.html +++ b/src/main/webapp/pages/layout/_sidebar.html @@ -8,21 +8,21 @@ @if(objectUtil.isEmpty(menu.children)){
  • @if(itemLP.first && menuLP.first){ -  ${menu.menuName} +  ${menu.menuName} @}else{ -  ${menu.menuName} +  ${menu.menuName} @}
    • @}else{
  • -  ${menu.menuName} +  ${menu.menuName}
    @for(subMenu in menu.children){ @if(objectUtil.isEmpty(subMenu.children)){ @if(itemLP.first && menuLP.first && subMenuLP.first){ -
    ${subMenu.menuName}
    +
    ${subMenu.menuName}
    @}else{ -
    ${subMenu.menuName}
    +
    ${subMenu.menuName}
    @} @}else{
    @@ -31,9 +31,9 @@ @for(subSubMenu in subMenu.children){ @if(objectUtil.isEmpty(subSubMenu.children)){ @if(itemLP.first && menuLP.first && subMenuLP.first && subSubMenuLP.first){ -
    ${subSubMenu.menuName}
    +
    ${subSubMenu.menuName}
    @}else{ -
    ${subSubMenu.menuName}
    +
    ${subSubMenu.menuName}
    @} @}else{
    @@ -41,9 +41,9 @@
    @for(subSubSubMenu in subSubMenu.children){ @if(itemLP.first && menuLP.first && subMenuLP.first && subSubMenuLP.first && subSubSubMenuLP.first){ -
    ${subSubSubMenu.menuName}
    +
    ${subSubSubMenu.menuName}
    @}else{ -
    ${subSubSubMenu.menuName}
    +
    ${subSubSubMenu.menuName}
    @} @}
    diff --git a/src/main/webapp/pages/modular/index/lock_screen.html b/src/main/webapp/pages/modular/index/lock_screen.html index 636383f9..7e3433f9 100644 --- a/src/main/webapp/pages/modular/index/lock_screen.html +++ b/src/main/webapp/pages/modular/index/lock_screen.html @@ -16,11 +16,11 @@