更新视图的目录结构

src/main/java/cn/stylefeng/guns/modular/system/api/ApiViewController.java

@@ -22,7 +22,7 @@ public class ApiViewController {
      */
     @GetResource(name = "API文档界面", path = "/view/api")
     public String apiIndex() {
-        return "/modular/api/api.html";
+        return "/modular/system/api/api.html";
     }
 
 }

src/main/java/cn/stylefeng/guns/modular/system/app/AppViewController.java

@@ -22,7 +22,7 @@ public class AppViewController {
      */
     @GetResource(name = "应用管理首页", path = "/view/app")
     public String appIndex() {
-        return "/modular/auth/app/app.html";
+        return "/modular/system/app/app.html";
     }
 
     /**
@@ -33,7 +33,7 @@ public class AppViewController {
      */
     @GetResource(name = "新增应用界面", path = "/view/app/add")
     public String appAdd() {
-        return "/modular/auth/app/app_add.html";
+        return "/modular/system/app/app_add.html";
     }
 
     /**
@@ -44,7 +44,7 @@ public class AppViewController {
      */
     @GetResource(name = "编辑应用界面", path = "/view/app/edit")
     public String appEdit() {
-        return "/modular/auth/app/app_edit.html";
+        return "/modular/system/app/app_edit.html";
     }
 
 }

src/main/java/cn/stylefeng/guns/modular/system/common/CommonViewController.java

@@ -40,7 +40,7 @@ public class CommonViewController {
             log.error("解析url的参数出错！", e);
             throw new ServiceException("guns-standalone-beetl", DefaultBusinessExceptionEnum.SYSTEM_RUNTIME_ERROR);
         }
-        return "/modular/common/tree_dlg.html";
+        return "/component/tree_dlg.html";
     }
 
 }

src/main/java/cn/stylefeng/guns/modular/system/config/ConfigViewController.java

@@ -22,7 +22,7 @@ public class ConfigViewController {
      */
     @GetResource(name = "系统配置-列表-视图", path = "/view/config")
     public String indexView() {
-        return "/modular/sysConfig/sysConfig.html";
+        return "/modular/system/config/sysConfig.html";
     }
 
     /**
@@ -33,7 +33,7 @@ public class ConfigViewController {
      */
     @GetResource(name = "系统配置—新增-视图", path = "/view/config/addView")
     public String addView() {
-        return "/modular/sysConfig/sysConfig_add.html";
+        return "/modular/system/config/sysConfig_add.html";
     }
 
     /**
@@ -44,7 +44,7 @@ public class ConfigViewController {
      */
     @GetResource(name = "系统配置-修改-视图", path = "/view/config/editView")
     public String editView() {
-        return "/modular/sysConfig/sysConfig_edit.html";
+        return "/modular/system/config/sysConfig_edit.html";
     }
 
 }

src/main/java/cn/stylefeng/guns/modular/system/dashboard/DashboardViewController.java

@@ -22,7 +22,7 @@ public class DashboardViewController {
      */
     @GetResource(name = "工作台", path = "/view/dashboard/workplace", requiredPermission = false)
     public String platform() {
-        return "/modular/dashboard/board_platform.html";
+        return "/modular/system/dashboard/board_platform.html";
     }
 
     /**
@@ -33,7 +33,7 @@ public class DashboardViewController {
      */
     @GetResource(name = "分析页面", path = "/view/dashboard/analysis", requiredPermission = false)
     public String analyse() {
-        return "/modular/dashboard/board_analyse.html";
+        return "/modular/system/dashboard/board_analyse.html";
     }
 
 }

src/main/java/cn/stylefeng/guns/modular/system/datasource/DataSourceViewController.java

