diff --git a/README.md b/README.md index fd4a50b46..22451956e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ 12. 在线构建器：拖动表单元素生成相应的HTML代码 13. 连接池监视：监视当期系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。 -## 系统演示 ## [www.ruoyi.name](http://www.ruoyi.name) +## 系统演示 ## [www.ruoyi.club](http://www.ruoyi.club) ![登录界面](https://static.oschina.net/uploads/space/2018/0425/110329_Ftsu_1438828.png) diff --git a/doc/若依环境使用手册v1.0.docx b/doc/若依环境使用手册v1.0.1.docx similarity index 94% rename from doc/若依环境使用手册v1.0.docx rename to doc/若依环境使用手册v1.0.1.docx index 6e7c1a0be..7cd906bdf 100644 Binary files a/doc/若依环境使用手册v1.0.docx and b/doc/若依环境使用手册v1.0.1.docx differ diff --git a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java index 2ff6f2417..61183aa6b 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java @@ -17,7 +17,6 @@ import com.ruoyi.framework.web.domain.Message; * * @author ruoyi */ -// @RestController @Controller public class LoginController extends BaseController { diff --git a/src/main/resources/static/ruoyi/monitor/job/add.js b/src/main/resources/static/ruoyi/monitor/job/add.js index c5438a1d6..660c0a47c 100644 --- a/src/main/resources/static/ruoyi/monitor/job/add.js +++ b/src/main/resources/static/ruoyi/monitor/job/add.js @@ -16,5 +16,5 @@ $("#form-job-add").validate({ }); function add() { - _ajax_save("/monitor/job/save", $("#form-job-add").serialize()); + _ajax_save(ctx + "/monitor/job/save", $("#form-job-add").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/monitor/job/edit.js b/src/main/resources/static/ruoyi/monitor/job/edit.js index f1c85d444..fab7e860e 100644 --- a/src/main/resources/static/ruoyi/monitor/job/edit.js +++ b/src/main/resources/static/ruoyi/monitor/job/edit.js @@ -16,5 +16,5 @@ $("#form-job-edit").validate({ }); function edit() { - _ajax_save("/monitor/job/save", $("#form-job-edit").serialize()); + _ajax_save(ctx + "/monitor/job/save", $("#form-job-edit").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/monitor/job/job.js b/src/main/resources/static/ruoyi/monitor/job/job.js index e89861c90..03cd71880 100644 --- a/src/main/resources/static/ruoyi/monitor/job/job.js +++ b/src/main/resources/static/ruoyi/monitor/job/job.js @@ -1,4 +1,4 @@ -var prefix = "/monitor/job" +var prefix = ctx + "/monitor/job" $(function() { var columns = [{ @@ -114,6 +114,6 @@ function batchRemove() { //调度日志查询 function jobLog(id) { - var url = '/monitor/jobLog'; + var url = ctx + '/monitor/jobLog'; createMenuItem(url, "调度日志"); } diff --git a/src/main/resources/static/ruoyi/monitor/job/jobLog.js b/src/main/resources/static/ruoyi/monitor/job/jobLog.js index cd9ccb426..a5c713a9c 100644 --- a/src/main/resources/static/ruoyi/monitor/job/jobLog.js +++ b/src/main/resources/static/ruoyi/monitor/job/jobLog.js @@ -1,4 +1,4 @@ -var prefix = "/monitor/jobLog" +var prefix = ctx + "/monitor/jobLog" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js b/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js index 3aa99e0f4..7cb34ebdc 100644 --- a/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js +++ b/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js @@ -1,4 +1,4 @@ -var prefix = "/monitor/logininfor" +var prefix = ctx + "/monitor/logininfor" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/monitor/online/online.js b/src/main/resources/static/ruoyi/monitor/online/online.js index 10b3f90da..432461e99 100644 --- a/src/main/resources/static/ruoyi/monitor/online/online.js +++ b/src/main/resources/static/ruoyi/monitor/online/online.js @@ -1,4 +1,4 @@ -var prefix = "/monitor/online" +var prefix = ctx + "/monitor/online" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/monitor/operlog/operlog.js b/src/main/resources/static/ruoyi/monitor/operlog/operlog.js index 2647c9db9..aa4f3bd49 100644 --- a/src/main/resources/static/ruoyi/monitor/operlog/operlog.js +++ b/src/main/resources/static/ruoyi/monitor/operlog/operlog.js @@ -1,4 +1,4 @@ -var prefix = "/monitor/operlog" +var prefix = ctx + "/monitor/operlog" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/system/dept/add.js b/src/main/resources/static/ruoyi/system/dept/add.js index c11df1da9..7c0bde110 100644 --- a/src/main/resources/static/ruoyi/system/dept/add.js +++ b/src/main/resources/static/ruoyi/system/dept/add.js @@ -3,7 +3,7 @@ $("#form-dept-add").validate({ deptName:{ required:true, remote: { - url: "/system/dept/checkDeptNameUnique", + url: ctx + "system/dept/checkDeptNameUnique", type: "post", dataType: "text", data: { @@ -33,12 +33,12 @@ $("#form-dept-add").validate({ }); function update() { - _ajax_save("/system/dept/save", $("#form-dept-add").serialize()); + _ajax_save(ctx + "system/dept/save", $("#form-dept-add").serialize()); } /*部门管理-新增-选择父部门树*/ function selectDeptTree() { var deptId = $("#treeId").val(); - var url = "/system/dept/selectDeptTree/" + deptId; + var url = ctx + "system/dept/selectDeptTree/" + deptId; layer_show("选择部门", url, '380', '380'); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dept/dept.js b/src/main/resources/static/ruoyi/system/dept/dept.js index 14a6ad8f0..998ea1772 100644 --- a/src/main/resources/static/ruoyi/system/dept/dept.js +++ b/src/main/resources/static/ruoyi/system/dept/dept.js @@ -1,4 +1,4 @@ -var prefix = "/system/dept" +var prefix = ctx + "system/dept" window.onload = function() { loading(); diff --git a/src/main/resources/static/ruoyi/system/dept/edit.js b/src/main/resources/static/ruoyi/system/dept/edit.js index be3383784..4cce1924a 100644 --- a/src/main/resources/static/ruoyi/system/dept/edit.js +++ b/src/main/resources/static/ruoyi/system/dept/edit.js @@ -3,7 +3,7 @@ $("#form-dept-edit").validate({ deptName:{ required:true, remote: { - url: "/system/dept/checkDeptNameUnique", + url: ctx + "system/dept/checkDeptNameUnique", type: "post", dataType: "text", data: { @@ -36,12 +36,12 @@ $("#form-dept-edit").validate({ }); function update() { - _ajax_save("/system/dept/save", $("#form-dept-edit").serialize()); + _ajax_save(ctx + "system/dept/save", $("#form-dept-edit").serialize()); } /*部门管理-修改-选择部门树*/ function selectDeptTree() { var deptId = $("#treeId").val(); - var url = "/system/dept/selectDeptTree/" + deptId; + var url = ctx + "system/dept/selectDeptTree/" + deptId; layer_show("选择部门", url, '380', '380'); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dept/tree.js b/src/main/resources/static/ruoyi/system/dept/tree.js index dcfdc32ca..a17bd13a0 100644 --- a/src/main/resources/static/ruoyi/system/dept/tree.js +++ b/src/main/resources/static/ruoyi/system/dept/tree.js @@ -7,7 +7,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{ $("#treeName").val(treeName); }} }, tree, loadTree = function(){ - $.get("/system/dept/treeData", function(data) { + $.get(ctx + "system/dept/treeData", function(data) { var treeName = $("#treeName").val(); tree = $.fn.zTree.init($("#tree"), setting, data); // 展开第一级节点 diff --git a/src/main/resources/static/ruoyi/system/dict/data/add.js b/src/main/resources/static/ruoyi/system/dict/data/add.js index b620b0909..45bedf829 100644 --- a/src/main/resources/static/ruoyi/system/dict/data/add.js +++ b/src/main/resources/static/ruoyi/system/dict/data/add.js @@ -13,5 +13,5 @@ $("#form-dict-add").validate({ }); function add() { - _ajax_save("/system/dict/data/save", $("#form-dict-add").serialize()); + _ajax_save(ctx + "system/dict/data/save", $("#form-dict-add").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dict/data/data.js b/src/main/resources/static/ruoyi/system/dict/data/data.js index fbb044a8b..96ea91cb0 100644 --- a/src/main/resources/static/ruoyi/system/dict/data/data.js +++ b/src/main/resources/static/ruoyi/system/dict/data/data.js @@ -1,4 +1,4 @@ -var prefix = "/system/dict/data" +var prefix = ctx + "system/dict/data" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/system/dict/data/edit.js b/src/main/resources/static/ruoyi/system/dict/data/edit.js index 64415723f..2815e37e0 100644 --- a/src/main/resources/static/ruoyi/system/dict/data/edit.js +++ b/src/main/resources/static/ruoyi/system/dict/data/edit.js @@ -13,5 +13,5 @@ $("#form-dict-edit").validate({ }); function update() { - _ajax_save("/system/dict/data/save", $("#form-dict-edit").serialize()); + _ajax_save(ctx + "system/dict/data/save", $("#form-dict-edit").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dict/type/add.js b/src/main/resources/static/ruoyi/system/dict/type/add.js index 26460537d..c5b0dfde6 100644 --- a/src/main/resources/static/ruoyi/system/dict/type/add.js +++ b/src/main/resources/static/ruoyi/system/dict/type/add.js @@ -7,7 +7,7 @@ $("#form-dict-add").validate({ required:true, minlength: 5, remote: { - url: "/system/dict/checkDictTypeUnique", + url: ctx + "system/dict/checkDictTypeUnique", type: "post", dataType: "text", data: { @@ -33,5 +33,5 @@ $("#form-dict-add").validate({ }); function add() { - _ajax_save("/system/dict/save", $("#form-dict-add").serialize()); + _ajax_save(ctx + "system/dict/save", $("#form-dict-add").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dict/type/edit.js b/src/main/resources/static/ruoyi/system/dict/type/edit.js index 1c93cdf19..9964744f8 100644 --- a/src/main/resources/static/ruoyi/system/dict/type/edit.js +++ b/src/main/resources/static/ruoyi/system/dict/type/edit.js @@ -7,7 +7,7 @@ $("#form-dict-edit").validate({ required:true, minlength: 5, remote: { - url: "/system/dict/checkDictTypeUnique", + url: ctx + "system/dict/checkDictTypeUnique", type: "post", dataType: "text", data: { @@ -36,5 +36,5 @@ $("#form-dict-edit").validate({ }); function update() { - _ajax_save("/system/dict/save", $("#form-dict-edit").serialize()); + _ajax_save(ctx + "system/dict/save", $("#form-dict-edit").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dict/type/type.js b/src/main/resources/static/ruoyi/system/dict/type/type.js index 1a2249238..103020894 100644 --- a/src/main/resources/static/ruoyi/system/dict/type/type.js +++ b/src/main/resources/static/ruoyi/system/dict/type/type.js @@ -1,4 +1,4 @@ -var prefix = "/system/dict" +var prefix = ctx + "system/dict" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/system/menu/add.js b/src/main/resources/static/ruoyi/system/menu/add.js index d119f6e02..37958dfc4 100644 --- a/src/main/resources/static/ruoyi/system/menu/add.js +++ b/src/main/resources/static/ruoyi/system/menu/add.js @@ -3,7 +3,7 @@ $("#form-menu-add").validate({ menuName:{ required:true, remote: { - url: "/system/menu/checkMenuNameUnique", + url: ctx + "system/menu/checkMenuNameUnique", type: "post", dataType: "text", data: { @@ -64,7 +64,7 @@ $(function() { }); function add() { - _ajax_save("/system/menu/save", $("#form-menu-add").serialize()); + _ajax_save(ctx + "system/menu/save", $("#form-menu-add").serialize()); } /*菜单管理-新增-选择菜单树*/ @@ -72,12 +72,12 @@ function selectMenuTree() { var menuId = $("#treeId").val(); if(menuId > 0) { - var url = "/system/menu/selectMenuTree/" + menuId; + var url = ctx + "system/menu/selectMenuTree/" + menuId; layer_show("选择菜单", url, '380', '380'); } else { - var url = "/system/menu/selectMenuTree/1"; + var url = ctx + "system/menu/selectMenuTree/1"; layer_show("选择菜单", url, '380', '380'); } } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/menu/edit.js b/src/main/resources/static/ruoyi/system/menu/edit.js index 129b767eb..4e1a096c7 100644 --- a/src/main/resources/static/ruoyi/system/menu/edit.js +++ b/src/main/resources/static/ruoyi/system/menu/edit.js @@ -8,7 +8,7 @@ $("#form-menu-edit").validate({ menuName:{ required:true, remote: { - url: "/system/menu/checkMenuNameUnique", + url: ctx + "system/menu/checkMenuNameUnique", type: "post", dataType: "text", data: { @@ -78,7 +78,7 @@ function menuVisible(menuType) { } function update() { - _ajax_save("/system/menu/save", $("#form-menu-edit").serialize()); + _ajax_save(ctx + "system/menu/save", $("#form-menu-edit").serialize()); } /*菜单管理-修改-选择菜单树*/ @@ -86,7 +86,7 @@ function selectMenuTree() { var menuId = $("#treeId").val(); if(menuId > 0) { - var url = "/system/menu/selectMenuTree/" + menuId; + var url = ctx + "system/menu/selectMenuTree/" + menuId; layer_show("选择菜单", url, '380', '380'); } else diff --git a/src/main/resources/static/ruoyi/system/menu/menu.js b/src/main/resources/static/ruoyi/system/menu/menu.js index fa44f8635..651d7c9db 100644 --- a/src/main/resources/static/ruoyi/system/menu/menu.js +++ b/src/main/resources/static/ruoyi/system/menu/menu.js @@ -1,4 +1,4 @@ -var prefix = "/system/menu" +var prefix = ctx + "system/menu" window.onload = function() { loading(); diff --git a/src/main/resources/static/ruoyi/system/menu/tree.js b/src/main/resources/static/ruoyi/system/menu/tree.js index 3207e2303..a9a372a25 100644 --- a/src/main/resources/static/ruoyi/system/menu/tree.js +++ b/src/main/resources/static/ruoyi/system/menu/tree.js @@ -7,7 +7,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{ $("#treeName").val(treeName); }} }, tree, loadTree = function(){ - $.get("/system/menu/menuTreeData", function(data) { + $.get(ctx + "system/menu/menuTreeData", function(data) { var treeName = $("#treeName").val(); tree = $.fn.zTree.init($("#tree"), setting, data); // 展开第一级节点 diff --git a/src/main/resources/static/ruoyi/system/post/add.js b/src/main/resources/static/ruoyi/system/post/add.js index 9412877e3..781aeac35 100644 --- a/src/main/resources/static/ruoyi/system/post/add.js +++ b/src/main/resources/static/ruoyi/system/post/add.js @@ -17,5 +17,5 @@ $("#form-post-add").validate({ /** 岗位管理-新增岗位 */ function add() { - _ajax_save(ctx + "/system/post/save", $("#form-post-add").serialize()); + _ajax_save(ctx + "system/post/save", $("#form-post-add").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/post/edit.js b/src/main/resources/static/ruoyi/system/post/edit.js index be65a4c6b..bbf240407 100644 --- a/src/main/resources/static/ruoyi/system/post/edit.js +++ b/src/main/resources/static/ruoyi/system/post/edit.js @@ -17,5 +17,5 @@ $("#form-post-edit").validate({ /** 岗位管理-修改岗位 */ function edit() { - _ajax_save(ctx + "/system/post/save", $("#form-post-edit").serialize()); + _ajax_save(ctx + "system/post/save", $("#form-post-edit").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/post/post.js b/src/main/resources/static/ruoyi/system/post/post.js index f4c06c516..1d9e92d40 100644 --- a/src/main/resources/static/ruoyi/system/post/post.js +++ b/src/main/resources/static/ruoyi/system/post/post.js @@ -1,5 +1,4 @@ -var prefix = ctx + "/system/post" - +var prefix = ctx + "system/post" $(function() { var columns = [{ checkbox: true diff --git a/src/main/resources/static/ruoyi/system/role/add.js b/src/main/resources/static/ruoyi/system/role/add.js index d8ea9b09d..8d4b4fe86 100644 --- a/src/main/resources/static/ruoyi/system/role/add.js +++ b/src/main/resources/static/ruoyi/system/role/add.js @@ -11,7 +11,7 @@ var setting = { } } }, menuTrees, loadTree = function(){ - $.get("/system/menu/roleMenuTreeData", function(data) { + $.get(ctx + "system/menu/roleMenuTreeData", function(data) { menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true); }, null, null, "正在加载，请稍后..."); };loadTree(); @@ -21,7 +21,7 @@ $("#form-role-add").validate({ roleName:{ required:true, remote: { - url: "/system/role/checkRoleNameUnique", + url: ctx + "system/role/checkRoleNameUnique", type: "post", dataType: "text", data: { @@ -75,7 +75,7 @@ function add() { $.ajax({ cache : true, type : "POST", - url : "/system/role/save", + url : ctx + "system/role/save", data : { "roleName": roleName, "roleKey": roleKey, diff --git a/src/main/resources/static/ruoyi/system/role/edit.js b/src/main/resources/static/ruoyi/system/role/edit.js index 29871ed7f..6a0ac8ba1 100644 --- a/src/main/resources/static/ruoyi/system/role/edit.js +++ b/src/main/resources/static/ruoyi/system/role/edit.js @@ -11,7 +11,7 @@ var setting = { } } }, menuTrees, loadTree = function(){ - $.get("/system/menu/roleMenuTreeData?roleId=" + $("#roleId").val(), function(data) { + $.get(ctx + "system/menu/roleMenuTreeData?roleId=" + $("#roleId").val(), function(data) { menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true); }, null, null, "正在加载，请稍后..."); };loadTree(); @@ -21,7 +21,7 @@ $("#form-role-edit").validate({ roleName:{ required:true, remote: { - url: "/system/role/checkRoleNameUnique", + url: ctx + "system/role/checkRoleNameUnique", type: "post", dataType: "text", data: { @@ -79,7 +79,7 @@ function update() { $.ajax({ cache : true, type : "POST", - url : "/system/role/save", + url : ctx + "system/role/save", data : { "roleId": roleId, "roleName": roleName, diff --git a/src/main/resources/static/ruoyi/system/role/role.js b/src/main/resources/static/ruoyi/system/role/role.js index e1fff7732..e6484d745 100644 --- a/src/main/resources/static/ruoyi/system/role/role.js +++ b/src/main/resources/static/ruoyi/system/role/role.js @@ -1,4 +1,4 @@ -var prefix = "/system/role" +var prefix = ctx + "system/role" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/system/user/add.js b/src/main/resources/static/ruoyi/system/user/add.js index 4135cc0df..23579f4c0 100644 --- a/src/main/resources/static/ruoyi/system/user/add.js +++ b/src/main/resources/static/ruoyi/system/user/add.js @@ -4,7 +4,7 @@ $("#form-user-add").validate({ required:true, minlength: 5, remote: { - url: "/system/user/checkUserNameUnique", + url: ctx + "system/user/checkUserNameUnique", type: "post", dataType: "text", data: { @@ -57,7 +57,7 @@ function add() { $.ajax({ cache : true, type : "POST", - url : "/system/user/save", + url : ctx + "system/user/save", data : { "userId": userId, "deptId": deptId, @@ -91,6 +91,6 @@ function add() { function selectDeptTree() { var treeId = $("#treeId").val(); var deptId = treeId == null || treeId == "" ? "100" : treeId; - var url = "/system/dept/selectDeptTree/" + deptId; + var url = ctx + "system/dept/selectDeptTree/" + deptId; layer_show("选择部门", url, '380', '380'); } diff --git a/src/main/resources/static/ruoyi/system/user/edit.js b/src/main/resources/static/ruoyi/system/user/edit.js index d2e965816..53b0c5760 100644 --- a/src/main/resources/static/ruoyi/system/user/edit.js +++ b/src/main/resources/static/ruoyi/system/user/edit.js @@ -33,7 +33,7 @@ function update() { $.ajax({ cache : true, type : "POST", - url : "/system/user/save", + url : ctx + "system/user/save", data : { "userId": userId, "deptId": deptId, @@ -64,6 +64,6 @@ function update() { /*用户管理-修改-选择部门树*/ function selectDeptTree() { var deptId = $("#treeId").val(); - var url = "/system/dept/selectDeptTree/" + deptId; + var url = ctx + "system/dept/selectDeptTree/" + deptId; layer_show("选择部门", url, '380', '380'); } diff --git a/src/main/resources/static/ruoyi/system/user/user.js b/src/main/resources/static/ruoyi/system/user/user.js index 8eb4a12b0..670fb25ef 100644 --- a/src/main/resources/static/ruoyi/system/user/user.js +++ b/src/main/resources/static/ruoyi/system/user/user.js @@ -1,4 +1,4 @@ -var prefix = "/system/user" +var prefix = ctx + "system/user" $(document).ready(function(){ @@ -76,7 +76,7 @@ function queryDeptTreeDaTa() $('.bootstrap-table').bootstrapTable('refresh', opt); }} }, tree, loadTree = function(){ - $.get("/system/dept/treeData", function(data) { + $.get(ctx + "system/dept/treeData", function(data) { tree = $.fn.zTree.init($("#tree"), setting, data); //.expandAll(true); // 展开第一级节点 var nodes = tree.getNodesByParam("level", 0); @@ -108,7 +108,7 @@ function queryDeptTreeDaTa() /*用户管理-部门*/ function dept() { - var url = "/system/dept"; + var url = ctx + "system/dept"; createMenuItem(url, "部门管理"); } diff --git a/src/main/resources/static/ruoyi/tool/gen/gen.js b/src/main/resources/static/ruoyi/tool/gen/gen.js index 608eff1ae..170b5ad04 100644 --- a/src/main/resources/static/ruoyi/tool/gen/gen.js +++ b/src/main/resources/static/ruoyi/tool/gen/gen.js @@ -1,4 +1,4 @@ -var prefix = "/tool/gen" +var prefix = ctx + "tool/gen" $(function() { var columns = [{ diff --git a/src/main/resources/templates/error/404.html b/src/main/resources/templates/error/404.html index 8c4385a82..e5e000226 100644 --- a/src/main/resources/templates/error/404.html +++ b/src/main/resources/templates/error/404.html @@ -4,9 +4,9 @@ RuoYi - 404 - - - + + +
diff --git a/src/main/resources/templates/error/500.html b/src/main/resources/templates/error/500.html index c6ea065c4..678020c0c 100644 --- a/src/main/resources/templates/error/500.html +++ b/src/main/resources/templates/error/500.html @@ -4,9 +4,9 @@ RuoYi - 500 - - - + + +
diff --git a/src/main/resources/templates/error/unauth.html b/src/main/resources/templates/error/unauth.html index 4f7089a6e..56217dead 100644 --- a/src/main/resources/templates/error/unauth.html +++ b/src/main/resources/templates/error/unauth.html @@ -4,9 +4,9 @@ RuoYi - 403 - - - + + +
diff --git a/src/main/resources/templates/include.html b/src/main/resources/templates/include.html index b0d9f1dd1..1d9d6d9b9 100644 --- a/src/main/resources/templates/include.html +++ b/src/main/resources/templates/include.html @@ -5,14 +5,14 @@ - - + + - - - - - + + + + +
@@ -35,5 +35,6 @@ +
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 78d3d3c28..ecab3f91b 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -11,13 +11,12 @@ - - - - - + + + + + -
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 7854ef024..eb8e203d4 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -8,14 +8,14 @@ 若依管理系统 - 登录 - - - - + + + + - + @@ -60,12 +60,12 @@
- - + + - - - + + + diff --git a/src/main/resources/templates/monitor/job/edit.html b/src/main/resources/templates/monitor/job/edit.html index b2728ea30..9444326f8 100644 --- a/src/main/resources/templates/monitor/job/edit.html +++ b/src/main/resources/templates/monitor/job/edit.html @@ -64,7 +64,7 @@
- diff --git a/src/main/resources/templates/monitor/job/job.html b/src/main/resources/templates/monitor/job/job.html index c4140d872..8b95633f8 100644 --- a/src/main/resources/templates/monitor/job/job.html +++ b/src/main/resources/templates/monitor/job/job.html @@ -21,8 +21,8 @@
- - + - + diff --git a/src/main/resources/templates/monitor/logininfor/logininfor.html b/src/main/resources/templates/monitor/logininfor/logininfor.html index 30990c1aa..a186be27b 100644 --- a/src/main/resources/templates/monitor/logininfor/logininfor.html +++ b/src/main/resources/templates/monitor/logininfor/logininfor.html @@ -15,6 +15,6 @@
- + \ No newline at end of file diff --git a/src/main/resources/templates/monitor/online/online.html b/src/main/resources/templates/monitor/online/online.html index 36c4458a8..aad3f0282 100644 --- a/src/main/resources/templates/monitor/online/online.html +++ b/src/main/resources/templates/monitor/online/online.html @@ -16,8 +16,8 @@
- - + diff --git a/src/main/resources/templates/monitor/operlog/operlog.html b/src/main/resources/templates/monitor/operlog/operlog.html index b8c89e22a..001c16ef7 100644 --- a/src/main/resources/templates/monitor/operlog/operlog.html +++ b/src/main/resources/templates/monitor/operlog/operlog.html @@ -16,8 +16,8 @@
- - + diff --git a/src/main/resources/templates/system/dept/add.html b/src/main/resources/templates/system/dept/add.html index 4717c76db..0e26d5155 100644 --- a/src/main/resources/templates/system/dept/add.html +++ b/src/main/resources/templates/system/dept/add.html @@ -65,7 +65,7 @@
- diff --git a/src/main/resources/templates/system/dept/dept.html b/src/main/resources/templates/system/dept/dept.html index 8d867c2e5..cb554b131 100644 --- a/src/main/resources/templates/system/dept/dept.html +++ b/src/main/resources/templates/system/dept/dept.html @@ -15,8 +15,8 @@
- - + diff --git a/src/main/resources/templates/system/dept/tree.html b/src/main/resources/templates/system/dept/tree.html index da59d70d0..10996dcff 100644 --- a/src/main/resources/templates/system/dept/tree.html +++ b/src/main/resources/templates/system/dept/tree.html @@ -2,8 +2,8 @@ - - + + @@ -156,10 +156,10 @@
- - - - + + + + \ No newline at end of file diff --git a/src/main/resources/templates/vm/html/add.html.vm b/src/main/resources/templates/vm/html/add.html.vm index 663a28ecf..1ed22b9a5 100644 --- a/src/main/resources/templates/vm/html/add.html.vm +++ b/src/main/resources/templates/vm/html/add.html.vm @@ -23,7 +23,7 @@
- diff --git a/src/main/resources/templates/vm/html/edit.html.vm b/src/main/resources/templates/vm/html/edit.html.vm index 721566538..1ca5db8d3 100644 --- a/src/main/resources/templates/vm/html/edit.html.vm +++ b/src/main/resources/templates/vm/html/edit.html.vm @@ -25,7 +25,7 @@
- diff --git a/src/main/resources/templates/vm/html/list.html.vm b/src/main/resources/templates/vm/html/list.html.vm index 502317cd9..aeed28c7a 100644 --- a/src/main/resources/templates/vm/html/list.html.vm +++ b/src/main/resources/templates/vm/html/list.html.vm @@ -16,8 +16,8 @@
- - + diff --git a/src/main/resources/templates/vm/js/add.js.vm b/src/main/resources/templates/vm/js/add.js.vm index c1a9ee2ca..269a99dfb 100644 --- a/src/main/resources/templates/vm/js/add.js.vm +++ b/src/main/resources/templates/vm/js/add.js.vm @@ -10,5 +10,5 @@ $("#form-${classname}-add").validate({ }); function add() { - _ajax_save("/${moduleName}/${classname}/save", $('#form-${classname}-add').serialize()); + _ajax_save(ctx + "${moduleName}/${classname}/save", $('#form-${classname}-add').serialize()); } \ No newline at end of file diff --git a/src/main/resources/templates/vm/js/edit.js.vm b/src/main/resources/templates/vm/js/edit.js.vm index 6e63bc387..39a9e9127 100644 --- a/src/main/resources/templates/vm/js/edit.js.vm +++ b/src/main/resources/templates/vm/js/edit.js.vm @@ -10,5 +10,5 @@ $("#form-${classname}-edit").validate({ }); function edit() { - _ajax_save("/${moduleName}/${classname}/save", $('#form-${classname}-edit').serialize()); + _ajax_save(ctx + "${moduleName}/${classname}/save", $('#form-${classname}-edit').serialize()); } \ No newline at end of file diff --git a/src/main/resources/templates/vm/js/list.js.vm b/src/main/resources/templates/vm/js/list.js.vm index 89d8daf22..473b7d3ab 100644 --- a/src/main/resources/templates/vm/js/list.js.vm +++ b/src/main/resources/templates/vm/js/list.js.vm @@ -1,4 +1,4 @@ -var prefix = "/${moduleName}/${classname}" +var prefix = ctx + "${moduleName}/${classname}" $(function() { var columns = [{