Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-config

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";
     }

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";

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";
     }

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:/";

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";
             }
         }
     });

src/main/webapp/pages/index.html

@@ -63,7 +63,7 @@
                 type: 2,
                 title: "修改密码",
                 shade: 0,
-                content: '${ctxPath}/changePassword'
+                content: '${ctxPath}/view/changePassword'
             });
         });
 

src/main/webapp/pages/layout/_header.html

@@ -29,7 +29,7 @@
             <a ew-event="fullScreen" title="全屏"><i class="layui-icon layui-icon-screen-full"></i></a>
         </li>
         <li class="layui-nav-item layui-hide-xs" lay-unselect>
-            <a ew-event="lockScreen" title="锁屏" data-url="${ctxPath}/lock"><i class="layui-icon layui-icon-password"></i></a>
+            <a ew-event="lockScreen" title="锁屏" data-url="${ctxPath}/view/lock"><i class="layui-icon layui-icon-password"></i></a>
         </li>
         <li class="layui-nav-item" lay-unselect>
             <a>
@@ -38,7 +38,7 @@
             </a>
             <dl class="layui-nav-child">
                 <dd lay-unselect>
-                    <a ew-href="${ctxPath}/personal">个人中心</a>
+                    <a ew-href="${ctxPath}/view/personal">个人中心</a>
                 </dd>
                 <dd lay-unselect>
                     <a id="setPsw">修改密码</a>
@@ -50,7 +50,7 @@
             </dl>
         </li>
         <li class="layui-nav-item" lay-unselect>
-            <a ew-event="theme" title="主题" data-url="${ctxPath}/theme"><i class="layui-icon layui-icon-more-vertical"></i></a>
+            <a ew-event="theme" title="主题" data-url="${ctxPath}/view/theme"><i class="layui-icon layui-icon-more-vertical"></i></a>
         </li>
     </ul>
 </div>

src/main/webapp/pages/layout/_sidebar.html

@@ -8,21 +8,21 @@
                 @if(objectUtil.isEmpty(menu.children)){
                 <li class="layui-nav-item">
                     @if(itemLP.first && menuLP.first){
-                    <a id="firstPageAction" lay-href="${menu.router}"><i class="layui-icon ${menu.icon}"></i>&emsp;<cite>${menu.menuName}</cite></a>
+                    <a id="firstPageAction" lay-href="${menu.layuiPath}"><i class="layui-icon ${menu.layuiIcon}"></i>&emsp;<cite>${menu.menuName}</cite></a>
                     @}else{
-                    <a lay-href="${menu.router}"><i class="layui-icon ${menu.icon}"></i>&emsp;<cite>${menu.menuName}</cite></a>
+                    <a lay-href="${menu.layuiPath}"><i class="layui-icon ${menu.layuiIcon}"></i>&emsp;<cite>${menu.menuName}</cite></a>
                     @}
                 </li>
                 @}else{
                 <li class="layui-nav-item">
-                    <a><i class="layui-icon ${menu.icon}"></i>&emsp;<cite>${menu.menuName}</cite></a>
+                    <a><i class="layui-icon ${menu.layuiIcon}"></i>&emsp;<cite>${menu.menuName}</cite></a>
                     <dl class="layui-nav-child">
                     @for(subMenu in menu.children){
                         @if(objectUtil.isEmpty(subMenu.children)){
                             @if(itemLP.first && menuLP.first && subMenuLP.first){
-                            <dd><a id="firstPageAction" lay-href="${subMenu.router}">${subMenu.menuName}</a></dd>
+                            <dd><a id="firstPageAction" lay-href="${subMenu.layuiPath}">${subMenu.menuName}</a></dd>
                             @}else{
-                            <dd><a lay-href="${subMenu.router}">${subMenu.menuName}</a></dd>
+                            <dd><a lay-href="${subMenu.layuiPath}">${subMenu.menuName}</a></dd>
                             @}
                         @}else{
                         <dd>
@@ -31,9 +31,9 @@
                             @for(subSubMenu in subMenu.children){
                                 @if(objectUtil.isEmpty(subSubMenu.children)){
                                     @if(itemLP.first && menuLP.first && subMenuLP.first && subSubMenuLP.first){
-                                    <dd><a id="firstPageAction" lay-href="${subSubMenu.router}">${subSubMenu.menuName}</a></dd>
+                                    <dd><a id="firstPageAction" lay-href="${subSubMenu.layuiPath}">${subSubMenu.menuName}</a></dd>
                                     @}else{
-                                    <dd><a lay-href="${subSubMenu.router}">${subSubMenu.menuName}</a></dd>
+                                    <dd><a lay-href="${subSubMenu.layuiPath}">${subSubMenu.menuName}</a></dd>
                                     @}
                                 @}else{
                                 <dd>
@@ -41,9 +41,9 @@
                                     <dl class="layui-nav-child">
                                     @for(subSubSubMenu in subSubMenu.children){
                                         @if(itemLP.first && menuLP.first && subMenuLP.first && subSubMenuLP.first && subSubSubMenuLP.first){
-                                        <dd><a id="firstPageAction" lay-href="${subSubSubMenu.router}">${subSubSubMenu.menuName}</a></dd>
+                                        <dd><a id="firstPageAction" lay-href="${subSubSubMenu.layuiPath}">${subSubSubMenu.menuName}</a></dd>
                                         @}else{
-                                        <dd><a lay-href="${subSubSubMenu.router}">${subSubSubMenu.menuName}</a></dd>
+                                        <dd><a lay-href="${subSubSubMenu.layuiPath}">${subSubSubMenu.menuName}</a></dd>
                                         @}
                                     @}
                                     </dl>

src/main/webapp/pages/modular/index/lock_screen.html

@@ -16,11 +16,11 @@
 </div>
 
 <script>
-    layui.use(['util', 'admin', 'ax'], function () {
+    layui.use(['util', 'admin', 'HttpRequest'], function () {
         var $ = layui.jquery;
         var util = layui.util;
         var admin = layui.admin;
-        var $ax = layui.ax;
+        var HttpRequest = layui.HttpRequest;
         var rightPsw = 'e10adc3949ba59abbe56e057f20f883e';  // 正确密码的MD5密文
 
         // 获取各个组件
@@ -36,13 +36,13 @@
             //解锁锁屏
             admin.unlockScreen();
 
-            var ajax = new $ax(Feng.ctxPath + "/logout", function (data) {
+            var request = new HttpRequest(Feng.ctxPath + "/logout", 'post', function (data) {
                 Feng.success("退出成功!");
                 location.replace(Feng.ctxPath + "/");
             }, function (data) {
-                layer.msg("退出失败！" + data.responseJSON.message, {icon: 5, anim: 6});
+                layer.msg("退出失败！" + data.message, {icon: 5, anim: 6});
             });
-            ajax.start();
+            request.start();
         });
 
         // 监听enter键