@@ -22,7 +22,7 @@ public class DataSourceViewController {
      */
     @GetResource(name = "多数据源列表界面", path = "/view/datasource")
     public String indexView() {
-        return "/modular/datasource/datasource.html";
+        return "/modular/system/datasource/datasource.html";
     }
 
     /**
@@ -33,7 +33,7 @@ public class DataSourceViewController {
      */
     @GetResource(name = "多数据源新增界面", path = "/view/datasource/add")
     public String addView() {
-        return "/modular/datasource/datasource_add.html";
+        return "/modular/system/datasource/datasource_add.html";
     }
 
 

src/main/java/cn/stylefeng/guns/modular/system/dict/DictTypeViewController.java

@@ -15,8 +15,6 @@ import org.springframework.stereotype.Controller;
 @ApiResource(name = "字典类型管理相关的界面渲染")
 public class DictTypeViewController {
 
-    private String PREFIX = "/modular/system/dict/";
-
     /**
      * 字典管理-视图
      *
@@ -25,7 +23,7 @@ public class DictTypeViewController {
      */
     @GetResource(name = "字典类型管理-列表-视图", path = "/view/dictType")
     public String indexView() {
-        return PREFIX + "dictType.html";
+        return "/modular/system/dict/dictType.html";
     }
 
     /**
@@ -36,10 +34,9 @@ public class DictTypeViewController {
      */
     @GetResource(name = "字典类型管理-添加-视图", path = "/view/dictType/addView")
     public String addView() {
-        return PREFIX + "dictType_add.html";
+        return "/modular/system/dict/dictType_add.html";
     }
 
-
     /**
      * 字典类型管理-编辑-视图
      *
@@ -48,8 +45,7 @@ public class DictTypeViewController {
      */
     @GetResource(name = "字典类型管理-编辑-视图", path = "/view/dictType/editView")
     public String editView() {
-        return PREFIX + "dictType_edit.html";
+        return "/modular/system/dict/dictType_edit.html";
     }
 
-
 }

src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java

@@ -14,9 +14,6 @@ import org.springframework.stereotype.Controller;
 @ApiResource(name = "字典管理相关的界面渲染")
 public class DictViewController {
 
-
-    private String PREFIX = "/modular/system/dict/";
-
     /**
      * 字典管理-列表-视图
      *
@@ -25,7 +22,7 @@ public class DictViewController {
      */
     @GetResource(name = "字典管理-列表-视图", path = "/view/dict")
     public String indexView() {
-        return PREFIX + "dict.html";
+        return "/modular/system/dict/dict.html";
     }
 
     /**
@@ -36,7 +33,7 @@ public class DictViewController {
      */
     @GetResource(name = "字典管理-添加-视图", path = "/view/dict/addView")
     public String addView() {
-        return PREFIX + "dict_add.html";
+        return "/modular/system/dict/dict_add.html";
     }
 
     /**
@@ -47,7 +44,7 @@ public class DictViewController {
      */
     @GetResource(name = "字典管理-编辑-视图", path = "/view/dict/editView")
     public String editView() {
-        return PREFIX + "dict_edit.html";
+        return "/modular/system/dict/dict_edit.html";
     }
 
 }

src/main/java/cn/stylefeng/guns/modular/system/index/controller/IndexViewController.java

@@ -50,7 +50,7 @@ public class IndexViewController {
     @GetResource(name = "个人中心界面", path = "/view/personal", requiredLogin = false)
     public String personal(Model model) {
         model.addAllAttributes(indexService.createPersonInfoRenderAttributes());
-        return "/modular/index/personal_info.html";
+        return "/modular/system/index/personal_info.html";
     }
 
     /**
@@ -61,7 +61,7 @@ public class IndexViewController {
      */
     @GetResource(name = "锁屏界面", path = "/view/lock", requiredPermission = false)
     public String lock() {
-        return "/modular/index/lock_screen.html";
+        return "/modular/system/index/lock_screen.html";
     }
 
     /**
@@ -72,7 +72,7 @@ public class IndexViewController {
      */
     @GetResource(name = "主题切换界面", path = "/view/theme", requiredPermission = false)
     public String theme() {
-        return "/modular/index/theme.html";
+        return "/modular/system/index/theme.html";
     }
 
     /**
@@ -83,7 +83,7 @@ public class IndexViewController {
      */
     @GetResource(name = "修改密码界面", path = "/view/changePassword", requiredPermission = false)
     public String changePassword() {
-        return "/modular/index/change_password.html";
+        return "/modular/system/index/change_password.html";
     }
 
 }

src/main/java/cn/stylefeng/guns/modular/system/menu/MenuButtonViewController.java

@@ -22,7 +22,7 @@ public class MenuButtonViewController {
      */
     @GetResource(name = "菜单管理首页", path = "/view/menuButton")
     public String menuIndex() {
-        return "/modular/auth/menu/button.html";
+        return "/modular/system/menu/button.html";
     }
 
     /**
@@ -33,7 +33,7 @@ public class MenuButtonViewController {
      */
     @GetResource(name = "新增菜单按钮界面", path = "/view/menuButton/add")
     public String menuAdd() {
-        return "/modular/auth/menu/button_add.html";
+        return "/modular/system/menu/button_add.html";
     }
 
     /**
@@ -44,7 +44,7 @@ public class MenuButtonViewController {
      */
     @GetResource(name = "修改菜单按钮界面", path = "/view/menuButton/edit")
     public String menuEdit() {
-        return "/modular/auth/menu/button_edit.html";
+        return "/modular/system/menu/button_edit.html";
     }
 
 }

src/main/java/cn/stylefeng/guns/modular/system/menu/MenuViewController.java

@@ -22,7 +22,7 @@ public class MenuViewController {
      */
     @GetResource(name = "菜单管理首页", path = "/view/menu")
     public String menuIndex() {
-        return "/modular/auth/menu/menu.html";
+        return "/modular/system/menu/menu.html";
     }
 
     /**
@@ -33,7 +33,7 @@ public class MenuViewController {
      */
     @GetResource(name = "新增菜单界面", path = "/view/menu/add")
     public String menuAdd() {
-        return "/modular/auth/menu/menu_add.html";
+        return "/modular/system/menu/menu_add.html";
     }
 
     /**
@@ -44,7 +44,7 @@ public class MenuViewController {
      */
     @GetResource(name = "修改菜单界面", path = "/view/menu/edit")
     public String menuEdit() {
-        return "/modular/auth/menu/menu_edit.html";
+        return "/modular/system/menu/menu_edit.html";
     }
 
 }

src/main/java/cn/stylefeng/guns/modular/system/message/MessageViewController.java

@@ -39,7 +39,7 @@ public class MessageViewController {
         List<MessageResponse> messageList = messageApi.queryListCurrentUser(messageParam);
         model.addAttribute("msgUnReadCount", messageCount);
         model.addAttribute("msgUnReadList", messageList);
-        return "/modular/index/message.html";
+        return "/modular/system/index/message.html";
     }
 
     /**

src/main/java/cn/stylefeng/guns/modular/system/monitor/controller/MonitorController.java

@@ -53,7 +53,7 @@ public class MonitorController {
         SystemHardwareWrapper systemHardwareWrapper = new SystemHardwareWrapper();
         systemHardwareWrapper.copyTo();
         model.addAttribute("server", systemHardwareWrapper);
-        return "/modular/frame/systemInfo.html";
+        return "/modular/system/monitor/systemInfo.html";
     }
 
     /**
@@ -65,7 +65,7 @@ public class MonitorController {
     @GetResource(name = "SQL监控", path = "/view/monitor/druid")
     public String druidInfo(Model model) {
         model.addAttribute("port", port);
-        return "/modular/frame/druid.html";
+        return "/modular/system/monitor/druid.html";
     }
 
     /**
@@ -77,7 +77,7 @@ public class MonitorController {
     @GetResource(name = "tomcat监控", path = "/view/monitor/tomcatInfo")
     public String tomcatInfo(Model model) {
         getMetricInfos("tomcat_", model);
-        return "/modular/frame/tomcatInfo.html";
+        return "/modular/system/monitor/tomcatInfo.html";
     }
 
     /**
@@ -89,7 +89,7 @@ public class MonitorController {
     @GetResource(name = "jvm监控", path = "/view/monitor/jvmInfo")
     public String jvmInfo(Model model) {
         getMetricInfos("jvm_", model);
-        return "/modular/frame/jvmInfo.html";
+        return "/modular/system/monitor/jvmInfo.html";
     }
 
     /**

src/main/java/cn/stylefeng/guns/modular/system/notice/NoticeViewController.java

@@ -47,37 +47,4 @@ public class NoticeViewController {
         return "/modular/system/notice/notice_edit.html";
     }
 
-    /**
-     * 修改数据范围界面
-     *
-     * @author liuhanqing
-     * @date 2021/1/8 20:57
-     */
-    @GetResource(name = "修改数据范围界面", path = "/view/notice/editDataScope")
-    public String roleEditDataScope() {
-        return "/modular/system/notice/notice_edit_data_scope.html";
-    }
-
-    /**
-     * 分配接口界面
-     *
-     * @author majianguo
-     * @date 2021/1/9 11:43
-     */
-    @GetResource(name = "分配接口界面", path = "/view/notice/assignApi")
-    public String roleAssignApi() {
-        return "/modular/system/notice/notice_assign_api.html";
-    }
-
-    /**
-     * 分配菜单和按钮界面
-     *
-     * @author majianguo
-     * @date 2021/1/9 11:45
-     */
-    @GetResource(name = "分配菜单界面", path = "/view/notice/assignMenuAndButtons")
-    public String roleAssignMenuButton() {
-        return "/modular/system/notice/notice_assign_menu_button.html";
-    }
-
 }

