diff --git a/src/main/java/cn/stylefeng/guns/modular/system/api/ApiViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/api/ApiViewController.java index d06a893f..9c58a782 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/api/ApiViewController.java +++ b/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"; } } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/app/AppViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/app/AppViewController.java index 97bf8b85..a0dcffa2 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/app/AppViewController.java +++ b/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"; } } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/common/CommonViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/common/CommonViewController.java index d8139fd6..a2cda93f 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/common/CommonViewController.java +++ b/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"; } } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/config/ConfigViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/config/ConfigViewController.java index 11b2c399..ad8a2f6e 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/config/ConfigViewController.java +++ b/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"; } } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/dashboard/DashboardViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/dashboard/DashboardViewController.java index 97e0d2c2..280dc7a8 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/dashboard/DashboardViewController.java +++ b/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"; } } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/datasource/DataSourceViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/datasource/DataSourceViewController.java index bd4fceaa..ea6a6dc3 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/datasource/DataSourceViewController.java +++ b/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"; } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/dict/DictTypeViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/dict/DictTypeViewController.java index 80192fcf..e9caa60d 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/dict/DictTypeViewController.java +++ b/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"; } - } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java index 8f9bc028..d9cbc130 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java +++ b/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"; } } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/index/controller/IndexViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/index/controller/IndexViewController.java index 7d5e705d..09ebde54 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/index/controller/IndexViewController.java +++ b/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"; } } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuButtonViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuButtonViewController.java index 5c97955f..88f14f5f 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuButtonViewController.java +++ b/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"; } } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuViewController.java index 880cbb73..e9306c9e 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuViewController.java +++ b/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"; } } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/message/MessageViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/message/MessageViewController.java index fc7aef46..e7146c81 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/message/MessageViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/system/message/MessageViewController.java @@ -39,7 +39,7 @@ public class MessageViewController { List messageList = messageApi.queryListCurrentUser(messageParam); model.addAttribute("msgUnReadCount", messageCount); model.addAttribute("msgUnReadList", messageList); - return "/modular/index/message.html"; + return "/modular/system/index/message.html"; } /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/monitor/controller/MonitorController.java b/src/main/java/cn/stylefeng/guns/modular/system/monitor/controller/MonitorController.java index 1539197f..ef5be248 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/monitor/controller/MonitorController.java +++ b/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"; } /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/notice/NoticeViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/notice/NoticeViewController.java index ba52a533..edbeb684 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/notice/NoticeViewController.java +++ b/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"; - } - } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/user/OnlineUserViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/online/OnlineUserViewController.java similarity index 93% rename from src/main/java/cn/stylefeng/guns/modular/system/user/OnlineUserViewController.java rename to src/main/java/cn/stylefeng/guns/modular/system/online/OnlineUserViewController.java index 67ee3805..fc88cbfd 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/user/OnlineUserViewController.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/modular/system/resource/ResourceViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/resource/ResourceViewController.java index d7b8acc3..23a13a42 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/resource/ResourceViewController.java +++ b/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"; } } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/role/RoleViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/role/RoleViewController.java index c6e183e2..254dc560 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/role/RoleViewController.java +++ b/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"; } } diff --git a/src/main/java/cn/stylefeng/guns/modular/system/user/UserViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/user/UserViewController.java index 64544470..4f64b086 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/user/UserViewController.java +++ b/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"; } } diff --git a/src/main/webapp/assets/modular/system/common/form.all.js b/src/main/webapp/assets/expand/plugins/form/form.all.js similarity index 100% rename from src/main/webapp/assets/modular/system/common/form.all.js rename to src/main/webapp/assets/expand/plugins/form/form.all.js diff --git a/src/main/webapp/assets/modular/business/readme.md b/src/main/webapp/assets/modular/business/readme.md new file mode 100644 index 00000000..08a4cf64 --- /dev/null +++ b/src/main/webapp/assets/modular/business/readme.md @@ -0,0 +1 @@ +# 这里写具体项目的业务的代码 diff --git a/src/main/webapp/assets/modular/api/api.js b/src/main/webapp/assets/modular/system/api/api.js similarity index 100% rename from src/main/webapp/assets/modular/api/api.js rename to src/main/webapp/assets/modular/system/api/api.js diff --git a/src/main/webapp/assets/modular/auth/app/app.js b/src/main/webapp/assets/modular/system/app/app.js similarity index 100% rename from src/main/webapp/assets/modular/auth/app/app.js rename to src/main/webapp/assets/modular/system/app/app.js diff --git a/src/main/webapp/assets/modular/auth/app/app_add.js b/src/main/webapp/assets/modular/system/app/app_add.js similarity index 100% rename from src/main/webapp/assets/modular/auth/app/app_add.js rename to src/main/webapp/assets/modular/system/app/app_add.js diff --git a/src/main/webapp/assets/modular/auth/app/app_edit.js b/src/main/webapp/assets/modular/system/app/app_edit.js similarity index 100% rename from src/main/webapp/assets/modular/auth/app/app_edit.js rename to src/main/webapp/assets/modular/system/app/app_edit.js diff --git a/src/main/webapp/assets/modular/datasource/datasource.js b/src/main/webapp/assets/modular/system/datasource/datasource.js similarity index 100% rename from src/main/webapp/assets/modular/datasource/datasource.js rename to src/main/webapp/assets/modular/system/datasource/datasource.js diff --git a/src/main/webapp/assets/modular/datasource/datasource_add.js b/src/main/webapp/assets/modular/system/datasource/datasource_add.js similarity index 100% rename from src/main/webapp/assets/modular/datasource/datasource_add.js rename to src/main/webapp/assets/modular/system/datasource/datasource_add.js diff --git a/src/main/webapp/assets/modular/frame/message.css b/src/main/webapp/assets/modular/system/index/message.css similarity index 100% rename from src/main/webapp/assets/modular/frame/message.css rename to src/main/webapp/assets/modular/system/index/message.css diff --git a/src/main/webapp/assets/modular/frame/message.js b/src/main/webapp/assets/modular/system/index/message.js similarity index 100% rename from src/main/webapp/assets/modular/frame/message.js rename to src/main/webapp/assets/modular/system/index/message.js diff --git a/src/main/webapp/assets/modular/frame/password.js b/src/main/webapp/assets/modular/system/index/password.js similarity index 100% rename from src/main/webapp/assets/modular/frame/password.js rename to src/main/webapp/assets/modular/system/index/password.js diff --git a/src/main/webapp/assets/modular/frame/personal_info.js b/src/main/webapp/assets/modular/system/index/personal_info.js similarity index 100% rename from src/main/webapp/assets/modular/frame/personal_info.js rename to src/main/webapp/assets/modular/system/index/personal_info.js diff --git a/src/main/webapp/assets/modular/frame/user_info.css b/src/main/webapp/assets/modular/system/index/user_info.css similarity index 100% rename from src/main/webapp/assets/modular/frame/user_info.css rename to src/main/webapp/assets/modular/system/index/user_info.css diff --git a/src/main/webapp/assets/modular/system/log/log_deatil.js b/src/main/webapp/assets/modular/system/log/log_deatil.js deleted file mode 100644 index 6766f711..00000000 --- a/src/main/webapp/assets/modular/system/log/log_deatil.js +++ /dev/null @@ -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); -}); diff --git a/src/main/webapp/assets/modular/auth/menu/button.js b/src/main/webapp/assets/modular/system/menu/button.js similarity index 100% rename from src/main/webapp/assets/modular/auth/menu/button.js rename to src/main/webapp/assets/modular/system/menu/button.js diff --git a/src/main/webapp/assets/modular/auth/menu/button_add.js b/src/main/webapp/assets/modular/system/menu/button_add.js similarity index 100% rename from src/main/webapp/assets/modular/auth/menu/button_add.js rename to src/main/webapp/assets/modular/system/menu/button_add.js diff --git a/src/main/webapp/assets/modular/auth/menu/button_edit.js b/src/main/webapp/assets/modular/system/menu/button_edit.js similarity index 100% rename from src/main/webapp/assets/modular/auth/menu/button_edit.js rename to src/main/webapp/assets/modular/system/menu/button_edit.js diff --git a/src/main/webapp/assets/modular/auth/menu/menu.js b/src/main/webapp/assets/modular/system/menu/menu.js similarity index 100% rename from src/main/webapp/assets/modular/auth/menu/menu.js rename to src/main/webapp/assets/modular/system/menu/menu.js diff --git a/src/main/webapp/assets/modular/auth/menu/menu_add.js b/src/main/webapp/assets/modular/system/menu/menu_add.js similarity index 100% rename from src/main/webapp/assets/modular/auth/menu/menu_add.js rename to src/main/webapp/assets/modular/system/menu/menu_add.js diff --git a/src/main/webapp/assets/modular/auth/menu/menu_edit.js b/src/main/webapp/assets/modular/system/menu/menu_edit.js similarity index 100% rename from src/main/webapp/assets/modular/auth/menu/menu_edit.js rename to src/main/webapp/assets/modular/system/menu/menu_edit.js diff --git a/src/main/webapp/assets/modular/auth/resource/resource.js b/src/main/webapp/assets/modular/system/resource/resource.js similarity index 100% rename from src/main/webapp/assets/modular/auth/resource/resource.js rename to src/main/webapp/assets/modular/system/resource/resource.js diff --git a/src/main/webapp/assets/modular/auth/resource/resource_detail.js b/src/main/webapp/assets/modular/system/resource/resource_detail.js similarity index 100% rename from src/main/webapp/assets/modular/auth/resource/resource_detail.js rename to src/main/webapp/assets/modular/system/resource/resource_detail.js diff --git a/src/main/webapp/assets/modular/auth/role/role.js b/src/main/webapp/assets/modular/system/role/role.js similarity index 100% rename from src/main/webapp/assets/modular/auth/role/role.js rename to src/main/webapp/assets/modular/system/role/role.js diff --git a/src/main/webapp/assets/modular/auth/role/role_add.js b/src/main/webapp/assets/modular/system/role/role_add.js similarity index 100% rename from src/main/webapp/assets/modular/auth/role/role_add.js rename to src/main/webapp/assets/modular/system/role/role_add.js diff --git a/src/main/webapp/assets/modular/auth/role/role_edit.js b/src/main/webapp/assets/modular/system/role/role_edit.js similarity index 100% rename from src/main/webapp/assets/modular/auth/role/role_edit.js rename to src/main/webapp/assets/modular/system/role/role_edit.js diff --git a/src/main/webapp/assets/modular/auth/role/role_edit_data_scope.js b/src/main/webapp/assets/modular/system/role/role_edit_data_scope.js similarity index 100% rename from src/main/webapp/assets/modular/auth/role/role_edit_data_scope.js rename to src/main/webapp/assets/modular/system/role/role_edit_data_scope.js diff --git a/src/main/webapp/assets/modular/sysConfig/sysConfig.js b/src/main/webapp/assets/modular/system/sysConfig/sysConfig.js similarity index 100% rename from src/main/webapp/assets/modular/sysConfig/sysConfig.js rename to src/main/webapp/assets/modular/system/sysConfig/sysConfig.js diff --git a/src/main/webapp/assets/modular/sysConfig/sysConfig_add.js b/src/main/webapp/assets/modular/system/sysConfig/sysConfig_add.js similarity index 100% rename from src/main/webapp/assets/modular/sysConfig/sysConfig_add.js rename to src/main/webapp/assets/modular/system/sysConfig/sysConfig_add.js diff --git a/src/main/webapp/assets/modular/sysConfig/sysConfig_edit.js b/src/main/webapp/assets/modular/system/sysConfig/sysConfig_edit.js similarity index 100% rename from src/main/webapp/assets/modular/sysConfig/sysConfig_edit.js rename to src/main/webapp/assets/modular/system/sysConfig/sysConfig_edit.js diff --git a/src/main/webapp/pages/modular/common/tree_dlg.html b/src/main/webapp/pages/component/tree_dlg.html similarity index 100% rename from src/main/webapp/pages/modular/common/tree_dlg.html rename to src/main/webapp/pages/component/tree_dlg.html diff --git a/src/main/webapp/pages/modular/system/common/viewHide.html b/src/main/webapp/pages/component/view_hide.html similarity index 79% rename from src/main/webapp/pages/modular/system/common/viewHide.html rename to src/main/webapp/pages/component/view_hide.html index d12a819d..11fc699c 100644 --- a/src/main/webapp/pages/modular/system/common/viewHide.html +++ b/src/main/webapp/pages/component/view_hide.html @@ -18,7 +18,7 @@ color: #ff0000; } - + -@} \ No newline at end of file +@} diff --git a/src/main/webapp/pages/modular/sysConfig/sysConfig_add.html b/src/main/webapp/pages/modular/system/config/sysConfig_add.html similarity index 97% rename from src/main/webapp/pages/modular/sysConfig/sysConfig_add.html rename to src/main/webapp/pages/modular/system/config/sysConfig_add.html index 2b4f14f0..8a79bdfa 100644 --- a/src/main/webapp/pages/modular/sysConfig/sysConfig_add.html +++ b/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"]}){
@@ -59,4 +59,4 @@
-@} \ No newline at end of file +@} diff --git a/src/main/webapp/pages/modular/sysConfig/sysConfig_edit.html b/src/main/webapp/pages/modular/system/config/sysConfig_edit.html similarity index 97% rename from src/main/webapp/pages/modular/sysConfig/sysConfig_edit.html rename to src/main/webapp/pages/modular/system/config/sysConfig_edit.html index fe95d9b2..77767f09 100644 --- a/src/main/webapp/pages/modular/sysConfig/sysConfig_edit.html +++ b/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"]}){
@@ -61,4 +61,4 @@
-@} \ No newline at end of file +@} diff --git a/src/main/webapp/pages/modular/dashboard/board_analyse.html b/src/main/webapp/pages/modular/system/dashboard/board_analyse.html similarity index 100% rename from src/main/webapp/pages/modular/dashboard/board_analyse.html rename to src/main/webapp/pages/modular/system/dashboard/board_analyse.html diff --git a/src/main/webapp/pages/modular/dashboard/board_platform.html b/src/main/webapp/pages/modular/system/dashboard/board_platform.html similarity index 100% rename from src/main/webapp/pages/modular/dashboard/board_platform.html rename to src/main/webapp/pages/modular/system/dashboard/board_platform.html diff --git a/src/main/webapp/pages/modular/datasource/datasource.html b/src/main/webapp/pages/modular/system/datasource/datasource.html similarity index 93% rename from src/main/webapp/pages/modular/datasource/datasource.html rename to src/main/webapp/pages/modular/system/datasource/datasource.html index d131a5f0..6c928a7e 100644 --- a/src/main/webapp/pages/modular/datasource/datasource.html +++ b/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"]}){
数据库信息表管理 diff --git a/src/main/webapp/pages/modular/datasource/datasource_add.html b/src/main/webapp/pages/modular/system/datasource/datasource_add.html similarity index 97% rename from src/main/webapp/pages/modular/datasource/datasource_add.html rename to src/main/webapp/pages/modular/system/datasource/datasource_add.html index ee8a2577..ea22ad2e 100644 --- a/src/main/webapp/pages/modular/datasource/datasource_add.html +++ b/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"]}){
diff --git a/src/main/webapp/pages/modular/system/dept/dept.html b/src/main/webapp/pages/modular/system/dept/dept.html deleted file mode 100644 index 6b4b18b6..00000000 --- a/src/main/webapp/pages/modular/system/dept/dept.html +++ /dev/null @@ -1,53 +0,0 @@ -@layout("/layout/_tree_container.html",{plugins:["jquery-layout"],js:["/assets/modular/system/dept/dept.js"]}){ - -
- 部门管理 -
- -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
- -
-
- - @if(shiro.hasPermission("/dept/add")){ - - @} - -
-
-
-
-
-
-
-
-
-
-
- - -@} diff --git a/src/main/webapp/pages/modular/system/dept/dept_add.html b/src/main/webapp/pages/modular/system/dept/dept_add.html deleted file mode 100644 index 269b4f07..00000000 --- a/src/main/webapp/pages/modular/system/dept/dept_add.html +++ /dev/null @@ -1,51 +0,0 @@ -@layout("/layout/_form.html",{js:["/assets/modular/system/dept/dept_add.js"]}){ - - -
-
-
基本信息
-
-
- -
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- - -
- - -@} diff --git a/src/main/webapp/pages/modular/system/dept/dept_edit.html b/src/main/webapp/pages/modular/system/dept/dept_edit.html deleted file mode 100644 index cdc3624f..00000000 --- a/src/main/webapp/pages/modular/system/dept/dept_edit.html +++ /dev/null @@ -1,51 +0,0 @@ -@layout("/layout/_form.html",{js:["/assets/modular/system/dept/dept_edit.js"]}){ - -
-
-
-
基本信息
-
-
- -
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- - -
- -
-@} diff --git a/src/main/webapp/pages/modular/index/change_password.html b/src/main/webapp/pages/modular/system/index/change_password.html similarity index 95% rename from src/main/webapp/pages/modular/index/change_password.html rename to src/main/webapp/pages/modular/system/index/change_password.html index 5777fc82..64d528fa 100644 --- a/src/main/webapp/pages/modular/index/change_password.html +++ b/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"]}){
@@ -28,4 +28,4 @@
-@} \ No newline at end of file +@} diff --git a/src/main/webapp/pages/modular/index/lock_screen.html b/src/main/webapp/pages/modular/system/index/lock_screen.html similarity index 100% rename from src/main/webapp/pages/modular/index/lock_screen.html rename to src/main/webapp/pages/modular/system/index/lock_screen.html diff --git a/src/main/webapp/pages/modular/index/message.html b/src/main/webapp/pages/modular/system/index/message.html similarity index 94% rename from src/main/webapp/pages/modular/index/message.html rename to src/main/webapp/pages/modular/system/index/message.html index 1b5fce65..265af004 100644 --- a/src/main/webapp/pages/modular/index/message.html +++ b/src/main/webapp/pages/modular/system/index/message.html @@ -1,4 +1,4 @@ - +
    @@ -39,4 +39,4 @@
