From c21e31fd333455dd9cfae6896783a895697db0b7 Mon Sep 17 00:00:00 2001
From: zegezy <1098696801@qq.com>
Date: Wed, 7 Jun 2023 16:24:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7magic-api=E6=9C=80=E6=96=B0?=
=?UTF-8?q?=E7=89=88=EF=BC=8C=E8=AF=BB=E5=8F=96=E8=8F=9C=E5=8D=95=E5=88=86?=
=?UTF-8?q?layout=E5=92=8CnotLayout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
data/magic-api/api/系统管理/用户管理/列表.ms | 7 +-
.../api/系统管理/菜单管理/当前用户菜单.ms | 60 +++++-
.../系统管理/菜单管理/当前用户隐藏菜单路由.ms | 203 ------------------
magic-boot/pom.xml | 2 +-
.../extension/ResponseFunctionExtension.java | 4 +-
.../interceptor/PermissionInterceptor.java | 7 +-
6 files changed, 65 insertions(+), 218 deletions(-)
delete mode 100644 data/magic-api/api/系统管理/菜单管理/当前用户隐藏菜单路由.ms
diff --git a/data/magic-api/api/系统管理/用户管理/列表.ms b/data/magic-api/api/系统管理/用户管理/列表.ms
index ac1337c..37adec4 100644
--- a/data/magic-api/api/系统管理/用户管理/列表.ms
+++ b/data/magic-api/api/系统管理/用户管理/列表.ms
@@ -5,7 +5,7 @@
"groupId" : "4f0230049d7e4f39b1e0897cc0f46f9a",
"name" : "列表",
"createTime" : null,
- "updateTime" : 1646552467748,
+ "updateTime" : 1681528279822,
"lock" : "0",
"createBy" : null,
"updateBy" : null,
@@ -116,8 +116,8 @@
"children" : [ ]
} ]
}
-}
-================================
+}
+================================
return db.page("""
select
distinct
@@ -128,6 +128,7 @@ return db.page("""
su.phone,
su.create_date,
su.office_id,
+ su.head_portrait,
so.name office_name,
(select group_concat(sr.name) from sys_role sr left join sys_user_role sur on sr.id = sur.role_id where sr.is_del = 0 and sur.user_id = su.id) roles
from sys_user su
diff --git a/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms b/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms
index a4830a0..25099e1 100644
--- a/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms
+++ b/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms
@@ -5,7 +5,7 @@
"groupId" : "67b2ce258e24491194b74992958c74aa",
"name" : "当前用户菜单",
"createTime" : null,
- "updateTime" : 1657368580988,
+ "updateTime" : 1685784587489,
"lock" : "0",
"createBy" : null,
"updateBy" : null,
@@ -16,7 +16,7 @@
"requestBody" : "{\n\n}",
"headers" : [ ],
"paths" : [ ],
- "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [{\n \"id\": \"b1851d1b13594e71840103c11a37a669\",\n \"title\": \"系统设置\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/system\",\n \"sort\": 10,\n \"icon\": \"settings\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/system\",\n \"meta\": {\n \"title\": \"系统设置\",\n \"icon\": \"settings\",\n \"keepAlive\": false\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"39be13ef6f0745568c80bf35202ddb2b\",\n \"title\": \"菜单管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/menu/menu-list\",\n \"sort\": 10,\n \"icon\": \"menu\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/menu/menu-list\",\n \"path\": \"/system/menu/menu-list\",\n \"meta\": {\n \"title\": \"菜单管理\",\n \"icon\": \"menu\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"6f3594d0-5445-41e1-a13c-890a57485036\",\n \"title\": \"组织机构\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/office/office-list\",\n \"sort\": 20,\n \"icon\": \"office\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/office/office-list\",\n \"path\": \"/system/office/office-list\",\n \"meta\": {\n \"title\": \"组织机构\",\n \"icon\": \"office\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"8e9455740091486c914495cfb0c7faa5\",\n \"title\": \"角色管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/role/role-list\",\n \"sort\": 40,\n \"icon\": \"role\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/role/role-list\",\n \"path\": \"/system/role/role-list\",\n \"meta\": {\n \"title\": \"角色管理\",\n \"icon\": \"role\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"06b8a427e4cd4c1ba11752070f565f20\",\n \"title\": \"用户管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/user/user-list\",\n \"sort\": 50,\n \"icon\": \"user\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/system/user/user-list\",\n \"meta\": {\n \"title\": \"用户管理\",\n \"icon\": \"user\",\n \"keepAlive\": true\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"10fc3bdde0c642aea2af34d281a49cf9\",\n \"title\": \"测试数据\",\n \"pid\": \"06b8a427e4cd4c1ba11752070f565f20\",\n \"isShow\": 0,\n \"url\": \"/system/test/test-list\",\n \"sort\": 100,\n \"icon\": \"home\",\n \"keepAlive\": 1,\n \"componentName\": \"data-test-list\",\n \"openMode\": \"0\",\n \"component\": \"/system/test/test-list\",\n \"path\": \"/system/test/test-list\",\n \"meta\": {\n \"title\": \"测试数据\",\n \"icon\": \"home\",\n \"keepAlive\": true\n }\n }]\n }, {\n \"id\": \"c5f407478c4e4c9cbcdbee6389d2c909\",\n \"title\": \"数据字典\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/dict/dict-list\",\n \"sort\": 60,\n \"icon\": \"dict\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/dict/dict-list\",\n \"path\": \"/system/dict/dict-list\",\n \"meta\": {\n \"title\": \"数据字典\",\n \"icon\": \"dict\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"7ad229f12c8f4b57bbb9349e2ffd8932\",\n \"title\": \"配置中心\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/configure/configure-list\",\n \"sort\": 110,\n \"icon\": \"configure\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/configure/configure-list\",\n \"path\": \"/system/configure/configure-list\",\n \"meta\": {\n \"title\": \"配置中心\",\n \"icon\": \"configure\",\n \"keepAlive\": false\n }\n }]\n }, {\n \"id\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"title\": \"一些例子\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/examples\",\n \"sort\": 20,\n \"icon\": \"examples\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/examples\",\n \"meta\": {\n \"title\": \"一些例子\",\n \"icon\": \"examples\",\n \"keepAlive\": false\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"dc332875-831e-4937-86ff-0c7420915ce9\",\n \"title\": \"三级联动\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/three-linkage\",\n \"sort\": 10,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/three-linkage\",\n \"path\": \"/examples/three-linkage\",\n \"meta\": {\n \"title\": \"三级联动\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"f09410d5-5043-4164-9f68-8d135de71b29\",\n \"title\": \"上传文件\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/upload-file\",\n \"sort\": 20,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/upload-file\",\n \"path\": \"/examples/upload-file\",\n \"meta\": {\n \"title\": \"上传文件\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"74c852ea-be4b-4533-b146-cfbd776045d5\",\n \"title\": \"富文本\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/ueditor-example\",\n \"sort\": 30,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/ueditor-example\",\n \"path\": \"/examples/ueditor-example\",\n \"meta\": {\n \"title\": \"富文本\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"91bdb7d742a64a8c8a8fdc6d3bb61581\",\n \"title\": \"可编辑表格\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/editor-table\",\n \"sort\": 40,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/editor-table\",\n \"path\": \"/examples/editor-table\",\n \"meta\": {\n \"title\": \"可编辑表格\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"2664b76cb2904227bce5b0f7d1dd6e7b\",\n \"title\": \"下拉框\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/select-example\",\n \"sort\": 60,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/select-example\",\n \"path\": \"/examples/select-example\",\n \"meta\": {\n \"title\": \"下拉框\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"c50388914fab408c8b74f83d0d43e557\",\n \"title\": \"测试列表\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/test-mb-list\",\n \"sort\": 70,\n \"icon\": null,\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/test-mb-list\",\n \"path\": \"/examples/test-mb-list\",\n \"meta\": {\n \"title\": \"测试列表\",\n \"icon\": null,\n \"keepAlive\": false\n }\n }, {\n \"id\": \"713626516eaa4ba98c9daf55009b481e\",\n \"title\": \"测试表单\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/test-mb-form\",\n \"sort\": 80,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/examples/test-mb-form\",\n \"path\": \"/examples/test-mb-form\",\n \"meta\": {\n \"title\": \"测试表单\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"9385945c7f5f476ab38885976907db2a\",\n \"title\": \"测试外链\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"http://localhost:8081/magic/web/index.html\",\n \"sort\": 90,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"http://localhost:8081/magic/web/index.html\",\n \"path\": \"http://localhost:8081/magic/web/index.html\",\n \"meta\": {\n \"title\": \"测试外链\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }]\n }, {\n \"id\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"title\": \"低代码\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/lowcode\",\n \"sort\": 30,\n \"icon\": \"examples\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/lowcode\",\n \"meta\": {\n \"title\": \"低代码\",\n \"icon\": \"examples\",\n \"keepAlive\": true\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"c7445e2ac6144a15a76d723607fbfb9d\",\n \"title\": \"接口管理\",\n \"pid\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"isShow\": 1,\n \"url\": \"/lowcode/magic-editor\",\n \"sort\": 20,\n \"icon\": \"interface\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/lowcode/magic-editor\",\n \"path\": \"/lowcode/magic-editor\",\n \"meta\": {\n \"title\": \"接口管理\",\n \"icon\": \"interface\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"99c6e9aeb6694c349f5db66e2516f069\",\n \"title\": \"代码生成\",\n \"pid\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"isShow\": 1,\n \"url\": \"/lowcode/code-gen-list\",\n \"sort\": 30,\n \"icon\": \"examples\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/lowcode/code-gen-list\",\n \"path\": \"/lowcode/code-gen-list\",\n \"meta\": {\n \"title\": \"代码生成\",\n \"icon\": \"examples\",\n \"keepAlive\": true\n }\n }, {\n \"id\": \"bf5c1e44546341de9acee52d148d5a76\",\n \"title\": \"测试生成\",\n \"pid\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"isShow\": 1,\n \"url\": \"/data/test\",\n \"sort\": 40,\n \"icon\": null,\n \"keepAlive\": 1,\n \"componentName\": \"data-test-list\",\n \"openMode\": \"0\",\n \"component\": \"/data/test\",\n \"path\": \"/data/test\",\n \"meta\": {\n \"title\": \"测试生成\",\n \"icon\": null,\n \"keepAlive\": true\n }\n }]\n }, {\n \"id\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"title\": \"系统监控\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/system/monitor\",\n \"sort\": 40,\n \"icon\": \"monitor\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/system/monitor\",\n \"meta\": {\n \"title\": \"系统监控\",\n \"icon\": \"monitor\",\n \"keepAlive\": false\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [{\n \"id\": \"4fc65edbe0544c369b58fdfed1523537\",\n \"title\": \"操作日志\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/oper-log\",\n \"sort\": 10,\n \"icon\": \"oper-log\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/monitor/oper-log\",\n \"path\": \"/system/monitor/oper-log\",\n \"meta\": {\n \"title\": \"操作日志\",\n \"icon\": \"oper-log\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"eee27ca353fb440aa5ac0bd7b38cad1d\",\n \"title\": \"登录日志\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/login-log\",\n \"sort\": 20,\n \"icon\": \"login-log\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/monitor/login-log\",\n \"path\": \"/system/monitor/login-log\",\n \"meta\": {\n \"title\": \"登录日志\",\n \"icon\": \"login-log\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"3a0e3107402449698d86ee3cbc5272c0\",\n \"title\": \"数据库监控\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/druid\",\n \"sort\": 30,\n \"icon\": \"database\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/system/monitor/druid\",\n \"path\": \"/system/monitor/druid\",\n \"meta\": {\n \"title\": \"数据库监控\",\n \"icon\": \"database\",\n \"keepAlive\": false\n }\n }, {\n \"id\": \"fdbdcf8b8d674ae38154bc1e57498a91\",\n \"title\": \"在线用户\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/online-user\",\n \"sort\": 40,\n \"icon\": \"user\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/monitor/online-user\",\n \"path\": \"/system/monitor/online-user\",\n \"meta\": {\n \"title\": \"在线用户\",\n \"icon\": \"user\",\n \"keepAlive\": false\n }\n }]\n }],\n \"timestamp\": 1657368503505,\n \"executeTime\": 18\n}",
+ "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": {\n \"notLayoutMenus\": [\n {\n \"openMode\": \"2\",\n \"componentName\": \"\",\n \"name\": \"操作日志\",\n \"path\": \"/system/monitor/oper-log\",\n \"subCount\": 0,\n \"keepAlive\": 1\n },\n {\n \"openMode\": \"0\",\n \"componentName\": \"\",\n \"name\": \"区域管理\",\n \"path\": \"/system/area\",\n \"subCount\": 0,\n \"keepAlive\": 0\n },\n {\n \"openMode\": \"1\",\n \"componentName\": \"\",\n \"name\": \"接口管理\",\n \"path\": \"/lowcode/magic-editor\",\n \"subCount\": 0,\n \"keepAlive\": 1\n },\n {\n \"openMode\": \"2\",\n \"componentName\": \"\",\n \"name\": \"登录日志\",\n \"path\": \"/system/monitor/login-log\",\n \"subCount\": 0,\n \"keepAlive\": 0\n }\n ],\n \"layoutMenus\": [\n {\n \"id\": \"b1851d1b13594e71840103c11a37a669\",\n \"title\": \"系统设置\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/system\",\n \"sort\": 10,\n \"icon\": \"settings\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/system\",\n \"meta\": {\n \"title\": \"系统设置\",\n \"icon\": \"settings\",\n \"keepAlive\": false\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [\n {\n \"id\": \"39be13ef6f0745568c80bf35202ddb2b\",\n \"title\": \"菜单管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/menu/menu-list\",\n \"sort\": 10,\n \"icon\": \"menu\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/menu/menu-list\",\n \"path\": \"/system/menu/menu-list\",\n \"meta\": {\n \"title\": \"菜单管理\",\n \"icon\": \"menu\",\n \"keepAlive\": true\n }\n },\n {\n \"id\": \"6f3594d0-5445-41e1-a13c-890a57485036\",\n \"title\": \"组织机构\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/office/office-list\",\n \"sort\": 20,\n \"icon\": \"office\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/office/office-list\",\n \"path\": \"/system/office/office-list\",\n \"meta\": {\n \"title\": \"组织机构\",\n \"icon\": \"office\",\n \"keepAlive\": true\n }\n },\n {\n \"id\": \"8e9455740091486c914495cfb0c7faa5\",\n \"title\": \"角色管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/role/role-list\",\n \"sort\": 40,\n \"icon\": \"role\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/role/role-list\",\n \"path\": \"/system/role/role-list\",\n \"meta\": {\n \"title\": \"角色管理\",\n \"icon\": \"role\",\n \"keepAlive\": true\n }\n },\n {\n \"id\": \"06b8a427e4cd4c1ba11752070f565f20\",\n \"title\": \"用户管理\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/user/user-list\",\n \"sort\": 50,\n \"icon\": \"user\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/user/user-list\",\n \"path\": \"/system/user/user-list\",\n \"meta\": {\n \"title\": \"用户管理\",\n \"icon\": \"user\",\n \"keepAlive\": true\n }\n },\n {\n \"id\": \"c5f407478c4e4c9cbcdbee6389d2c909\",\n \"title\": \"数据字典\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/dict/dict-list\",\n \"sort\": 60,\n \"icon\": \"dict\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/dict/dict-list\",\n \"path\": \"/system/dict/dict-list\",\n \"meta\": {\n \"title\": \"数据字典\",\n \"icon\": \"dict\",\n \"keepAlive\": true\n }\n },\n {\n \"id\": \"10fc3bdde0c642aea2af34d281a49cf9\",\n \"title\": \"测试数据\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/test/test-list\",\n \"sort\": 100,\n \"icon\": \"home\",\n \"keepAlive\": 1,\n \"componentName\": \"data-test-list\",\n \"openMode\": \"0\",\n \"component\": \"/system/test/test-list\",\n \"path\": \"/system/test/test-list\",\n \"meta\": {\n \"title\": \"测试数据\",\n \"icon\": \"home\",\n \"keepAlive\": true\n }\n },\n {\n \"id\": \"7ad229f12c8f4b57bbb9349e2ffd8932\",\n \"title\": \"配置中心\",\n \"pid\": \"b1851d1b13594e71840103c11a37a669\",\n \"isShow\": 1,\n \"url\": \"/system/configure/configure-list\",\n \"sort\": 110,\n \"icon\": \"configure\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/configure/configure-list\",\n \"path\": \"/system/configure/configure-list\",\n \"meta\": {\n \"title\": \"配置中心\",\n \"icon\": \"configure\",\n \"keepAlive\": true\n }\n }\n ]\n },\n {\n \"id\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"title\": \"一些例子\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/examples\",\n \"sort\": 20,\n \"icon\": \"examples\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/examples\",\n \"meta\": {\n \"title\": \"一些例子\",\n \"icon\": \"examples\",\n \"keepAlive\": false\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [\n {\n \"id\": \"dc332875-831e-4937-86ff-0c7420915ce9\",\n \"title\": \"三级联动\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/three-linkage\",\n \"sort\": 10,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/three-linkage\",\n \"path\": \"/examples/three-linkage\",\n \"meta\": {\n \"title\": \"三级联动\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n },\n {\n \"id\": \"f09410d5-5043-4164-9f68-8d135de71b29\",\n \"title\": \"上传文件\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/upload-file\",\n \"sort\": 20,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/upload-file\",\n \"path\": \"/examples/upload-file\",\n \"meta\": {\n \"title\": \"上传文件\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n },\n {\n \"id\": \"74c852ea-be4b-4533-b146-cfbd776045d5\",\n \"title\": \"富文本\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/ueditor-example\",\n \"sort\": 30,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/ueditor-example\",\n \"path\": \"/examples/ueditor-example\",\n \"meta\": {\n \"title\": \"富文本\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n },\n {\n \"id\": \"91bdb7d742a64a8c8a8fdc6d3bb61581\",\n \"title\": \"可编辑表格\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/editor-table\",\n \"sort\": 40,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/editor-table\",\n \"path\": \"/examples/editor-table\",\n \"meta\": {\n \"title\": \"可编辑表格\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n },\n {\n \"id\": \"2664b76cb2904227bce5b0f7d1dd6e7b\",\n \"title\": \"下拉框\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/select-example\",\n \"sort\": 60,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/select-example\",\n \"path\": \"/examples/select-example\",\n \"meta\": {\n \"title\": \"下拉框\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n },\n {\n \"id\": \"c50388914fab408c8b74f83d0d43e557\",\n \"title\": \"测试列表\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/test-mb-list\",\n \"sort\": 70,\n \"icon\": null,\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"/examples/test-mb-list\",\n \"path\": \"/examples/test-mb-list\",\n \"meta\": {\n \"title\": \"测试列表\",\n \"icon\": null,\n \"keepAlive\": false\n }\n },\n {\n \"id\": \"713626516eaa4ba98c9daf55009b481e\",\n \"title\": \"测试表单\",\n \"pid\": \"641253af-8ea1-4b5d-8bc3-a7165ef60ff2\",\n \"isShow\": 1,\n \"url\": \"/examples/test-mb-form\",\n \"sort\": 80,\n \"icon\": \"\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/examples/test-mb-form\",\n \"path\": \"/examples/test-mb-form\",\n \"meta\": {\n \"title\": \"测试表单\",\n \"icon\": \"\",\n \"keepAlive\": false\n }\n }\n ]\n },\n {\n \"id\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"title\": \"低代码\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/lowcode\",\n \"sort\": 30,\n \"icon\": \"examples\",\n \"keepAlive\": 1,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/lowcode\",\n \"meta\": {\n \"title\": \"低代码\",\n \"icon\": \"examples\",\n \"keepAlive\": true\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [\n {\n \"id\": \"c7445e2ac6144a15a76d723607fbfb9d\",\n \"title\": \"接口管理\",\n \"pid\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"isShow\": 1,\n \"url\": \"/lowcode/magic-editor\",\n \"sort\": 20,\n \"icon\": \"interface\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"1\",\n \"component\": \"/lowcode/magic-editor\",\n \"path\": \"/lowcode/magic-editor\",\n \"meta\": {\n \"title\": \"接口管理\",\n \"icon\": \"interface\",\n \"keepAlive\": true\n }\n },\n {\n \"id\": \"99c6e9aeb6694c349f5db66e2516f069\",\n \"title\": \"代码生成\",\n \"pid\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"isShow\": 1,\n \"url\": \"/lowcode/code-gen-list\",\n \"sort\": 30,\n \"icon\": \"examples\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/lowcode/code-gen-list\",\n \"path\": \"/lowcode/code-gen-list\",\n \"meta\": {\n \"title\": \"代码生成\",\n \"icon\": \"examples\",\n \"keepAlive\": true\n }\n },\n {\n \"id\": \"bf5c1e44546341de9acee52d148d5a76\",\n \"title\": \"测试生成\",\n \"pid\": \"d7f8d052d4864bd285c575c3cf2dce69\",\n \"isShow\": 1,\n \"url\": \"/data/test\",\n \"sort\": 40,\n \"icon\": null,\n \"keepAlive\": 1,\n \"componentName\": \"data-test-list\",\n \"openMode\": \"0\",\n \"component\": \"/data/test\",\n \"path\": \"/data/test\",\n \"meta\": {\n \"title\": \"测试生成\",\n \"icon\": null,\n \"keepAlive\": true\n }\n }\n ]\n },\n {\n \"id\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"title\": \"系统监控\",\n \"pid\": \"0\",\n \"isShow\": 1,\n \"url\": \"/system/monitor\",\n \"sort\": 40,\n \"icon\": \"monitor\",\n \"keepAlive\": 0,\n \"componentName\": null,\n \"openMode\": \"0\",\n \"component\": \"Layout\",\n \"path\": \"/system/monitor\",\n \"meta\": {\n \"title\": \"系统监控\",\n \"icon\": \"monitor\",\n \"keepAlive\": false\n },\n \"redirect\": \"noRedirect\",\n \"alwaysShow\": true,\n \"children\": [\n {\n \"id\": \"4fc65edbe0544c369b58fdfed1523537\",\n \"title\": \"操作日志\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/oper-log\",\n \"sort\": 10,\n \"icon\": \"oper-log\",\n \"keepAlive\": 1,\n \"componentName\": \"\",\n \"openMode\": \"2\",\n \"component\": \"/system/monitor/oper-log\",\n \"path\": \"/system/monitor/oper-log\",\n \"meta\": {\n \"title\": \"操作日志\",\n \"icon\": \"oper-log\",\n \"keepAlive\": true\n }\n },\n {\n \"id\": \"eee27ca353fb440aa5ac0bd7b38cad1d\",\n \"title\": \"登录日志\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/login-log\",\n \"sort\": 20,\n \"icon\": \"login-log\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"2\",\n \"component\": \"/system/monitor/login-log\",\n \"path\": \"/system/monitor/login-log\",\n \"meta\": {\n \"title\": \"登录日志\",\n \"icon\": \"login-log\",\n \"keepAlive\": false\n }\n },\n {\n \"id\": \"3a0e3107402449698d86ee3cbc5272c0\",\n \"title\": \"数据库监控\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/druid\",\n \"sort\": 30,\n \"icon\": \"database\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/monitor/druid\",\n \"path\": \"/system/monitor/druid\",\n \"meta\": {\n \"title\": \"数据库监控\",\n \"icon\": \"database\",\n \"keepAlive\": false\n }\n },\n {\n \"id\": \"fdbdcf8b8d674ae38154bc1e57498a91\",\n \"title\": \"在线用户\",\n \"pid\": \"4a57f57fc7324c94b6390f1a2dd1f49a\",\n \"isShow\": 1,\n \"url\": \"/system/monitor/online-user\",\n \"sort\": 40,\n \"icon\": \"user\",\n \"keepAlive\": 0,\n \"componentName\": \"\",\n \"openMode\": \"0\",\n \"component\": \"/system/monitor/online-user\",\n \"path\": \"/system/monitor/online-user\",\n \"meta\": {\n \"title\": \"在线用户\",\n \"icon\": \"user\",\n \"keepAlive\": false\n }\n }\n ]\n }\n ]\n },\n \"timestamp\": 1685779287696,\n \"executeTime\": 48\n}",
"description" : null,
"requestBodyDefinition" : {
"name" : "",
@@ -548,12 +548,53 @@
"children" : [ ]
} ]
}
-}
-================================
+}
+================================
import 'cn.dev33.satoken.stp.StpUtil';
var userId = StpUtil.getLoginId()
+// 查出所有隐藏或者打开方式为“页签”和“iframe”的菜单（排除http地址和静态页面）
+var notLayoutMenus = db.select("""
+ select * from (
+ select
+ open_mode,
+ component_name,
+ name,
+ url as path,
+ -- 查询下级是否还有菜单（不包含按钮权限）
+ (
+ select count(1) from sys_menu where is_del = 0 and pid = sm.id and
+ ((component_name is not null and component_name != '') or (url is not null and url != ''))
+ ) sub_count,
+ sm.keep_alive
+ from sys_menu sm
+ where is_del = 0 and ((component_name is not null and component_name != '') or (
+ url is not null and url != ''
+ -- 排除不需要加载路由的菜单
+ and url not like 'http%'
+ and url not like '%.htm'
+ and url not like '%.html'
+ ))
+ and
+ (
+ -- 查出来隐藏的需要加载的路由
+ is_show = 0
+ or
+ -- 新标签页和iframe
+ open_mode in ('1', '2')
+ )
+ ?{userId != '1',
+ and sm.id in (
+ select menu_id from sys_role_menu where role_id in (
+ select role_id from sys_user_role where user_id = #{userId}
+ )
+ )
+ }
+ ) sm where sub_count = 0
+""")
+
+// 查出所有显示的菜单
var menus = db.select("""
select
sm.id,
@@ -583,6 +624,8 @@ for(menu in menus){
menu.meta.title = menu.title
menu.meta.icon = menu.icon
menu.meta.keepAlive = (menu.keepAlive == '1' ? true : false)
+ menu.meta.openMode = menu.openMode
+ menu.meta.path = menu.path
}
var nodes = menus.toMap(it => it.id)
nodes.each((key, node) => {
@@ -596,7 +639,7 @@ nodes.each((key, node) => {
nodes[node.pid].children.push(node)
}
})
-var treeNodes = []
+var layoutMenus = []
nodes.each((key, node) => {
if(node.pid == '0'){
if(node.component != 'Layout'){
@@ -607,8 +650,11 @@ nodes.each((key, node) => {
children: [node]
}
}
- treeNodes.push(node)
+ layoutMenus.push(node)
}
})
-return treeNodes
+return {
+ notLayoutMenus,
+ layoutMenus
+}
diff --git a/data/magic-api/api/系统管理/菜单管理/当前用户隐藏菜单路由.ms b/data/magic-api/api/系统管理/菜单管理/当前用户隐藏菜单路由.ms
deleted file mode 100644
index 6247dce..0000000
--- a/data/magic-api/api/系统管理/菜单管理/当前用户隐藏菜单路由.ms
+++ /dev/null
@@ -1,203 +0,0 @@
-{
- "properties" : { },
- "id" : "2da55da9c28c441ebfdef412e7004cd0",
- "script" : null,
- "groupId" : "67b2ce258e24491194b74992958c74aa",
- "name" : "当前用户隐藏菜单路由",
- "createTime" : null,
- "updateTime" : 1660381679813,
- "lock" : null,
- "createBy" : null,
- "updateBy" : "guyi",
- "path" : "/current/hidden/menus",
- "method" : "POST",
- "parameters" : [ ],
- "options" : [ ],
- "requestBody" : "",
- "headers" : [ ],
- "paths" : [ ],
- "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [{\n \"componentName\": \"\",\n \"name\": \"创建售后单\",\n \"path\": \"order/aftersales/after-sales\",\n \"subCount\": 0,\n \"keepAlive\": 1,\n \"openMode\": \"0\"\n }],\n \"timestamp\": 1660381448247,\n \"executeTime\": 41\n}",
- "description" : null,
- "requestBodyDefinition" : null,
- "responseBodyDefinition" : {
- "name" : "",
- "value" : "",
- "description" : "",
- "required" : false,
- "dataType" : "Object",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ {
- "name" : "code",
- "value" : "200",
- "description" : "",
- "required" : false,
- "dataType" : "Integer",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ ]
- }, {
- "name" : "message",
- "value" : "success",
- "description" : "",
- "required" : false,
- "dataType" : "String",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ ]
- }, {
- "name" : "data",
- "value" : "",
- "description" : "",
- "required" : false,
- "dataType" : "Array",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ {
- "name" : "",
- "value" : "",
- "description" : "",
- "required" : false,
- "dataType" : "Object",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ {
- "name" : "componentName",
- "value" : "",
- "description" : "",
- "required" : false,
- "dataType" : "String",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ ]
- }, {
- "name" : "name",
- "value" : "创建售后单",
- "description" : "",
- "required" : false,
- "dataType" : "String",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ ]
- }, {
- "name" : "path",
- "value" : "order/aftersales/after-sales",
- "description" : "",
- "required" : false,
- "dataType" : "String",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ ]
- }, {
- "name" : "subCount",
- "value" : "0",
- "description" : "",
- "required" : false,
- "dataType" : "Integer",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ ]
- }, {
- "name" : "keepAlive",
- "value" : "1",
- "description" : "",
- "required" : false,
- "dataType" : "Integer",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ ]
- }, {
- "name" : "openMode",
- "value" : "0",
- "description" : "",
- "required" : false,
- "dataType" : "String",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ ]
- } ]
- } ]
- }, {
- "name" : "timestamp",
- "value" : "1660381448247",
- "description" : "",
- "required" : false,
- "dataType" : "Long",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ ]
- }, {
- "name" : "executeTime",
- "value" : "41",
- "description" : "",
- "required" : false,
- "dataType" : "Integer",
- "type" : null,
- "defaultValue" : null,
- "validateType" : "",
- "error" : "",
- "expression" : "",
- "children" : [ ]
- } ]
- }
-}
-================================
-import cn.dev33.satoken.stp.StpUtil
-
-var userId = StpUtil.getLoginId()
-return db.select("""
- select * from (
- select
- component_name,
- name,
- url as path,
- (select count(1) from sys_menu where is_del = 0 and pid = sm.id) sub_count,
- sm.keep_alive
- from sys_menu sm
- where ((component_name is not null and component_name != '') or (url is not null and url != ''))
- and is_show = 0 and is_del = 0
- ?{userId != '1',
- and sm.id in (
- select menu_id from sys_role_menu where role_id in (
- select role_id from sys_user_role where user_id = #{userId}
- )
- )
- }
- ) sm where sub_count = 0
-""")
\ No newline at end of file
diff --git a/magic-boot/pom.xml b/magic-boot/pom.xml
index 81e3d0e..6f43c7a 100644
--- a/magic-boot/pom.xml
+++ b/magic-boot/pom.xml
@@ -14,7 +14,7 @@
magic-boot
1.8
- 2.0.2
+ 2.1.1
1.1.10
5.7.22
1.26.0
diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java b/magic-boot/src/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java
index fbbf370..674c62f 100644
--- a/magic-boot/src/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java
+++ b/magic-boot/src/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java
@@ -5,6 +5,7 @@ import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.ssssssss.magicapi.core.context.RequestContext;
+import org.ssssssss.magicapi.core.servlet.MagicHttpServletRequest;
import org.ssssssss.magicapi.modules.servlet.ResponseModule;
import org.ssssssss.script.annotation.Comment;
import org.ssssssss.script.functions.ExtensionMethod;
@@ -32,7 +33,8 @@ public class ResponseFunctionExtension implements ExtensionMethod {
@Comment("转发")
public ResponseModule.NullValue dispatcher(ResponseModule responseModule, String url) throws ServletException, IOException {
- HttpServletRequest request = RequestContext.getHttpServletRequest();
+ MagicHttpServletRequest magicHttpServletRequest = RequestContext.getHttpServletRequest();
+ HttpServletRequest request = magicHttpServletRequest.getRequest();
request.getRequestDispatcher(url).forward(request, getResponse());
return responseModule.end();
}
diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java b/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java
index 70c8a11..ebfedf5 100644
--- a/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java
+++ b/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java
@@ -14,12 +14,13 @@ import org.ssssssss.magicapi.core.model.ApiInfo;
import org.ssssssss.magicapi.core.model.Options;
import org.ssssssss.magicapi.core.service.MagicAPIService;
import org.ssssssss.magicapi.core.service.MagicResourceService;
+import org.ssssssss.magicapi.core.servlet.MagicHttpServletRequest;
+import org.ssssssss.magicapi.core.servlet.MagicHttpServletResponse;
import org.ssssssss.magicapi.utils.PathUtils;
import org.ssssssss.magicboot.model.StatusCode;
import org.ssssssss.script.MagicScriptContext;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -42,7 +43,7 @@ public class PermissionInterceptor implements RequestInterceptor, HandlerInterce
* 当返回对象时，直接将此对象返回到页面，返回null时，继续执行后续操作
*/
@Override
- public Object preHandle(ApiInfo info, MagicScriptContext context, HttpServletRequest request, HttpServletResponse response) {
+ public Object preHandle(ApiInfo info, MagicScriptContext context, MagicHttpServletRequest request, MagicHttpServletResponse response) {
String requireLogin = Objects.toString(info.getOptionValue(Options.REQUIRE_LOGIN), "");
if(requireLogin.equals("false")){
return null;
@@ -64,7 +65,7 @@ public class PermissionInterceptor implements RequestInterceptor, HandlerInterce
public Object postHandle(RequestEntity requestEntity, Object returnValue) throws Exception {
if(StpUtil.isLogin()){
try {
- HttpServletRequest request = requestEntity.getRequest();
+ HttpServletRequest request = requestEntity.getRequest().getRequest();
ApiInfo info = requestEntity.getApiInfo();
template.update("insert into sys_oper_log(api_name, api_path, api_method, cost_time, create_by, create_date, user_agent, user_ip) values(?,?,?,?,?,?,?,?)",
// PathUtils.replaceSlash(groupServiceProvider.getFullName(info.getGroupId()) + "/" + info.getName()).replace("/","-"),