src/main/java/cn/stylefeng/guns/modular/system/online/OnlineUserViewController.java

@@ -1,4 +1,4 @@
-package cn.stylefeng.guns.modular.system.user;
+package cn.stylefeng.guns.modular.system.online;
 
 import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;

src/main/java/cn/stylefeng/guns/modular/system/resource/ResourceViewController.java

@@ -22,7 +22,7 @@ public class ResourceViewController {
      */
     @GetResource(name = "资源管理首页", path = "/view/resource")
     public String resourceIndex() {
-        return "/modular/auth/resource/resource.html";
+        return "/modular/system/resource/resource.html";
     }
 
     /**
@@ -33,7 +33,7 @@ public class ResourceViewController {
      */
     @GetResource(name = "资源管理详情", path = "/view/resource/detail")
     public String resourceDetail() {
-        return "/modular/auth/resource/resource_detail.html";
+        return "/modular/system/resource/resource_detail.html";
     }
 
 }

src/main/java/cn/stylefeng/guns/modular/system/role/RoleViewController.java

@@ -22,7 +22,7 @@ public class RoleViewController {
      */
     @GetResource(name = "应用管理首页", path = "/view/role")
     public String roleIndex() {
-        return "/modular/auth/role/role.html";
+        return "/modular/system/role/role.html";
     }
 
     /**
@@ -33,7 +33,7 @@ public class RoleViewController {
      */
     @GetResource(name = "新增角色界面", path = "/view/role/add")
     public String roleAdd() {
-        return "/modular/auth/role/role_add.html";
+        return "/modular/system/role/role_add.html";
     }
 
     /**
@@ -44,7 +44,7 @@ public class RoleViewController {
      */
     @GetResource(name = "编辑角色界面", path = "/view/role/edit")
     public String roleEdit() {
-        return "/modular/auth/role/role_edit.html";
+        return "/modular/system/role/role_edit.html";
     }
 
     /**
@@ -55,7 +55,7 @@ public class RoleViewController {
      */
     @GetResource(name = "修改数据范围界面", path = "/view/role/editDataScope")
     public String roleEditDataScope() {
-        return "/modular/auth/role/role_edit_data_scope.html";
+        return "/modular/system/role/role_edit_data_scope.html";
     }
 
     /**
@@ -66,7 +66,7 @@ public class RoleViewController {
      */
     @GetResource(name = "分配接口界面", path = "/view/role/assignApi")
     public String roleAssignApi() {
-        return "/modular/auth/role/role_assign_api.html";
+        return "/modular/system/role/role_assign_api.html";
     }
 
     /**
@@ -77,7 +77,7 @@ public class RoleViewController {
      */
     @GetResource(name = "分配菜单界面", path = "/view/role/assignMenuAndButtons")
     public String roleAssignMenuButton() {
-        return "/modular/auth/role/role_assign_menu_button.html";
+        return "/modular/system/role/role_assign_menu_button.html";
     }
 
 }

