diff --git a/data/magic-api/api/后台/安全/获取当前用户权限code.ms b/data/magic-api/api/后台/安全/获取当前用户权限code.ms index 4db1a26..3e40302 100644 --- a/data/magic-api/api/后台/安全/获取当前用户权限code.ms +++ b/data/magic-api/api/后台/安全/获取当前用户权限code.ms @@ -5,13 +5,13 @@ "groupId" : "1952f25c81084e24b55b11385767dc38", "name" : "获取当前用户权限code", "createTime" : null, - "updateTime" : 1641276424757, + "updateTime" : 1644121674755, "lock" : "0", "method" : "POST", "path" : "/permissions", "parameters" : [ ], "option" : "[{\"name\":\"\",\"value\":\"\",\"description\":\"\"}]", - "requestBody" : "{\r\n\t\r\n}", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [\"sys:test:aaa\", \"menu:save\", \"menu:delete\", \"office:office:list\", \"office:office:save\", \"office:office:delete\", \"role:view\", \"role:save\", \"role:delete\", \"user:save\", \"user:delete\", \"dict:view\", \"dict:save\", \"dict:delete\", \"dict:items\", \"dict:items:save\", \"dict:items:delete\"],\n \"timestamp\": 1641199273283,\n \"executeTime\": 1\n}", @@ -115,9 +115,9 @@ return db.cache(`permissions:${userId}`).select(""" sm.permission FROM sys_menu sm - left JOIN sys_role_menu srm ON sm.id = srm.menu_id - left JOIN sys_user_role sur ON sur.role_id = srm.role_id - left JOIN sys_user su ON su.id = sur.user_id + right JOIN sys_role_menu srm ON sm.id = srm.menu_id + right JOIN sys_user_role sur ON sur.role_id = srm.role_id + right JOIN sys_user su ON su.id = sur.user_id ?{userId != '1', AND su.id = #{userId}} AND su.is_del = 0 WHERE diff --git a/data/magic-api/api/后台/数据字典/保存.ms b/data/magic-api/api/后台/数据字典/保存.ms index 082007d..0fdb815 100644 --- a/data/magic-api/api/后台/数据字典/保存.ms +++ b/data/magic-api/api/后台/数据字典/保存.ms @@ -5,13 +5,13 @@ "groupId" : "c7ce65f5b3cf4aaa913f6fec7d35d176", "name" : "保存", "createTime" : null, - "updateTime" : 1644046408348, + "updateTime" : 1644121671060, "lock" : "0", "method" : "POST", "path" : "/save", "parameters" : [ ], - "option" : "[{\"name\":\"wrap_request_parameter\",\"value\":\"data\",\"description\":\"包装请求参数到一个变量中\"}]", - "requestBody" : "", + "option" : "[{\"name\":\"wrap_request_parameter\",\"value\":\"data\",\"description\":\"包装请求参数到一个变量中\"},{\"name\":\"permission\",\"value\":\"dict:save\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : null, @@ -19,7 +19,8 @@ "requestBodyDefinition" : null, "responseBodyDefinition" : null, "optionMap" : { - "wrap_request_parameter" : "data" + "wrap_request_parameter" : "data", + "permission" : "dict:save" } } ================================ diff --git a/data/magic-api/api/后台/数据字典/列表.ms b/data/magic-api/api/后台/数据字典/列表.ms index 99e6f79..ae51619 100644 --- a/data/magic-api/api/后台/数据字典/列表.ms +++ b/data/magic-api/api/后台/数据字典/列表.ms @@ -5,13 +5,13 @@ "groupId" : "c7ce65f5b3cf4aaa913f6fec7d35d176", "name" : "列表", "createTime" : null, - "updateTime" : 1634736176170, + "updateTime" : 1644121689680, "lock" : "0", "method" : "GET", "path" : "/list", "parameters" : [ ], - "option" : "[]", - "requestBody" : "", + "option" : "[{\"name\":\"permission\",\"value\":\"dict:view\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : "{\n \"code\": 402,\n \"message\": \"凭证已过期\",\n \"data\": null,\n \"timestamp\": 1634734488837,\n \"executeTime\": null\n}", @@ -90,7 +90,9 @@ "children" : [ ] } ] }, - "optionMap" : { } + "optionMap" : { + "permission" : "dict:view" + } } ================================ return db.page(""" diff --git a/data/magic-api/api/后台/数据字典/删除.ms b/data/magic-api/api/后台/数据字典/删除.ms index 69dc150..2f310e7 100644 --- a/data/magic-api/api/后台/数据字典/删除.ms +++ b/data/magic-api/api/后台/数据字典/删除.ms @@ -5,20 +5,22 @@ "groupId" : "c7ce65f5b3cf4aaa913f6fec7d35d176", "name" : "删除", "createTime" : null, - "updateTime" : 1634734751223, + "updateTime" : 1644121690359, "lock" : "0", "method" : "POST", "path" : "/delete", "parameters" : [ ], - "option" : "[]", - "requestBody" : "", + "option" : "[{\"name\":\"permission\",\"value\":\"dict:delete\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : null, "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : null, - "optionMap" : { } + "optionMap" : { + "permission" : "dict:delete" + } } ================================ db.table("sys_dict_items").logic().where().eq("dictId",id).delete() diff --git a/data/magic-api/api/后台/数据字典/字典项/保存.ms b/data/magic-api/api/后台/数据字典/字典项/保存.ms index 9320579..e503248 100644 --- a/data/magic-api/api/后台/数据字典/字典项/保存.ms +++ b/data/magic-api/api/后台/数据字典/字典项/保存.ms @@ -5,13 +5,13 @@ "groupId" : "376f26eb43a44a3daeafd27020a96f48", "name" : "保存", "createTime" : null, - "updateTime" : 1644046552214, + "updateTime" : 1644121691372, "lock" : "0", "method" : "POST", "path" : "/save", "parameters" : [ ], - "option" : "[{\"name\":\"wrap_request_parameter\",\"value\":\"data\",\"description\":\"包装请求参数到一个变量中\"}]", - "requestBody" : "", + "option" : "[{\"name\":\"wrap_request_parameter\",\"value\":\"data\",\"description\":\"包装请求参数到一个变量中\"},{\"name\":\"permission\",\"value\":\"dict:items:save\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : null, @@ -19,7 +19,8 @@ "requestBodyDefinition" : null, "responseBodyDefinition" : null, "optionMap" : { - "wrap_request_parameter" : "data" + "wrap_request_parameter" : "data", + "permission" : "dict:items:save" } } ================================ diff --git a/data/magic-api/api/后台/数据字典/字典项/列表.ms b/data/magic-api/api/后台/数据字典/字典项/列表.ms index df6bd17..6214561 100644 --- a/data/magic-api/api/后台/数据字典/字典项/列表.ms +++ b/data/magic-api/api/后台/数据字典/字典项/列表.ms @@ -5,13 +5,13 @@ "groupId" : "376f26eb43a44a3daeafd27020a96f48", "name" : "列表", "createTime" : null, - "updateTime" : 1634736189568, + "updateTime" : 1644121692556, "lock" : "0", "method" : "GET", "path" : "/list", "parameters" : [ ], - "option" : "[]", - "requestBody" : "", + "option" : "[{\"name\":\"permission\",\"value\":\"dict:items:view\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": {\n \"total\": 17,\n \"list\": [\n {\n \"id\": \"56aee220-cb12-4bb2-8453-84ee49672193\",\n \"value\": \"3\",\n \"label\": \"3\",\n \"dictId\": \"4b9b4a7e-25a1-4efa-ab9a-a004f203f1f4\",\n \"remarks\": \"\",\n \"sort\": 30\n },\n {\n \"id\": \"6a127863-8130-48be-88bf-e5179f5c33e6\",\n \"value\": \"2\",\n \"label\": \"2\",\n \"dictId\": \"4b9b4a7e-25a1-4efa-ab9a-a004f203f1f4\",\n \"remarks\": \"\",\n \"sort\": 20\n },\n {\n \"id\": \"f19152f4-dd72-4509-a350-af70d802dcdf\",\n \"value\": \"1\",\n \"label\": \"1\",\n \"dictId\": \"4b9b4a7e-25a1-4efa-ab9a-a004f203f1f4\",\n \"remarks\": \"\",\n \"sort\": 10\n },\n {\n \"id\": \"ac1ee828-62e1-42fd-9d18-cf37203855b2\",\n \"value\": \"12\",\n \"label\": \"12\",\n \"dictId\": \"3c393981-9ddd-40b2-8c19-85f0a9d9a98f\",\n \"remarks\": \"\",\n \"sort\": 30\n },\n {\n \"id\": \"457517be-5245-4d98-b9fa-8b6753a9cfc6\",\n \"value\": \"2\",\n \"label\": \"公司\",\n \"dictId\": \"3c393981-9ddd-40b2-8c19-85f0a9d9a98f\",\n \"remarks\": \"\",\n \"sort\": 20\n },\n {\n \"id\": \"b928f5b1-07bd-4f09-9142-897c767c5303\",\n \"value\": \"1\",\n \"label\": \"部门\",\n \"dictId\": \"3c393981-9ddd-40b2-8c19-85f0a9d9a98f\",\n \"remarks\": \"\",\n \"sort\": 10\n },\n {\n \"id\": \"0f91de6e8406d59762bebe5d2dfc9d36\",\n \"value\": \"0\",\n \"label\": \"不禁用\",\n \"dictId\": \"ae9a2cd400264ff6bdc2f00b62d6e941\",\n \"remarks\": null,\n \"sort\": 0\n },\n {\n \"id\": \"c5cf8715a74537156ea29c8bbc622b05\",\n \"value\": \"1\",\n \"label\": \"禁用\",\n \"dictId\": \"ae9a2cd400264ff6bdc2f00b62d6e941\",\n \"remarks\": null,\n \"sort\": 0\n },\n {\n \"id\": \"ze9a2cd400264ff6bdc2f00b62d6e911\",\n \"value\": \"0\",\n \"label\": \"系统类\",\n \"dictId\": \"ae9a2cd400264ff6bdc2f00b62d6e911\",\n \"remarks\": null,\n \"sort\": 0\n },\n {\n \"id\": \"ze9a2cd400264ff6bdc2f00b62d6e910\",\n \"value\": \"1\",\n \"label\": \"业务类\",\n \"dictId\": \"ae9a2cd400264ff6bdc2f00b62d6e911\",\n \"remarks\": null,\n \"sort\": 0\n }\n ]\n },\n \"timestamp\": 1634735383948,\n \"executeTime\": 13\n}", @@ -198,7 +198,9 @@ "children" : [ ] } ] }, - "optionMap" : { } + "optionMap" : { + "permission" : "dict:items:view" + } } ================================ return db.page(""" diff --git a/data/magic-api/api/后台/数据字典/字典项/删除.ms b/data/magic-api/api/后台/数据字典/字典项/删除.ms index 9a9bef9..87fbfb6 100644 --- a/data/magic-api/api/后台/数据字典/字典项/删除.ms +++ b/data/magic-api/api/后台/数据字典/字典项/删除.ms @@ -4,21 +4,23 @@ "script" : null, "groupId" : "376f26eb43a44a3daeafd27020a96f48", "name" : "删除", - "createTime" : 1634735543067, - "updateTime" : 1634735543067, + "createTime" : null, + "updateTime" : 1644121693440, "lock" : "0", "method" : "POST", "path" : "/delete", "parameters" : [ ], - "option" : "[]", - "requestBody" : "", + "option" : "[{\"name\":\"permission\",\"value\":\"dict:items:delete\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : null, "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : null, - "optionMap" : { } + "optionMap" : { + "permission" : "dict:items:delete" + } } ================================ return db.table("sys_dict_items").logic().where().eq("id",id).delete(); \ No newline at end of file diff --git a/data/magic-api/api/后台/用户管理/保存.ms b/data/magic-api/api/后台/用户管理/保存.ms index 73246a7..4e41ee6 100644 --- a/data/magic-api/api/后台/用户管理/保存.ms +++ b/data/magic-api/api/后台/用户管理/保存.ms @@ -5,20 +5,22 @@ "groupId" : "4f0230049d7e4f39b1e0897cc0f46f9a", "name" : "保存", "createTime" : null, - "updateTime" : 1644046192172, + "updateTime" : 1644121682487, "lock" : "0", "method" : "POST", "path" : "/save", "parameters" : [ ], - "option" : "[]", - "requestBody" : "", + "option" : "[{\"name\":\"permission\",\"value\":\"user:save\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : null, "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : null, - "optionMap" : { } + "optionMap" : { + "permission" : "user:save" + } } ================================ import cn.dev33.satoken.secure.SaSecureUtil; diff --git a/data/magic-api/api/后台/用户管理/列表.ms b/data/magic-api/api/后台/用户管理/列表.ms index b854663..1939ca9 100644 --- a/data/magic-api/api/后台/用户管理/列表.ms +++ b/data/magic-api/api/后台/用户管理/列表.ms @@ -5,13 +5,13 @@ "groupId" : "4f0230049d7e4f39b1e0897cc0f46f9a", "name" : "列表", "createTime" : null, - "updateTime" : 1643965494984, + "updateTime" : 1644121683184, "lock" : "0", "method" : "GET", "path" : "/list", "parameters" : [ ], - "option" : "[]", - "requestBody" : "", + "option" : "[{\"name\":\"permission\",\"value\":\"user:view\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : "{\n \"code\": 402,\n \"message\": \"凭证已过期\",\n \"data\": null,\n \"timestamp\": 1643964929030,\n \"executeTime\": null\n}", @@ -90,7 +90,9 @@ "children" : [ ] } ] }, - "optionMap" : { } + "optionMap" : { + "permission" : "user:view" + } } ================================ return db.page(""" diff --git a/data/magic-api/api/后台/用户管理/删除.ms b/data/magic-api/api/后台/用户管理/删除.ms index decdc07..4aed604 100644 --- a/data/magic-api/api/后台/用户管理/删除.ms +++ b/data/magic-api/api/后台/用户管理/删除.ms @@ -5,20 +5,22 @@ "groupId" : "4f0230049d7e4f39b1e0897cc0f46f9a", "name" : "删除", "createTime" : null, - "updateTime" : 1641218486141, + "updateTime" : 1644121688496, "lock" : "0", "method" : "POST", "path" : "/delete", "parameters" : [ ], - "option" : "[]", - "requestBody" : "", + "option" : "[{\"name\":\"permission\",\"value\":\"user:delete\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : null, "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : null, - "optionMap" : { } + "optionMap" : { + "permission" : "user:delete" + } } ================================ import org.ssssssss.magicapi.cache.SqlCache diff --git a/data/magic-api/api/后台/组织机构/保存.ms b/data/magic-api/api/后台/组织机构/保存.ms index b429ae2..77de662 100644 --- a/data/magic-api/api/后台/组织机构/保存.ms +++ b/data/magic-api/api/后台/组织机构/保存.ms @@ -5,12 +5,12 @@ "groupId" : "8295fc13678d4144bf7363c465247a50", "name" : "保存", "createTime" : null, - "updateTime" : 1644046432007, + "updateTime" : 1644121675551, "lock" : "0", "method" : "POST", "path" : "/save", "parameters" : [ ], - "option" : "[{\"name\":\"wrap_request_parameter\",\"value\":\"data\",\"description\":\"包装请求参数到一个变量中\"}]", + "option" : "[{\"name\":\"wrap_request_parameter\",\"value\":\"data\",\"description\":\"包装请求参数到一个变量中\"},{\"name\":\"permission\",\"value\":\"office:save\",\"description\":\"允许拥有该权限的访问\"}]", "requestBody" : "{}", "headers" : [ ], "paths" : [ ], @@ -19,7 +19,8 @@ "requestBodyDefinition" : null, "responseBodyDefinition" : null, "optionMap" : { - "wrap_request_parameter" : "data" + "wrap_request_parameter" : "data", + "permission" : "office:save" } } ================================ diff --git a/data/magic-api/api/后台/组织机构/列表.ms b/data/magic-api/api/后台/组织机构/列表.ms index 8ff6105..623cf71 100644 --- a/data/magic-api/api/后台/组织机构/列表.ms +++ b/data/magic-api/api/后台/组织机构/列表.ms @@ -5,13 +5,13 @@ "groupId" : "8295fc13678d4144bf7363c465247a50", "name" : "列表", "createTime" : null, - "updateTime" : 1642134990129, + "updateTime" : 1644121676212, "lock" : "0", "method" : "GET", "path" : "/tree", "parameters" : [ ], - "option" : "[]", - "requestBody" : "", + "option" : "[{\"name\":\"permission\",\"value\":\"office:view\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": {\n \"list\": [{\n \"id\": \"4c37a80226134bce8bc91c8fc04a7d2f\",\n \"name\": \"马小东公司\",\n \"pid\": \"0\",\n \"type\": \"2\",\n \"sort\": 10,\n \"code\": \"mxd\",\n \"children\": [{\n \"id\": \"81b5493cdb31477f9ceea85b2cd08f15\",\n \"name\": \"马小东子公司\",\n \"pid\": \"4c37a80226134bce8bc91c8fc04a7d2f\",\n \"type\": null,\n \"sort\": 10,\n \"code\": \"mxdz\",\n \"children\": []\n }, {\n \"id\": \"31b365008f994e93850186126fce87cb\",\n \"name\": \"马小东子公司2\",\n \"pid\": \"4c37a80226134bce8bc91c8fc04a7d2f\",\n \"type\": null,\n \"sort\": 20,\n \"code\": \"mxdzz\",\n \"children\": []\n }]\n }, {\n \"id\": \"935126327e2a4f90b3f485f818f61ea5\",\n \"name\": \"吕金泽公司\",\n \"pid\": \"0\",\n \"type\": null,\n \"sort\": 20,\n \"code\": \"ljz\",\n \"children\": [{\n \"id\": \"1ae0299fc79b43c6b0ae2e14756ec41a\",\n \"name\": \"吕金泽子公司\",\n \"pid\": \"935126327e2a4f90b3f485f818f61ea5\",\n \"type\": null,\n \"sort\": 10,\n \"code\": \"ljzz\",\n \"children\": []\n }]\n }],\n \"total\": 2\n },\n \"timestamp\": 1642134812650,\n \"executeTime\": 9\n}", @@ -306,7 +306,9 @@ "children" : [ ] } ] }, - "optionMap" : { } + "optionMap" : { + "permission" : "office:view" + } } ================================ var toTree = (list,pid) => select t.*,toTree(list,t.id) children from list t where t.pid = pid diff --git a/data/magic-api/api/后台/组织机构/删除.ms b/data/magic-api/api/后台/组织机构/删除.ms index ae09ee3..4569083 100644 --- a/data/magic-api/api/后台/组织机构/删除.ms +++ b/data/magic-api/api/后台/组织机构/删除.ms @@ -5,13 +5,13 @@ "groupId" : "8295fc13678d4144bf7363c465247a50", "name" : "删除", "createTime" : null, - "updateTime" : 1641732068899, + "updateTime" : 1644121676877, "lock" : "0", "method" : "POST", "path" : "/delete", "parameters" : [ ], - "option" : "[]", - "requestBody" : "{\r\n\t\r\n}", + "option" : "[{\"name\":\"permission\",\"value\":\"office:delete\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": null,\n \"timestamp\": 1641201245421,\n \"executeTime\": 7\n}", @@ -90,7 +90,9 @@ "children" : [ ] } ] }, - "optionMap" : { } + "optionMap" : { + "permission" : "office:delete" + } } ================================ // db.table('sys_user_office').where().eq("office_id",id).delete(); diff --git a/data/magic-api/api/后台/菜单管理/保存.ms b/data/magic-api/api/后台/菜单管理/保存.ms index 4b18633..b69f489 100644 --- a/data/magic-api/api/后台/菜单管理/保存.ms +++ b/data/magic-api/api/后台/菜单管理/保存.ms @@ -5,12 +5,12 @@ "groupId" : "67b2ce258e24491194b74992958c74aa", "name" : "保存", "createTime" : null, - "updateTime" : 1644031443910, + "updateTime" : 1644121672548, "lock" : "0", "method" : "POST", "path" : "/save", "parameters" : [ ], - "option" : "[{\"name\":\"wrap_request_parameter\",\"value\":\"data\",\"description\":\"包装请求参数到一个变量中\"}]", + "option" : "[{\"name\":\"wrap_request_parameter\",\"value\":\"data\",\"description\":\"包装请求参数到一个变量中\"},{\"name\":\"permission\",\"value\":\"menu:save\",\"description\":\"允许拥有该权限的访问\"}]", "requestBody" : "{}", "headers" : [ ], "paths" : [ ], @@ -19,7 +19,8 @@ "requestBodyDefinition" : null, "responseBodyDefinition" : null, "optionMap" : { - "wrap_request_parameter" : "data" + "wrap_request_parameter" : "data", + "permission" : "menu:save" } } ================================ diff --git a/data/magic-api/api/后台/菜单管理/删除.ms b/data/magic-api/api/后台/菜单管理/删除.ms index 606447a..0f387ba 100644 --- a/data/magic-api/api/后台/菜单管理/删除.ms +++ b/data/magic-api/api/后台/菜单管理/删除.ms @@ -5,7 +5,7 @@ "groupId" : "67b2ce258e24491194b74992958c74aa", "name" : "删除", "createTime" : null, - "updateTime" : 1641276678116, + "updateTime" : 1644121673352, "lock" : "0", "method" : "POST", "path" : "/delete", @@ -22,8 +22,8 @@ "expression" : null, "children" : null } ], - "option" : "[]", - "requestBody" : "{\r\n\t\r\n}", + "option" : "[{\"name\":\"permission\",\"value\":\"menu:delete\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": null,\n \"timestamp\": 1641201245421,\n \"executeTime\": 7\n}", @@ -102,7 +102,9 @@ "children" : [ ] } ] }, - "optionMap" : { } + "optionMap" : { + "permission" : "menu:delete" + } } ================================ import '@get:/menu/cache/delete' as cacheDelete; diff --git a/data/magic-api/api/后台/菜单管理/获取菜单tree.ms b/data/magic-api/api/后台/菜单管理/获取菜单tree.ms index ea9d551..99df5e1 100644 --- a/data/magic-api/api/后台/菜单管理/获取菜单tree.ms +++ b/data/magic-api/api/后台/菜单管理/获取菜单tree.ms @@ -5,13 +5,13 @@ "groupId" : "67b2ce258e24491194b74992958c74aa", "name" : "获取菜单tree", "createTime" : null, - "updateTime" : 1641483087321, + "updateTime" : 1644121674088, "lock" : "0", "method" : "GET", "path" : "/tree", "parameters" : [ ], - "option" : "[]", - "requestBody" : "{\r\n\t\r\n}", + "option" : "[{\"name\":\"permission\",\"value\":\"menu:view\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : "{\n \"code\": 402,\n \"message\": \"凭证已过期\",\n \"data\": null,\n \"timestamp\": 1634309660370,\n \"executeTime\": null\n}", @@ -90,7 +90,9 @@ "children" : [ ] } ] }, - "optionMap" : { } + "optionMap" : { + "permission" : "menu:view" + } } ================================ var toTree = (list,pid) => select t.*,toTree(list,t.id) children from list t where t.pid = pid diff --git a/data/magic-api/api/后台/角色管理/保存.ms b/data/magic-api/api/后台/角色管理/保存.ms index 44939e9..3aa1387 100644 --- a/data/magic-api/api/后台/角色管理/保存.ms +++ b/data/magic-api/api/后台/角色管理/保存.ms @@ -5,13 +5,13 @@ "groupId" : "89130d496f6f467c88b22ae4a7f688eb", "name" : "保存", "createTime" : null, - "updateTime" : 1644046445441, + "updateTime" : 1644121680268, "lock" : "0", "method" : "POST", "path" : "/save", "parameters" : [ ], - "option" : "[{\"name\":\"\",\"value\":\"\",\"description\":\"\"}]", - "requestBody" : "", + "option" : "[{\"name\":\"permission\",\"value\":\"role:save\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : null, @@ -19,7 +19,7 @@ "requestBodyDefinition" : null, "responseBodyDefinition" : null, "optionMap" : { - "" : "" + "permission" : "role:save" } } ================================ diff --git a/data/magic-api/api/后台/角色管理/列表.ms b/data/magic-api/api/后台/角色管理/列表.ms index 6a279b0..8619fdd 100644 --- a/data/magic-api/api/后台/角色管理/列表.ms +++ b/data/magic-api/api/后台/角色管理/列表.ms @@ -5,13 +5,13 @@ "groupId" : "89130d496f6f467c88b22ae4a7f688eb", "name" : "列表", "createTime" : null, - "updateTime" : 1642061119644, + "updateTime" : 1644121680976, "lock" : "0", "method" : "GET", "path" : "/list", "parameters" : [ ], "option" : "[{\"name\":\"permission\",\"value\":\"role:view\",\"description\":\"允许拥有该权限的访问\"}]", - "requestBody" : "", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": {\n \"total\": 1,\n \"list\": [\n {\n \"id\": \"1\",\n \"name\": \"管理员\"\n }\n ]\n },\n \"timestamp\": 1634309991187,\n \"executeTime\": 5\n}", diff --git a/data/magic-api/api/后台/角色管理/删除.ms b/data/magic-api/api/后台/角色管理/删除.ms index c3f2537..baad4d7 100644 --- a/data/magic-api/api/后台/角色管理/删除.ms +++ b/data/magic-api/api/后台/角色管理/删除.ms @@ -5,20 +5,22 @@ "groupId" : "89130d496f6f467c88b22ae4a7f688eb", "name" : "删除", "createTime" : null, - "updateTime" : 1641276685001, + "updateTime" : 1644121681716, "lock" : "0", "method" : "POST", "path" : "/delete", "parameters" : [ ], - "option" : "[]", - "requestBody" : "{\r\n\t\r\n}", + "option" : "[{\"name\":\"permission\",\"value\":\"role:delete\",\"description\":\"允许拥有该权限的访问\"}]", + "requestBody" : "{\n\n}", "headers" : [ ], "paths" : [ ], "responseBody" : null, "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : null, - "optionMap" : { } + "optionMap" : { + "permission" : "role:delete" + } } ================================ import '@get:/role/cache/delete' as cacheDelete diff --git a/magic-boot-ui/.env.preview b/magic-boot-ui/.env.preview new file mode 100644 index 0000000..0dda897 --- /dev/null +++ b/magic-boot-ui/.env.preview @@ -0,0 +1,2 @@ +NODE_ENV = preview +VUE_APP_BASE_API = 'http://localhost:8081/' diff --git a/magic-boot-ui/package.json b/magic-boot-ui/package.json index 2996266..4c355e7 100644 --- a/magic-boot-ui/package.json +++ b/magic-boot-ui/package.json @@ -6,8 +6,9 @@ "license": "MIT", "scripts": { "serve": "vue-cli-service serve --open", + "serve:preview": "vue-cli-service serve --mode preview --open", "build": "vue-cli-service build", - "preview": "node build/index.js --preview", + "preview": "vue-cli-service build --mode preview", "lint": "eslint --ext .js,.vue src", "test:unit": "jest --clearCache && vue-cli-service test:unit", "test:ci": "npm run lint && npm run test:unit", diff --git a/magic-boot-ui/src/scripts/error-log.js b/magic-boot-ui/src/scripts/error-log.js index b555b5a..7d29749 100644 --- a/magic-boot-ui/src/scripts/error-log.js +++ b/magic-boot-ui/src/scripts/error-log.js @@ -9,7 +9,6 @@ const { errorLog: needErrorLog } = settings function checkNeed() { const env = process.env.NODE_ENV - console.log(needErrorLog) if (isString(needErrorLog)) { return env === needErrorLog } diff --git a/magic-boot-ui/src/scripts/hasPermission.js b/magic-boot-ui/src/scripts/hasPermission.js index 1e13700..8036449 100644 --- a/magic-boot-ui/src/scripts/hasPermission.js +++ b/magic-boot-ui/src/scripts/hasPermission.js @@ -5,7 +5,7 @@ const hasPermission = { bind(el, binding, vnode) { if (binding.value) { const permissionList = Vue.prototype.$authorities - if (permissionList && permissionList.length && !permissionList.includes(binding.value)) { + if (permissionList && permissionList.length && !permissionList.includes(binding.value) && process.env.NODE_ENV != 'preview') { el.style.display = 'none' } } diff --git a/magic-boot-ui/src/scripts/request.js b/magic-boot-ui/src/scripts/request.js index 8c48a51..915305a 100644 --- a/magic-boot-ui/src/scripts/request.js +++ b/magic-boot-ui/src/scripts/request.js @@ -85,6 +85,9 @@ service.interceptors.response.use( if(currentMessage){ currentMessage.close() } + if(res.code == 403 && process.env.NODE_ENV == 'preview'){ + res.message = '演示模式,不允许操作!' + } currentMessage = Message({ message: res.message || 'Error', type: 'error', diff --git a/magic-boot-ui/src/scripts/treeTable.js b/magic-boot-ui/src/scripts/treeTable.js index 22371d8..9e4f96f 100644 --- a/magic-boot-ui/src/scripts/treeTable.js +++ b/magic-boot-ui/src/scripts/treeTable.js @@ -62,6 +62,7 @@ treeTable.deleteEmptyChildren = (children) => { } treeTable.recursionSearch = (fields, data, text, html) => { + html = html != undefined ? html : true var searchData = [] for(var i in data){ var treeNode = data[i] diff --git a/magic-boot-ui/src/views/system/dict/dict-list.vue b/magic-boot-ui/src/views/system/dict/dict-list.vue index 9711290..3ae523d 100644 --- a/magic-boot-ui/src/views/system/dict/dict-list.vue +++ b/magic-boot-ui/src/views/system/dict/dict-list.vue @@ -144,7 +144,7 @@ export default { } }, { - permission: 'dict:items', + permission: 'dict:items:view', title: '字典项', type: 'text', icon: 'el-icon-menu', diff --git a/magic-boot-ui/src/views/system/menu/menu-drag-tree-table.vue b/magic-boot-ui/src/views/system/menu/menu-drag-tree-table.vue deleted file mode 100644 index 375112d..0000000 --- a/magic-boot-ui/src/views/system/menu/menu-drag-tree-table.vue +++ /dev/null @@ -1,331 +0,0 @@ - - - - - diff --git a/magic-boot-ui/src/views/system/menu/menu-list.vue b/magic-boot-ui/src/views/system/menu/menu-list.vue index def4959..819c690 100644 --- a/magic-boot-ui/src/views/system/menu/menu-list.vue +++ b/magic-boot-ui/src/views/system/menu/menu-list.vue @@ -16,7 +16,7 @@ - + 添加菜单 展开/折叠 @@ -156,6 +156,7 @@ export default { { title: '添加下级菜单', type: 'text', + permission: 'menu:save', icon: 'el-icon-plus', click: (row) => { this.addSubMenu(row.id) @@ -164,6 +165,7 @@ export default { { title: '修改', type: 'text', + permission: 'menu:save', icon: 'el-icon-edit', click: (row) => { this.handleUpdate(row) @@ -172,6 +174,7 @@ export default { { title: '删除', type: 'text', + permission: 'menu:delete', icon: 'el-icon-delete', click: (row) => { this.$common.handleDelete({ diff --git a/magic-boot-ui/src/views/system/menu/menu-tree-list.vue b/magic-boot-ui/src/views/system/menu/menu-tree-list.vue deleted file mode 100644 index 3c31adf..0000000 --- a/magic-boot-ui/src/views/system/menu/menu-tree-list.vue +++ /dev/null @@ -1,230 +0,0 @@ - - - - - diff --git a/magic-boot-ui/src/views/system/menu/menu-vxe-list.vue b/magic-boot-ui/src/views/system/menu/menu-vxe-list.vue deleted file mode 100644 index f69886f..0000000 --- a/magic-boot-ui/src/views/system/menu/menu-vxe-list.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - diff --git a/magic-boot-ui/src/views/system/office/office-list.vue b/magic-boot-ui/src/views/system/office/office-list.vue index 253dec9..260c538 100644 --- a/magic-boot-ui/src/views/system/office/office-list.vue +++ b/magic-boot-ui/src/views/system/office/office-list.vue @@ -22,7 +22,7 @@ - + 添加机构 展开/折叠 @@ -155,6 +155,7 @@ export default { { title: '添加下级机构', type: 'text', + permission: 'office:save', icon: 'el-icon-plus', click: (row) => { this.addSubOffice(row.id) @@ -163,6 +164,7 @@ export default { { title: '修改', type: 'text', + permission: 'office:save', icon: 'el-icon-edit', click: (row) => { this.handleUpdate(row) @@ -171,6 +173,7 @@ export default { { title: '删除', type: 'text', + permission: 'office:delete', icon: 'el-icon-delete', click: (row) => { this.$common.handleDelete({ diff --git a/magic-boot-ui/src/views/system/user/user-list.vue b/magic-boot-ui/src/views/system/user/user-list.vue index 1fbf3ae..07988ed 100644 --- a/magic-boot-ui/src/views/system/user/user-list.vue +++ b/magic-boot-ui/src/views/system/user/user-list.vue @@ -29,7 +29,7 @@ 添加 - +