- \ No newline at end of file + diff --git a/src/main/webapp/pages/modular/frame/notice.html b/src/main/webapp/pages/modular/system/index/notice.html similarity index 100% rename from src/main/webapp/pages/modular/frame/notice.html rename to src/main/webapp/pages/modular/system/index/notice.html diff --git a/src/main/webapp/pages/modular/index/personal_info.html b/src/main/webapp/pages/modular/system/index/personal_info.html similarity index 98% rename from src/main/webapp/pages/modular/index/personal_info.html rename to src/main/webapp/pages/modular/system/index/personal_info.html index 8fc30214..b22d06fd 100644 --- a/src/main/webapp/pages/modular/index/personal_info.html +++ b/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"]}){
个人信息 @@ -156,4 +156,4 @@
-@} \ No newline at end of file +@} diff --git a/src/main/webapp/pages/modular/index/theme.html b/src/main/webapp/pages/modular/system/index/theme.html similarity index 100% rename from src/main/webapp/pages/modular/index/theme.html rename to src/main/webapp/pages/modular/system/index/theme.html diff --git a/src/main/webapp/pages/modular/frame/welcome.html b/src/main/webapp/pages/modular/system/index/welcome.html similarity index 100% rename from src/main/webapp/pages/modular/frame/welcome.html rename to src/main/webapp/pages/modular/system/index/welcome.html diff --git a/src/main/webapp/pages/modular/auth/menu/button.html b/src/main/webapp/pages/modular/system/menu/button.html similarity index 95% rename from src/main/webapp/pages/modular/auth/menu/button.html rename to src/main/webapp/pages/modular/system/menu/button.html index 4e4517cf..60149106 100644 --- a/src/main/webapp/pages/modular/auth/menu/button.html +++ b/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"]}){
diff --git a/src/main/webapp/pages/modular/auth/menu/button_add.html b/src/main/webapp/pages/modular/system/menu/button_add.html similarity index 95% rename from src/main/webapp/pages/modular/auth/menu/button_add.html rename to src/main/webapp/pages/modular/system/menu/button_add.html index 9857157b..6ac60f8f 100644 --- a/src/main/webapp/pages/modular/auth/menu/button_add.html +++ b/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"]}){