src/main/java/cn/stylefeng/guns/modular/system/user/UserViewController.java

@@ -66,7 +66,7 @@ public class UserViewController {
      */
     @GetResource(name = "用户管理-注册-视图", path = "/register", requiredPermission = false, requiredLogin = false)
     public String registerView() {
-        return "register.html";
+        return "/register.html";
     }
 
     /**
@@ -77,7 +77,7 @@ public class UserViewController {
      */
     @GetResource(name = "用户管理-找回密码-视图", path = "/forget", requiredPermission = false, requiredLogin = false)
     public String forgetView() {
-        return "forget.html";
+        return "/forget.html";
     }
 
 }

src/main/webapp/assets/modular/business/readme.md

@@ -0,0 +1 @@
+# 这里写具体项目的业务的代码

src/main/webapp/assets/modular/system/log/log_deatil.js

@@ -1,19 +0,0 @@
-/**
- * 详情对话框
- */
-var SysLogInfoDlg = {
-    data: {
-        logId: "",
-    }
-};
-
-layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest', 'iconPicker'], function () {
-    var $ = layui.jquery;
-    var HttpRequest = layui.HttpRequest;
-    var form = layui.form;
-
-    //获取菜单信息
-    var request = new HttpRequest(Feng.ctxPath + "/logManager/detail?logId=" + Feng.getUrlParam("logId"), 'get');
-    var sysLogResult = request.start();
-    form.val('sysLogForm', sysLogResult.data);
-});

src/main/webapp/pages/component/view_hide.html

@@ -18,7 +18,7 @@
         color: #ff0000;
     }
 </style>
-<script type="text/javascript" src="${ctxPath}/assets/modular/system/common/form.all.js?v=${constants.getReleaseVersion()}"></script>
+<script type="text/javascript" src="${ctxPath}/assets/expand/plugins/form/form.all.js?v=${constants.getReleaseVersion()}"></script>
 
 <script type="text/javascript">
 

src/main/webapp/pages/modular/business/readme.md

@@ -0,0 +1 @@
+# 这里写具体项目的业务的代码

src/main/webapp/pages/modular/frame/user_chpwd.html

@@ -1,50 +0,0 @@
-@layout("/layout/_container.html",{plugins:["sweet-alert"],js:["/assets/modular/system/user/user_chpwd.js"]}){
-<div class="row">
-    <div class="col-lg-12">
-        <div class="card card-outline-theme">
-            <div class="card-header">
-                <h4 class="m-b-0 text-white">修改密码</h4>
-            </div>
-            <div class="card-body" style="padding: 50px;">
-                <div class="form-horizontal" id="passwordForm">
-                    <div class="form-body">
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="form-group row m-b-15">
-                                    <label class="control-label text-left col-md-2 col-sm-5">旧密码</label>
-                                    <div class="col-md-10 col-sm-7">
-                                        <input type="password" v-model="oldPassword" class="form-control" autocomplete="false">
-                                    </div>
-                                </div>
-                                <div class="form-group row m-b-15">
-                                    <label class="control-label text-left col-md-2 col-sm-5">新密码</label>
-                                    <div class="col-md-10 col-sm-7">
-                                        <input type="password" v-model="newPassword" class="form-control" autocomplete="false">
-                                    </div>
-                                </div>
-                                <div class="form-group row m-b-5">
-                                    <label class="control-label text-left col-md-2 col-sm-5">确认新密码</label>
-                                    <div class="col-md-10 col-sm-7">
-                                        <input type="password" v-model="repeatPassword" class="form-control" autocomplete="false">
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <hr/>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <button class="btn btn-info waves-effect" type="button" id="saveButton" \@click="ensure">
-                                    <i class="ace-icon fa fa-check"></i> 保存
-                                </button>
-                                <button class="btn btn-danger waves-effect m-l-10" type="button" id="closeButton" \@click="reset">
-                                    <i class="ace-icon fa fa-close"></i> 重置
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@}

src/main/webapp/pages/modular/system/api/api.html

@@ -1,4 +1,4 @@
-@layout("/layout/_container.html",{js:["/assets/modular/api/api.js"]}){
+@layout("/layout/_container.html", {js:["/assets/modular/system/api/api.js"]}){
 <style>
     /* 左树 */
     #organizationTreeBar {
@@ -131,4 +131,4 @@
     </div>
 </div>
 
-@}
+@}

src/main/webapp/pages/modular/system/app/app.html

@@ -1,4 +1,4 @@
-@layout("/layout/_container.html", {js:["/assets/modular/auth/app/app.js"]}){
+@layout("/layout/_container.html", {js:["/assets/modular/system/app/app.js"]}){
 
 <div class="layui-body-header">
     <span class="layui-body-header-title">应用管理</span>

src/main/webapp/pages/modular/system/app/app_add.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/auth/app/app_add.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/app/app_add.js"]}){
 
 <form class="layui-form" id="appForm" lay-filter="appForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">

src/main/webapp/pages/modular/system/app/app_edit.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/auth/app/app_edit.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/app/app_edit.js"]}){
 
 <form class="layui-form" id="appForm" lay-filter="appForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">

src/main/webapp/pages/modular/system/config/sysConfig.html

@@ -1,4 +1,4 @@
-@layout("/layout/_container.html",{js:["/assets/modular/sysConfig/sysConfig.js"]}){
+@layout("/layout/_container.html",{js:["/assets/modular/system/sysConfig/sysConfig.js"]}){
 
 <div class="layui-body-header">
     <span class="layui-body-header-title">参数配置管理</span>
@@ -32,4 +32,4 @@
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
 </script>
-@}
+@}

src/main/webapp/pages/modular/system/config/sysConfig_add.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/sysConfig/sysConfig_add.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/sysConfig/sysConfig_add.js"]}){
 <form class="layui-form" id="sysConfigForm" lay-filter="sysConfigForm" >
     <div class="layui-fluid " style="">
         <div class="layui-card">
@@ -59,4 +59,4 @@
         <button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
     </div>
 </form>
-@}
+@}

src/main/webapp/pages/modular/system/config/sysConfig_edit.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/sysConfig/sysConfig_edit.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/sysConfig/sysConfig_edit.js"]}){
 
 <form class="layui-form" id="sysConfigForm" lay-filter="sysConfigForm" >
     <div class="layui-fluid" style="padding-bottom: 75px;">
@@ -61,4 +61,4 @@
     </div>
 </form>
 
-@}
+@}

src/main/webapp/pages/modular/system/datasource/datasource.html

@@ -1,4 +1,4 @@
-@layout("/layout/_container.html",{js:["/assets/modular/datasource/datasource.js"]}){
+@layout("/layout/_container.html",{js:["/assets/modular/system/datasource/datasource.js"]}){
 
 <div class="layui-body-header">
     <span class="layui-body-header-title">数据库信息表管理</span>

src/main/webapp/pages/modular/system/datasource/datasource_add.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/datasource/datasource_add.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/datasource/datasource_add.js"]}){
 <form class="layui-form" id="databaseInfoForm" lay-filter="databaseInfoForm">
     <div class="layui-fluid">
         <div class="layui-card">

src/main/webapp/pages/modular/system/dept/dept.html

@@ -1,53 +0,0 @@
-@layout("/layout/_tree_container.html",{plugins:["jquery-layout"],js:["/assets/modular/system/dept/dept.js"]}){
-
-<div class="layui-body-header">
-    <span class="layui-body-header-title">部门管理</span>
-</div>
-
-<div id="myContiner" style="height: 100%">
-    <div class="ui-layout-west">
-        <div class="box box-main">
-            <div class="ui-layout-content">
-                <div id="deptTree"></div>
-            </div>
-        </div>
-    </div>
-
-    <div class="ui-layout-center">
-        <div class="layui-fluid">
-            <div class="layui-row">
-                <div class="layui-col-md12">
-                    <div class="layui-card">
-                        <div class="layui-card-body">
-                            <div class="layui-form toolbar">
-                                <div class="layui-form-item">
-                                    <div class="layui-inline">
-                                        <input id="name" class="layui-input" type="text" placeholder="部门名称"/>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <button id="btnSearch" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                        @if(shiro.hasPermission("/dept/add")){
-                                        <button id="btnAdd" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
-                                        @}
-                                        <button id="btnExp" class="layui-btn icon-btn"><i class="layui-icon">&#xe67d;</i>导出</button>
-                                    </div>
-                                </div>
-                            </div>
-                            <table class="layui-table" id="deptTable" lay-filter="deptTable"></table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script type="text/html" id="tableBar">
-    @if(shiro.hasPermission("/dept/update")){
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
-    @}
-    @if(shiro.hasPermission("/dept/delete")){
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
-    @}
-</script>
-@}

src/main/webapp/pages/modular/system/dept/dept_add.html

@@ -1,51 +0,0 @@
-@layout("/layout/_form.html",{js:["/assets/modular/system/dept/dept_add.js"]}){
-
-<form class="layui-form" id="deptForm" lay-filter="deptForm">
-    <div class="layui-fluid" style="padding-bottom: 75px;">
-        <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
-            <div class="layui-card-body">
-                <div class="layui-form-item layui-row">
-                    <input name="deptId" type="hidden"/>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">部门名称<span style="color: red;">*</span></label>
-                        <div class="layui-input-block">
-                            <input name="simpleName" placeholder="请输入部门名称" type="text" class="layui-input" lay-verify="required" required/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">上级名称<span style="color: red;">*</span></label>
-                        <div class="layui-input-block">
-                            <input id="pid" name="pid" type="hidden">
-                            <input id="pName" name="pName" placeholder="请输入上级名称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">部门全称<span style="color: red;">*</span></label>
-                        <div class="layui-input-block">
-                            <input id="fullName" name="fullName" placeholder="请输入部门全称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">备注</label>
-                        <div class="layui-input-block">
-                            <input name="description" placeholder="请输入备注" type="text" class="layui-input"/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">排序</label>
-                        <div class="layui-input-block">
-                            <input name="sort" placeholder="请输入排序" type="text" class="layui-input"/>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="form-group-bottom text-center">
-        <button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
-        <button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
-    </div>
-
-</form>
-@}

src/main/webapp/pages/modular/system/dept/dept_edit.html

@@ -1,51 +0,0 @@
-@layout("/layout/_form.html",{js:["/assets/modular/system/dept/dept_edit.js"]}){
-
-<form class="layui-form" id="deptForm" lay-filter="deptForm">
-    <div class="layui-fluid" style="padding-bottom: 75px;">
-        <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
-            <div class="layui-card-body">
-                <div class="layui-form-item layui-row">
-                    <input name="deptId" type="hidden"/>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">部门名称<span style="color: red;">*</span></label>
-                        <div class="layui-input-block">
-                            <input name="simpleName" placeholder="请输入部门名称" type="text" class="layui-input" lay-verify="required" required/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">上级名称<span style="color: red;">*</span></label>
-                        <div class="layui-input-block">
-                            <input id="pid" name="pid" type="hidden">
-                            <input id="pName" name="pName" placeholder="请输入上级名称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">部门全称<span style="color: red;">*</span></label>
-                        <div class="layui-input-block">
-                            <input id="fullName" name="fullName" placeholder="请输入部门全称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">备注</label>
-                        <div class="layui-input-block">
-                            <input name="description" placeholder="请输入备注" type="text" class="layui-input"/>
-                        </div>
-                    </div>
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">排序</label>
-                        <div class="layui-input-block">
-                            <input name="sort" placeholder="请输入排序" type="text" class="layui-input"/>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="form-group-bottom text-center">
-        <button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
-        <button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
-    </div>
-
-</form>
-@}

src/main/webapp/pages/modular/system/index/change_password.html

@@ -1,4 +1,4 @@
-@layout("/layout/_container.html", {title:"修改密码", bg:"bg-white", js:["/assets/modular/frame/password.js"]}){
+@layout("/layout/_container.html", {title:"修改密码", bg:"bg-white", js:["/assets/modular/system/index/password.js"]}){
 <div class="layui-form model-form" id="form-psw">
     <div class="layui-form-item">
         <label class="layui-form-label">旧密码:</label>
@@ -28,4 +28,4 @@
         </div>
     </div>
 </div>
-@}
+@}

src/main/webapp/pages/modular/system/index/message.html

@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="${ctxPath}/assets/modular/frame/message.css"/>
+<link rel="stylesheet" href="${ctxPath}/assets/modular/system/index/message.css"/>
 <div class="layui-card" style="box-shadow: none;border: none;">
     <div class="layui-tab layui-tab-brief">
         <ul class="layui-tab-title" style="text-align: center;">
@@ -39,4 +39,4 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="${ctxPath}/assets/modular/frame/message.js"></script>
+<script type="text/javascript" src="${ctxPath}/assets/modular/frame/message.js"></script>

src/main/webapp/pages/modular/system/index/personal_info.html

@@ -1,4 +1,4 @@
-@layout("/layout/_container.html", {title:"个人中心", css:["/assets/modular/frame/user_info.css"], js:["/assets/modular/frame/personal_info.js"]}){
+@layout("/layout/_container.html", {title:"个人中心", css:["/assets/modular/system/index/user_info.css"], js:["/assets/modular/system/index/personal_info.js"]}){
 <div class="layui-body-header">
     <span class="layui-body-header-title">个人信息</span>
     <span class="layui-breadcrumb pull-right">
@@ -156,4 +156,4 @@
 
     </div>
 </div>
-@}
+@}

src/main/webapp/pages/modular/system/menu/button.html

@@ -1,4 +1,4 @@
-@layout("/layout/_container.html",{js:["/assets/modular/auth/menu/button.js"]}){
+@layout("/layout/_container.html",{js:["/assets/modular/system/menu/button.js"]}){
 
 
 <div class="layui-body-header">

src/main/webapp/pages/modular/system/menu/button_add.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/auth/menu/button_add.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/menu/button_add.js"]}){
 
 <form class="layui-form" id="menuButtonForm" lay-filter="menuButtonForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">

src/main/webapp/pages/modular/system/menu/button_edit.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/auth/menu/button_edit.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/menu/button_edit.js"]}){
 
 <form class="layui-form" id="menuButtonForm" lay-filter="menuButtonForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">

src/main/webapp/pages/modular/system/menu/menu.html

@@ -1,4 +1,4 @@
-@layout("/layout/_container.html",{plugins:["ztree"], js:["/assets/modular/auth/menu/menu.js"]}){
+@layout("/layout/_container.html",{plugins:["ztree"], js:["/assets/modular/system/menu/menu.js"]}){
 
 <div class="layui-body-header">
     <span class="layui-body-header-title">菜单管理</span>

src/main/webapp/pages/modular/system/menu/menu_add.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/auth/menu/menu_add.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/menu/menu_add.js"]}){
 
 <form class="layui-form" id="menuForm" lay-filter="menuForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">

src/main/webapp/pages/modular/system/menu/menu_edit.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/auth/menu/menu_edit.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/menu/menu_edit.js"]}){
 
 <form class="layui-form" id="menuForm" lay-filter="menuForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">

src/main/webapp/pages/modular/system/message/message_view.html

@@ -49,4 +49,4 @@
 </form>
 
 @}
-@include("/modular/system/common/viewHide.html"){}
+@include("/component/view_hide.html"){}

src/main/webapp/pages/modular/system/resource/resource.html

@@ -1,4 +1,4 @@
-@layout("/layout/_container.html",{js:["/assets/modular/auth/resource/resource.js"]}){
+@layout("/layout/_container.html",{js:["/assets/modular/system/resource/resource.js"]}){
 
 <div class="layui-body-header">
     <span class="layui-body-header-title">资源管理</span>

src/main/webapp/pages/modular/system/resource/resource_detail.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/auth/resource/resource_detail.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/resource/resource_detail.js"]}){
 
 <form class="layui-form" id="resourceForm" lay-filter="resourceForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">

src/main/webapp/pages/modular/system/role/role.html

@@ -1,4 +1,4 @@
-@layout("/layout/_container.html",{js:["/assets/modular/auth/role/role.js"]}){
+@layout("/layout/_container.html",{js:["/assets/modular/system/role/role.js"]}){
 
 <div class="layui-body-header">
     <span class="layui-body-header-title">角色管理</span>

src/main/webapp/pages/modular/system/role/role_add.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/auth/role/role_add.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/role/role_add.js"]}){
 
 <form class="layui-form" id="roleForm" lay-filter="roleForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">

src/main/webapp/pages/modular/system/role/role_edit.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/auth/role/role_edit.js"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/role/role_edit.js"]}){
 
 <form class="layui-form" id="roleForm" lay-filter="roleForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">

src/main/webapp/pages/modular/system/role/role_edit_data_scope.html

@@ -1,4 +1,4 @@
-@layout("/layout/_form.html", {plugins:["ztree"], js:["/assets/modular/auth/role/role_edit_data_scope.js"]}){
+@layout("/layout/_form.html", {plugins:["ztree"], js:["/assets/modular/system/role/role_edit_data_scope.js"]}){
 
 <form class="layui-form" id="roleForm" lay-filter="roleForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">