From 25b91353b146ebf2f984d49603b4ab89fc4ae955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com> Date: Mon, 28 Mar 2022 21:21:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E5=8A=A0?= =?UTF-8?q?=E5=89=8D=E7=BC=80path=20=E2=80=9C/system=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/系统功能/代码生成/执行生成.ms | 362 ------------------ .../api/{系统功能 => 系统管理}/group.json | 4 +- .../代码生成/group.json | 0 .../{系统功能 => 系统管理}/代码生成/保存.ms | 0 .../{系统功能 => 系统管理}/代码生成/列表.ms | 0 .../{系统功能 => 系统管理}/代码生成/删除.ms | 6 +- .../api/系统管理/代码生成/执行生成.ms | 100 +++++ .../代码生成/查出所有表.ms | 0 .../代码生成/根据表名查出所有列.ms | 0 .../{系统功能 => 系统管理}/代码生成/详情.ms | 0 .../在线用户/group.json | 0 .../{系统功能 => 系统管理}/在线用户/列表.ms | 0 .../{系统功能 => 系统管理}/在线用户/踢人.ms | 0 .../{系统功能 => 系统管理}/安全/group.json | 0 .../api/{系统功能 => 系统管理}/安全/登录.ms | 0 .../安全/获取当前用户权限code.ms | 0 .../{系统功能 => 系统管理}/安全/退出登录.ms | 0 .../{系统功能 => 系统管理}/安全/验证token.ms | 0 .../api/{系统功能 => 系统管理}/安全/验证码.ms | 0 .../{系统功能 => 系统管理}/富文本/group.json | 0 .../{系统功能 => 系统管理}/富文本/上传图片.ms | 0 .../{系统功能 => 系统管理}/富文本/上传文件.ms | 0 .../{系统功能 => 系统管理}/富文本/入口get.ms | 0 .../{系统功能 => 系统管理}/富文本/入口post.ms | 0 .../api/{系统功能 => 系统管理}/富文本/配置.ms | 0 .../数据字典/group.json | 0 .../{系统功能 => 系统管理}/数据字典/保存.ms | 0 .../{系统功能 => 系统管理}/数据字典/列表.ms | 0 .../{系统功能 => 系统管理}/数据字典/删除.ms | 0 .../数据字典/字典项/group.json | 0 .../数据字典/字典项/保存.ms | 0 .../数据字典/字典项/列表.ms | 0 .../数据字典/字典项/删除.ms | 0 .../数据字典/字典项/获取所有字典项.ms | 0 .../数据字典/字典项/获取排序号.ms | 0 .../数据字典/所有字典.ms | 0 .../数据字典/获取排序号.ms | 0 .../文件管理/group.json | 0 .../{系统功能 => 系统管理}/文件管理/上传.ms | 0 .../{系统功能 => 系统管理}/文件管理/删除.ms | 0 .../{系统功能 => 系统管理}/文件管理/排序.ms | 0 .../文件管理/获取文件列表.ms | 0 .../{系统功能 => 系统管理}/文件管理/裁剪.ms | 0 .../日志管理/group.json | 0 .../日志管理/操作日志.ms | 0 .../日志管理/登录日志.ms | 0 .../测试数据/group.json | 0 .../{系统功能 => 系统管理}/测试数据/保存.ms | 0 .../{系统功能 => 系统管理}/测试数据/列表.ms | 0 .../用户管理/group.json | 0 .../用户管理/个人信息修改.ms | 0 .../{系统功能 => 系统管理}/用户管理/保存.ms | 0 .../用户管理/修改登录状态.ms | 0 .../{系统功能 => 系统管理}/用户管理/列表.ms | 0 .../{系统功能 => 系统管理}/用户管理/删除.ms | 0 .../用户管理/所有机构.ms | 0 .../用户管理/根据用户id获取角色列表.ms | 0 .../用户管理/获取用户信息.ms | 20 +- .../{系统功能 => 系统管理}/组件/group.json | 0 .../api/{系统功能 => 系统管理}/组件/列表.ms | 4 +- .../{系统功能 => 系统管理}/组件/选择组件.ms | 0 .../组织机构/group.json | 0 .../{系统功能 => 系统管理}/组织机构/上移.ms | 0 .../{系统功能 => 系统管理}/组织机构/下移.ms | 0 .../{系统功能 => 系统管理}/组织机构/保存.ms | 0 .../{系统功能 => 系统管理}/组织机构/列表.ms | 0 .../{系统功能 => 系统管理}/组织机构/删除.ms | 0 .../组织机构/根据角色获取组织机构.ms | 0 .../组织机构/获取排序号.ms | 0 .../菜单管理/group.json | 0 .../{系统功能 => 系统管理}/菜单管理/上移.ms | 0 .../{系统功能 => 系统管理}/菜单管理/下移.ms | 0 .../{系统功能 => 系统管理}/菜单管理/保存.ms | 0 .../菜单管理/修改是否显示.ms | 0 .../{系统功能 => 系统管理}/菜单管理/删除.ms | 0 .../菜单管理/当前用户菜单.ms | 0 .../菜单管理/根据菜单id清除缓存.ms | 0 .../菜单管理/根据角色获取菜单.ms | 0 .../菜单管理/获取排序号.ms | 0 .../菜单管理/获取菜单tree.ms | 0 .../角色管理/group.json | 0 .../{系统功能 => 系统管理}/角色管理/保存.ms | 0 .../{系统功能 => 系统管理}/角色管理/全部.ms | 0 .../{系统功能 => 系统管理}/角色管理/列表.ms | 0 .../{系统功能 => 系统管理}/角色管理/删除.ms | 0 .../角色管理/根据角色id删除缓存.ms | 0 .../{系统功能 => 系统管理}/配置/group.json | 0 .../配置/获取所有配置.ms | 0 .../component/系统管理/字典管理/列表.ms | 4 +- .../components/magic/form/mb-upload-file.vue | 2 +- .../components/magic/form/mb-upload-image.vue | 6 +- magic-boot-ui/src/scripts/auth.js | 6 +- magic-boot-ui/src/scripts/common.js | 4 +- magic-boot-ui/src/scripts/dynamicComponent.js | 2 +- magic-boot-ui/src/scripts/routerPermission.js | 2 +- .../src/views/examples/editor-table.vue | 4 +- .../src/views/examples/test-mb-form.vue | 4 +- .../src/views/examples/test-mb-list.vue | 16 +- magic-boot-ui/src/views/login.vue | 2 +- .../src/views/lowcode/code-gen-form.vue | 40 +- .../src/views/lowcode/code-gen-list.vue | 4 +- .../src/views/system/dict/dict-items.vue | 8 +- .../src/views/system/dict/dict-list.vue | 8 +- .../src/views/system/menu/menu-form.vue | 6 +- .../src/views/system/menu/menu-list.vue | 12 +- .../src/views/system/monitor/login-log.vue | 2 +- .../src/views/system/monitor/online-user.vue | 6 +- .../src/views/system/monitor/oper-log.vue | 2 +- .../src/views/system/office/office-list.vue | 12 +- .../system/role/role-assign-permissions.vue | 4 +- .../src/views/system/role/role-list.vue | 10 +- .../src/views/system/test/test-list.vue | 4 +- .../src/views/system/user/user-center.vue | 2 +- .../src/views/system/user/user-form.vue | 6 +- .../src/views/system/user/user-list.vue | 8 +- .../interceptor/PermissionInterceptor.java | 32 +- 116 files changed, 240 insertions(+), 474 deletions(-) delete mode 100644 data/magic-api/api/系统功能/代码生成/执行生成.ms rename data/magic-api/api/{系统功能 => 系统管理}/group.json (74%) rename data/magic-api/api/{系统功能 => 系统管理}/代码生成/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/代码生成/保存.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/代码生成/列表.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/代码生成/删除.ms (87%) create mode 100644 data/magic-api/api/系统管理/代码生成/执行生成.ms rename data/magic-api/api/{系统功能 => 系统管理}/代码生成/查出所有表.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/代码生成/根据表名查出所有列.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/代码生成/详情.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/在线用户/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/在线用户/列表.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/在线用户/踢人.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/安全/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/安全/登录.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/安全/获取当前用户权限code.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/安全/退出登录.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/安全/验证token.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/安全/验证码.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/富文本/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/富文本/上传图片.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/富文本/上传文件.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/富文本/入口get.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/富文本/入口post.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/富文本/配置.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/保存.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/列表.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/删除.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/字典项/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/字典项/保存.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/字典项/列表.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/字典项/删除.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/字典项/获取所有字典项.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/字典项/获取排序号.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/所有字典.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/数据字典/获取排序号.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/文件管理/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/文件管理/上传.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/文件管理/删除.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/文件管理/排序.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/文件管理/获取文件列表.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/文件管理/裁剪.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/日志管理/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/日志管理/操作日志.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/日志管理/登录日志.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/测试数据/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/测试数据/保存.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/测试数据/列表.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/用户管理/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/用户管理/个人信息修改.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/用户管理/保存.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/用户管理/修改登录状态.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/用户管理/列表.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/用户管理/删除.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/用户管理/所有机构.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/用户管理/根据用户id获取角色列表.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/用户管理/获取用户信息.ms (86%) rename data/magic-api/api/{系统功能 => 系统管理}/组件/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/组件/列表.ms (85%) rename data/magic-api/api/{系统功能 => 系统管理}/组件/选择组件.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/组织机构/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/组织机构/上移.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/组织机构/下移.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/组织机构/保存.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/组织机构/列表.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/组织机构/删除.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/组织机构/根据角色获取组织机构.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/组织机构/获取排序号.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/菜单管理/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/菜单管理/上移.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/菜单管理/下移.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/菜单管理/保存.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/菜单管理/修改是否显示.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/菜单管理/删除.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/菜单管理/当前用户菜单.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/菜单管理/根据菜单id清除缓存.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/菜单管理/根据角色获取菜单.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/菜单管理/获取排序号.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/菜单管理/获取菜单tree.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/角色管理/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/角色管理/保存.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/角色管理/全部.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/角色管理/列表.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/角色管理/删除.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/角色管理/根据角色id删除缓存.ms (100%) rename data/magic-api/api/{系统功能 => 系统管理}/配置/group.json (100%) rename data/magic-api/api/{系统功能 => 系统管理}/配置/获取所有配置.ms (100%) diff --git a/data/magic-api/api/系统功能/代码生成/执行生成.ms b/data/magic-api/api/系统功能/代码生成/执行生成.ms deleted file mode 100644 index ce3e24f..0000000 --- a/data/magic-api/api/系统功能/代码生成/执行生成.ms +++ /dev/null @@ -1,362 +0,0 @@ -{ - "properties" : { }, - "id" : "bb23ca6e863b41b8ad81994b87a4fc0d", - "script" : null, - "groupId" : "f2538e0f370a4cabab0ae920f5e77ae7", - "name" : "执行生成", - "createTime" : null, - "updateTime" : 1648309158280, - "lock" : null, - "createBy" : null, - "updateBy" : null, - "path" : "/execute", - "method" : "GET", - "parameters" : [ ], - "options" : [ ], - "requestBody" : "", - "headers" : [ ], - "paths" : [ ], - "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [{\n \"node\": {\n \"properties\": {},\n \"id\": \"02df51e4d7184780a98b632f43dc5848\",\n \"name\": \"后台\",\n \"type\": \"api\",\n \"parentId\": \"0\",\n \"path\": \"\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": [{\n \"node\": {\n \"properties\": {},\n \"id\": \"67b2ce258e24491194b74992958c74aa\",\n \"name\": \"菜单管理\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/menu\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"9ec6f9ec92d24a369952bb13eddc134f\",\n \"name\": \"日志管理\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/log\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"c7ce65f5b3cf4aaa913f6fec7d35d176\",\n \"name\": \"数据字典\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/dict\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": [{\n \"node\": {\n \"properties\": {},\n \"id\": \"376f26eb43a44a3daeafd27020a96f48\",\n \"name\": \"字典项\",\n \"type\": \"api\",\n \"parentId\": \"c7ce65f5b3cf4aaa913f6fec7d35d176\",\n \"path\": \"/items\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }]\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"7eeba36706c24c1484ee4e84ad829f9b\",\n \"name\": \"富文本\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/ueditor\",\n \"paths\": [],\n \"options\": [{\n \"name\": \"require_login\",\n \"value\": \"false\",\n \"description\": \"该接口需要登录才允许访问\",\n \"required\": false,\n \"dataType\": \"String\",\n \"type\": null,\n \"defaultValue\": null,\n \"validateType\": null,\n \"error\": null,\n \"expression\": null,\n \"children\": null\n }]\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"89130d496f6f467c88b22ae4a7f688eb\",\n \"name\": \"角色管理\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/role\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"5c36bdc1de454d6e9d1a464d87c96091\",\n \"name\": \"配置\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/config\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"1952f25c81084e24b55b11385767dc38\",\n \"name\": \"安全\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/security\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"6f106ebdee21489db34b956f7770ff03\",\n \"name\": \"组件\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/component\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"fd3d225a1cf141bf9998c4ec4bf4a6ab\",\n \"name\": \"文件管理\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/file\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"d95a58e77d314370862ffc4cdfdb8283\",\n \"name\": \"在线用户\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/online\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"4f0230049d7e4f39b1e0897cc0f46f9a\",\n \"name\": \"用户管理\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/user\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"42d241c0bb18476f8dabf92c2e4e2324\",\n \"name\": \"测试数据\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/test\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"8295fc13678d4144bf7363c465247a50\",\n \"name\": \"组织机构\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/office\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }, {\n \"node\": {\n \"properties\": {},\n \"id\": \"f2538e0f370a4cabab0ae920f5e77ae7\",\n \"name\": \"代码生成\",\n \"type\": \"api\",\n \"parentId\": \"02df51e4d7184780a98b632f43dc5848\",\n \"path\": \"/code/gen\",\n \"paths\": [],\n \"options\": []\n },\n \"children\": []\n }]\n }],\n \"timestamp\": 1648309156632,\n \"executeTime\": 5\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" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ { - "name" : "", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ { - "name" : "node", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ { - "name" : "properties", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "id", - "value" : "02df51e4d7184780a98b632f43dc5848", - "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" : "type", - "value" : "api", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "parentId", - "value" : "0", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "path", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "paths", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Array", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "options", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Array", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - } ] - }, { - "name" : "children", - "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" : "node", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ { - "name" : "properties", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Object", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "id", - "value" : "67b2ce258e24491194b74992958c74aa", - "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" : "type", - "value" : "api", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "parentId", - "value" : "02df51e4d7184780a98b632f43dc5848", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "path", - "value" : "/menu", - "description" : "", - "required" : false, - "dataType" : "String", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "paths", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Array", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "options", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Array", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - } ] - }, { - "name" : "children", - "value" : "", - "description" : "", - "required" : false, - "dataType" : "Array", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - } ] - } ] - } ] - } ] - }, { - "name" : "timestamp", - "value" : "1648309156632", - "description" : "", - "required" : false, - "dataType" : "Long", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - }, { - "name" : "executeTime", - "value" : "5", - "description" : "", - "required" : false, - "dataType" : "Integer", - "type" : null, - "defaultValue" : null, - "validateType" : "", - "error" : "", - "expression" : "", - "children" : [ ] - } ] - } -} -================================ -import org.ssssssss.magicapi.core.service.MagicResourceService -return MagicResourceService.tree('api').children.filter(it => it.node.path == '')[0].node.id \ No newline at end of file diff --git a/data/magic-api/api/系统功能/group.json b/data/magic-api/api/系统管理/group.json similarity index 74% rename from data/magic-api/api/系统功能/group.json rename to data/magic-api/api/系统管理/group.json index 0be85d4..bda425a 100644 --- a/data/magic-api/api/系统功能/group.json +++ b/data/magic-api/api/系统管理/group.json @@ -1,10 +1,10 @@ { "properties" : { }, "id" : "acff5ad7aae64de2acb03e1d16a58ce2", - "name" : "系统功能", + "name" : "系统管理", "type" : "api", "parentId" : "0", - "path" : null, + "path" : "/system", "paths" : [ ], "options" : [ ] } \ No newline at end of file diff --git a/data/magic-api/api/系统功能/代码生成/group.json b/data/magic-api/api/系统管理/代码生成/group.json similarity index 100% rename from data/magic-api/api/系统功能/代码生成/group.json rename to data/magic-api/api/系统管理/代码生成/group.json diff --git a/data/magic-api/api/系统功能/代码生成/保存.ms b/data/magic-api/api/系统管理/代码生成/保存.ms similarity index 100% rename from data/magic-api/api/系统功能/代码生成/保存.ms rename to data/magic-api/api/系统管理/代码生成/保存.ms diff --git a/data/magic-api/api/系统功能/代码生成/列表.ms b/data/magic-api/api/系统管理/代码生成/列表.ms similarity index 100% rename from data/magic-api/api/系统功能/代码生成/列表.ms rename to data/magic-api/api/系统管理/代码生成/列表.ms diff --git a/data/magic-api/api/系统功能/代码生成/删除.ms b/data/magic-api/api/系统管理/代码生成/删除.ms similarity index 87% rename from data/magic-api/api/系统功能/代码生成/删除.ms rename to data/magic-api/api/系统管理/代码生成/删除.ms index 165d029..8e81912 100644 --- a/data/magic-api/api/系统功能/代码生成/删除.ms +++ b/data/magic-api/api/系统管理/代码生成/删除.ms @@ -4,12 +4,12 @@ "script" : null, "groupId" : "f2538e0f370a4cabab0ae920f5e77ae7", "name" : "删除", - "createTime" : 1648390993959, - "updateTime" : null, + "createTime" : null, + "updateTime" : 1648424795832, "lock" : null, "createBy" : null, "updateBy" : null, - "path" : "delete", + "path" : "/delete", "method" : "DELETE", "parameters" : [ ], "options" : [ ], diff --git a/data/magic-api/api/系统管理/代码生成/执行生成.ms b/data/magic-api/api/系统管理/代码生成/执行生成.ms new file mode 100644 index 0000000..d6589b7 --- /dev/null +++ b/data/magic-api/api/系统管理/代码生成/执行生成.ms @@ -0,0 +1,100 @@ +{ + "properties" : { }, + "id" : "bb23ca6e863b41b8ad81994b87a4fc0d", + "script" : null, + "groupId" : "f2538e0f370a4cabab0ae920f5e77ae7", + "name" : "执行生成", + "createTime" : null, + "updateTime" : 1648426498457, + "lock" : null, + "createBy" : null, + "updateBy" : null, + "path" : "/execute", + "method" : "GET", + "parameters" : [ ], + "options" : [ ], + "requestBody" : "", + "headers" : [ ], + "paths" : [ ], + "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": \"02df51e4d7184780a98b632f43dc5848\",\n \"timestamp\": 1648309158679,\n \"executeTime\": 8\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" : "02df51e4d7184780a98b632f43dc5848", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "timestamp", + "value" : "1648309158679", + "description" : "", + "required" : false, + "dataType" : "Long", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "executeTime", + "value" : "8", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + } +} +================================ +import org.ssssssss.magicapi.core.service.MagicResourceService + + +return MagicResourceService.tree('api').children.filter(it => it.node.path == '')[0].node.id \ No newline at end of file diff --git a/data/magic-api/api/系统功能/代码生成/查出所有表.ms b/data/magic-api/api/系统管理/代码生成/查出所有表.ms similarity index 100% rename from data/magic-api/api/系统功能/代码生成/查出所有表.ms rename to data/magic-api/api/系统管理/代码生成/查出所有表.ms diff --git a/data/magic-api/api/系统功能/代码生成/根据表名查出所有列.ms b/data/magic-api/api/系统管理/代码生成/根据表名查出所有列.ms similarity index 100% rename from data/magic-api/api/系统功能/代码生成/根据表名查出所有列.ms rename to data/magic-api/api/系统管理/代码生成/根据表名查出所有列.ms diff --git a/data/magic-api/api/系统功能/代码生成/详情.ms b/data/magic-api/api/系统管理/代码生成/详情.ms similarity index 100% rename from data/magic-api/api/系统功能/代码生成/详情.ms rename to data/magic-api/api/系统管理/代码生成/详情.ms diff --git a/data/magic-api/api/系统功能/在线用户/group.json b/data/magic-api/api/系统管理/在线用户/group.json similarity index 100% rename from data/magic-api/api/系统功能/在线用户/group.json rename to data/magic-api/api/系统管理/在线用户/group.json diff --git a/data/magic-api/api/系统功能/在线用户/列表.ms b/data/magic-api/api/系统管理/在线用户/列表.ms similarity index 100% rename from data/magic-api/api/系统功能/在线用户/列表.ms rename to data/magic-api/api/系统管理/在线用户/列表.ms diff --git a/data/magic-api/api/系统功能/在线用户/踢人.ms b/data/magic-api/api/系统管理/在线用户/踢人.ms similarity index 100% rename from data/magic-api/api/系统功能/在线用户/踢人.ms rename to data/magic-api/api/系统管理/在线用户/踢人.ms diff --git a/data/magic-api/api/系统功能/安全/group.json b/data/magic-api/api/系统管理/安全/group.json similarity index 100% rename from data/magic-api/api/系统功能/安全/group.json rename to data/magic-api/api/系统管理/安全/group.json diff --git a/data/magic-api/api/系统功能/安全/登录.ms b/data/magic-api/api/系统管理/安全/登录.ms similarity index 100% rename from data/magic-api/api/系统功能/安全/登录.ms rename to data/magic-api/api/系统管理/安全/登录.ms diff --git a/data/magic-api/api/系统功能/安全/获取当前用户权限code.ms b/data/magic-api/api/系统管理/安全/获取当前用户权限code.ms similarity index 100% rename from data/magic-api/api/系统功能/安全/获取当前用户权限code.ms rename to data/magic-api/api/系统管理/安全/获取当前用户权限code.ms diff --git a/data/magic-api/api/系统功能/安全/退出登录.ms b/data/magic-api/api/系统管理/安全/退出登录.ms similarity index 100% rename from data/magic-api/api/系统功能/安全/退出登录.ms rename to data/magic-api/api/系统管理/安全/退出登录.ms diff --git a/data/magic-api/api/系统功能/安全/验证token.ms b/data/magic-api/api/系统管理/安全/验证token.ms similarity index 100% rename from data/magic-api/api/系统功能/安全/验证token.ms rename to data/magic-api/api/系统管理/安全/验证token.ms diff --git a/data/magic-api/api/系统功能/安全/验证码.ms b/data/magic-api/api/系统管理/安全/验证码.ms similarity index 100% rename from data/magic-api/api/系统功能/安全/验证码.ms rename to data/magic-api/api/系统管理/安全/验证码.ms diff --git a/data/magic-api/api/系统功能/富文本/group.json b/data/magic-api/api/系统管理/富文本/group.json similarity index 100% rename from data/magic-api/api/系统功能/富文本/group.json rename to data/magic-api/api/系统管理/富文本/group.json diff --git a/data/magic-api/api/系统功能/富文本/上传图片.ms b/data/magic-api/api/系统管理/富文本/上传图片.ms similarity index 100% rename from data/magic-api/api/系统功能/富文本/上传图片.ms rename to data/magic-api/api/系统管理/富文本/上传图片.ms diff --git a/data/magic-api/api/系统功能/富文本/上传文件.ms b/data/magic-api/api/系统管理/富文本/上传文件.ms similarity index 100% rename from data/magic-api/api/系统功能/富文本/上传文件.ms rename to data/magic-api/api/系统管理/富文本/上传文件.ms diff --git a/data/magic-api/api/系统功能/富文本/入口get.ms b/data/magic-api/api/系统管理/富文本/入口get.ms similarity index 100% rename from data/magic-api/api/系统功能/富文本/入口get.ms rename to data/magic-api/api/系统管理/富文本/入口get.ms diff --git a/data/magic-api/api/系统功能/富文本/入口post.ms b/data/magic-api/api/系统管理/富文本/入口post.ms similarity index 100% rename from data/magic-api/api/系统功能/富文本/入口post.ms rename to data/magic-api/api/系统管理/富文本/入口post.ms diff --git a/data/magic-api/api/系统功能/富文本/配置.ms b/data/magic-api/api/系统管理/富文本/配置.ms similarity index 100% rename from data/magic-api/api/系统功能/富文本/配置.ms rename to data/magic-api/api/系统管理/富文本/配置.ms diff --git a/data/magic-api/api/系统功能/数据字典/group.json b/data/magic-api/api/系统管理/数据字典/group.json similarity index 100% rename from data/magic-api/api/系统功能/数据字典/group.json rename to data/magic-api/api/系统管理/数据字典/group.json diff --git a/data/magic-api/api/系统功能/数据字典/保存.ms b/data/magic-api/api/系统管理/数据字典/保存.ms similarity index 100% rename from data/magic-api/api/系统功能/数据字典/保存.ms rename to data/magic-api/api/系统管理/数据字典/保存.ms diff --git a/data/magic-api/api/系统功能/数据字典/列表.ms b/data/magic-api/api/系统管理/数据字典/列表.ms similarity index 100% rename from data/magic-api/api/系统功能/数据字典/列表.ms rename to data/magic-api/api/系统管理/数据字典/列表.ms diff --git a/data/magic-api/api/系统功能/数据字典/删除.ms b/data/magic-api/api/系统管理/数据字典/删除.ms similarity index 100% rename from data/magic-api/api/系统功能/数据字典/删除.ms rename to data/magic-api/api/系统管理/数据字典/删除.ms diff --git a/data/magic-api/api/系统功能/数据字典/字典项/group.json b/data/magic-api/api/系统管理/数据字典/字典项/group.json similarity index 100% rename from data/magic-api/api/系统功能/数据字典/字典项/group.json rename to data/magic-api/api/系统管理/数据字典/字典项/group.json diff --git a/data/magic-api/api/系统功能/数据字典/字典项/保存.ms b/data/magic-api/api/系统管理/数据字典/字典项/保存.ms similarity index 100% rename from data/magic-api/api/系统功能/数据字典/字典项/保存.ms rename to data/magic-api/api/系统管理/数据字典/字典项/保存.ms diff --git a/data/magic-api/api/系统功能/数据字典/字典项/列表.ms b/data/magic-api/api/系统管理/数据字典/字典项/列表.ms similarity index 100% rename from data/magic-api/api/系统功能/数据字典/字典项/列表.ms rename to data/magic-api/api/系统管理/数据字典/字典项/列表.ms diff --git a/data/magic-api/api/系统功能/数据字典/字典项/删除.ms b/data/magic-api/api/系统管理/数据字典/字典项/删除.ms similarity index 100% rename from data/magic-api/api/系统功能/数据字典/字典项/删除.ms rename to data/magic-api/api/系统管理/数据字典/字典项/删除.ms diff --git a/data/magic-api/api/系统功能/数据字典/字典项/获取所有字典项.ms b/data/magic-api/api/系统管理/数据字典/字典项/获取所有字典项.ms similarity index 100% rename from data/magic-api/api/系统功能/数据字典/字典项/获取所有字典项.ms rename to data/magic-api/api/系统管理/数据字典/字典项/获取所有字典项.ms diff --git a/data/magic-api/api/系统功能/数据字典/字典项/获取排序号.ms b/data/magic-api/api/系统管理/数据字典/字典项/获取排序号.ms similarity index 100% rename from data/magic-api/api/系统功能/数据字典/字典项/获取排序号.ms rename to data/magic-api/api/系统管理/数据字典/字典项/获取排序号.ms diff --git a/data/magic-api/api/系统功能/数据字典/所有字典.ms b/data/magic-api/api/系统管理/数据字典/所有字典.ms similarity index 100% rename from data/magic-api/api/系统功能/数据字典/所有字典.ms rename to data/magic-api/api/系统管理/数据字典/所有字典.ms diff --git a/data/magic-api/api/系统功能/数据字典/获取排序号.ms b/data/magic-api/api/系统管理/数据字典/获取排序号.ms similarity index 100% rename from data/magic-api/api/系统功能/数据字典/获取排序号.ms rename to data/magic-api/api/系统管理/数据字典/获取排序号.ms diff --git a/data/magic-api/api/系统功能/文件管理/group.json b/data/magic-api/api/系统管理/文件管理/group.json similarity index 100% rename from data/magic-api/api/系统功能/文件管理/group.json rename to data/magic-api/api/系统管理/文件管理/group.json diff --git a/data/magic-api/api/系统功能/文件管理/上传.ms b/data/magic-api/api/系统管理/文件管理/上传.ms similarity index 100% rename from data/magic-api/api/系统功能/文件管理/上传.ms rename to data/magic-api/api/系统管理/文件管理/上传.ms diff --git a/data/magic-api/api/系统功能/文件管理/删除.ms b/data/magic-api/api/系统管理/文件管理/删除.ms similarity index 100% rename from data/magic-api/api/系统功能/文件管理/删除.ms rename to data/magic-api/api/系统管理/文件管理/删除.ms diff --git a/data/magic-api/api/系统功能/文件管理/排序.ms b/data/magic-api/api/系统管理/文件管理/排序.ms similarity index 100% rename from data/magic-api/api/系统功能/文件管理/排序.ms rename to data/magic-api/api/系统管理/文件管理/排序.ms diff --git a/data/magic-api/api/系统功能/文件管理/获取文件列表.ms b/data/magic-api/api/系统管理/文件管理/获取文件列表.ms similarity index 100% rename from data/magic-api/api/系统功能/文件管理/获取文件列表.ms rename to data/magic-api/api/系统管理/文件管理/获取文件列表.ms diff --git a/data/magic-api/api/系统功能/文件管理/裁剪.ms b/data/magic-api/api/系统管理/文件管理/裁剪.ms similarity index 100% rename from data/magic-api/api/系统功能/文件管理/裁剪.ms rename to data/magic-api/api/系统管理/文件管理/裁剪.ms diff --git a/data/magic-api/api/系统功能/日志管理/group.json b/data/magic-api/api/系统管理/日志管理/group.json similarity index 100% rename from data/magic-api/api/系统功能/日志管理/group.json rename to data/magic-api/api/系统管理/日志管理/group.json diff --git a/data/magic-api/api/系统功能/日志管理/操作日志.ms b/data/magic-api/api/系统管理/日志管理/操作日志.ms similarity index 100% rename from data/magic-api/api/系统功能/日志管理/操作日志.ms rename to data/magic-api/api/系统管理/日志管理/操作日志.ms diff --git a/data/magic-api/api/系统功能/日志管理/登录日志.ms b/data/magic-api/api/系统管理/日志管理/登录日志.ms similarity index 100% rename from data/magic-api/api/系统功能/日志管理/登录日志.ms rename to data/magic-api/api/系统管理/日志管理/登录日志.ms diff --git a/data/magic-api/api/系统功能/测试数据/group.json b/data/magic-api/api/系统管理/测试数据/group.json similarity index 100% rename from data/magic-api/api/系统功能/测试数据/group.json rename to data/magic-api/api/系统管理/测试数据/group.json diff --git a/data/magic-api/api/系统功能/测试数据/保存.ms b/data/magic-api/api/系统管理/测试数据/保存.ms similarity index 100% rename from data/magic-api/api/系统功能/测试数据/保存.ms rename to data/magic-api/api/系统管理/测试数据/保存.ms diff --git a/data/magic-api/api/系统功能/测试数据/列表.ms b/data/magic-api/api/系统管理/测试数据/列表.ms similarity index 100% rename from data/magic-api/api/系统功能/测试数据/列表.ms rename to data/magic-api/api/系统管理/测试数据/列表.ms diff --git a/data/magic-api/api/系统功能/用户管理/group.json b/data/magic-api/api/系统管理/用户管理/group.json similarity index 100% rename from data/magic-api/api/系统功能/用户管理/group.json rename to data/magic-api/api/系统管理/用户管理/group.json diff --git a/data/magic-api/api/系统功能/用户管理/个人信息修改.ms b/data/magic-api/api/系统管理/用户管理/个人信息修改.ms similarity index 100% rename from data/magic-api/api/系统功能/用户管理/个人信息修改.ms rename to data/magic-api/api/系统管理/用户管理/个人信息修改.ms diff --git a/data/magic-api/api/系统功能/用户管理/保存.ms b/data/magic-api/api/系统管理/用户管理/保存.ms similarity index 100% rename from data/magic-api/api/系统功能/用户管理/保存.ms rename to data/magic-api/api/系统管理/用户管理/保存.ms diff --git a/data/magic-api/api/系统功能/用户管理/修改登录状态.ms b/data/magic-api/api/系统管理/用户管理/修改登录状态.ms similarity index 100% rename from data/magic-api/api/系统功能/用户管理/修改登录状态.ms rename to data/magic-api/api/系统管理/用户管理/修改登录状态.ms diff --git a/data/magic-api/api/系统功能/用户管理/列表.ms b/data/magic-api/api/系统管理/用户管理/列表.ms similarity index 100% rename from data/magic-api/api/系统功能/用户管理/列表.ms rename to data/magic-api/api/系统管理/用户管理/列表.ms diff --git a/data/magic-api/api/系统功能/用户管理/删除.ms b/data/magic-api/api/系统管理/用户管理/删除.ms similarity index 100% rename from data/magic-api/api/系统功能/用户管理/删除.ms rename to data/magic-api/api/系统管理/用户管理/删除.ms diff --git a/data/magic-api/api/系统功能/用户管理/所有机构.ms b/data/magic-api/api/系统管理/用户管理/所有机构.ms similarity index 100% rename from data/magic-api/api/系统功能/用户管理/所有机构.ms rename to data/magic-api/api/系统管理/用户管理/所有机构.ms diff --git a/data/magic-api/api/系统功能/用户管理/根据用户id获取角色列表.ms b/data/magic-api/api/系统管理/用户管理/根据用户id获取角色列表.ms similarity index 100% rename from data/magic-api/api/系统功能/用户管理/根据用户id获取角色列表.ms rename to data/magic-api/api/系统管理/用户管理/根据用户id获取角色列表.ms diff --git a/data/magic-api/api/系统功能/用户管理/获取用户信息.ms b/data/magic-api/api/系统管理/用户管理/获取用户信息.ms similarity index 86% rename from data/magic-api/api/系统功能/用户管理/获取用户信息.ms rename to data/magic-api/api/系统管理/用户管理/获取用户信息.ms index bfd4ca5..c4a6162 100644 --- a/data/magic-api/api/系统功能/用户管理/获取用户信息.ms +++ b/data/magic-api/api/系统管理/用户管理/获取用户信息.ms @@ -4,8 +4,8 @@ "script" : null, "groupId" : "4f0230049d7e4f39b1e0897cc0f46f9a", "name" : "获取用户信息", - "createTime" : 1646490239479, - "updateTime" : 1643710783720, + "createTime" : null, + "updateTime" : 1648431786861, "lock" : "0", "createBy" : null, "updateBy" : null, @@ -18,7 +18,19 @@ "paths" : [ ], "responseBody" : "{\n \"code\": 402,\n \"message\": \"凭证已过期\",\n \"data\": null,\n \"timestamp\": 1643710751531,\n \"executeTime\": null\n}", "description" : null, - "requestBodyDefinition" : null, + "requestBodyDefinition" : { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, "responseBodyDefinition" : { "name" : "", "value" : "", @@ -95,7 +107,7 @@ } ================================ import 'cn.dev33.satoken.stp.StpUtil'; -import "@post:/security/permissions" as authoritiesList; +import "@post:/system/security/permissions" as authoritiesList; var user = db.table("sys_user").where().eq("id",StpUtil.getLoginId()).selectOne() user.authorities = authoritiesList() diff --git a/data/magic-api/api/系统功能/组件/group.json b/data/magic-api/api/系统管理/组件/group.json similarity index 100% rename from data/magic-api/api/系统功能/组件/group.json rename to data/magic-api/api/系统管理/组件/group.json diff --git a/data/magic-api/api/系统功能/组件/列表.ms b/data/magic-api/api/系统管理/组件/列表.ms similarity index 85% rename from data/magic-api/api/系统功能/组件/列表.ms rename to data/magic-api/api/系统管理/组件/列表.ms index 541511e..4524ac0 100644 --- a/data/magic-api/api/系统功能/组件/列表.ms +++ b/data/magic-api/api/系统管理/组件/列表.ms @@ -16,7 +16,7 @@ "requestBody" : "", "headers" : [ ], "paths" : [ ], - "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [{\n \"name\": \"sys-dict-list\",\n \"code\": \"\\n\\n\\n\"\n }],\n \"timestamp\": 1648017503577,\n \"executeTime\": 12\n}", + "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [{\n \"name\": \"sys-dict-list\",\n \"code\": \"\\n\\n\\n\"\n }],\n \"timestamp\": 1648017503577,\n \"executeTime\": 12\n}", "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : { @@ -90,7 +90,7 @@ "children" : [ ] }, { "name" : "code", - "value" : "\\n\\n\\n", + "value" : "\\n\\n\\n", "description" : "", "required" : false, "dataType" : "String", diff --git a/data/magic-api/api/系统功能/组件/选择组件.ms b/data/magic-api/api/系统管理/组件/选择组件.ms similarity index 100% rename from data/magic-api/api/系统功能/组件/选择组件.ms rename to data/magic-api/api/系统管理/组件/选择组件.ms diff --git a/data/magic-api/api/系统功能/组织机构/group.json b/data/magic-api/api/系统管理/组织机构/group.json similarity index 100% rename from data/magic-api/api/系统功能/组织机构/group.json rename to data/magic-api/api/系统管理/组织机构/group.json diff --git a/data/magic-api/api/系统功能/组织机构/上移.ms b/data/magic-api/api/系统管理/组织机构/上移.ms similarity index 100% rename from data/magic-api/api/系统功能/组织机构/上移.ms rename to data/magic-api/api/系统管理/组织机构/上移.ms diff --git a/data/magic-api/api/系统功能/组织机构/下移.ms b/data/magic-api/api/系统管理/组织机构/下移.ms similarity index 100% rename from data/magic-api/api/系统功能/组织机构/下移.ms rename to data/magic-api/api/系统管理/组织机构/下移.ms diff --git a/data/magic-api/api/系统功能/组织机构/保存.ms b/data/magic-api/api/系统管理/组织机构/保存.ms similarity index 100% rename from data/magic-api/api/系统功能/组织机构/保存.ms rename to data/magic-api/api/系统管理/组织机构/保存.ms diff --git a/data/magic-api/api/系统功能/组织机构/列表.ms b/data/magic-api/api/系统管理/组织机构/列表.ms similarity index 100% rename from data/magic-api/api/系统功能/组织机构/列表.ms rename to data/magic-api/api/系统管理/组织机构/列表.ms diff --git a/data/magic-api/api/系统功能/组织机构/删除.ms b/data/magic-api/api/系统管理/组织机构/删除.ms similarity index 100% rename from data/magic-api/api/系统功能/组织机构/删除.ms rename to data/magic-api/api/系统管理/组织机构/删除.ms diff --git a/data/magic-api/api/系统功能/组织机构/根据角色获取组织机构.ms b/data/magic-api/api/系统管理/组织机构/根据角色获取组织机构.ms similarity index 100% rename from data/magic-api/api/系统功能/组织机构/根据角色获取组织机构.ms rename to data/magic-api/api/系统管理/组织机构/根据角色获取组织机构.ms diff --git a/data/magic-api/api/系统功能/组织机构/获取排序号.ms b/data/magic-api/api/系统管理/组织机构/获取排序号.ms similarity index 100% rename from data/magic-api/api/系统功能/组织机构/获取排序号.ms rename to data/magic-api/api/系统管理/组织机构/获取排序号.ms diff --git a/data/magic-api/api/系统功能/菜单管理/group.json b/data/magic-api/api/系统管理/菜单管理/group.json similarity index 100% rename from data/magic-api/api/系统功能/菜单管理/group.json rename to data/magic-api/api/系统管理/菜单管理/group.json diff --git a/data/magic-api/api/系统功能/菜单管理/上移.ms b/data/magic-api/api/系统管理/菜单管理/上移.ms similarity index 100% rename from data/magic-api/api/系统功能/菜单管理/上移.ms rename to data/magic-api/api/系统管理/菜单管理/上移.ms diff --git a/data/magic-api/api/系统功能/菜单管理/下移.ms b/data/magic-api/api/系统管理/菜单管理/下移.ms similarity index 100% rename from data/magic-api/api/系统功能/菜单管理/下移.ms rename to data/magic-api/api/系统管理/菜单管理/下移.ms diff --git a/data/magic-api/api/系统功能/菜单管理/保存.ms b/data/magic-api/api/系统管理/菜单管理/保存.ms similarity index 100% rename from data/magic-api/api/系统功能/菜单管理/保存.ms rename to data/magic-api/api/系统管理/菜单管理/保存.ms diff --git a/data/magic-api/api/系统功能/菜单管理/修改是否显示.ms b/data/magic-api/api/系统管理/菜单管理/修改是否显示.ms similarity index 100% rename from data/magic-api/api/系统功能/菜单管理/修改是否显示.ms rename to data/magic-api/api/系统管理/菜单管理/修改是否显示.ms diff --git a/data/magic-api/api/系统功能/菜单管理/删除.ms b/data/magic-api/api/系统管理/菜单管理/删除.ms similarity index 100% rename from data/magic-api/api/系统功能/菜单管理/删除.ms rename to data/magic-api/api/系统管理/菜单管理/删除.ms diff --git a/data/magic-api/api/系统功能/菜单管理/当前用户菜单.ms b/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms similarity index 100% rename from data/magic-api/api/系统功能/菜单管理/当前用户菜单.ms rename to data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms diff --git a/data/magic-api/api/系统功能/菜单管理/根据菜单id清除缓存.ms b/data/magic-api/api/系统管理/菜单管理/根据菜单id清除缓存.ms similarity index 100% rename from data/magic-api/api/系统功能/菜单管理/根据菜单id清除缓存.ms rename to data/magic-api/api/系统管理/菜单管理/根据菜单id清除缓存.ms diff --git a/data/magic-api/api/系统功能/菜单管理/根据角色获取菜单.ms b/data/magic-api/api/系统管理/菜单管理/根据角色获取菜单.ms similarity index 100% rename from data/magic-api/api/系统功能/菜单管理/根据角色获取菜单.ms rename to data/magic-api/api/系统管理/菜单管理/根据角色获取菜单.ms diff --git a/data/magic-api/api/系统功能/菜单管理/获取排序号.ms b/data/magic-api/api/系统管理/菜单管理/获取排序号.ms similarity index 100% rename from data/magic-api/api/系统功能/菜单管理/获取排序号.ms rename to data/magic-api/api/系统管理/菜单管理/获取排序号.ms diff --git a/data/magic-api/api/系统功能/菜单管理/获取菜单tree.ms b/data/magic-api/api/系统管理/菜单管理/获取菜单tree.ms similarity index 100% rename from data/magic-api/api/系统功能/菜单管理/获取菜单tree.ms rename to data/magic-api/api/系统管理/菜单管理/获取菜单tree.ms diff --git a/data/magic-api/api/系统功能/角色管理/group.json b/data/magic-api/api/系统管理/角色管理/group.json similarity index 100% rename from data/magic-api/api/系统功能/角色管理/group.json rename to data/magic-api/api/系统管理/角色管理/group.json diff --git a/data/magic-api/api/系统功能/角色管理/保存.ms b/data/magic-api/api/系统管理/角色管理/保存.ms similarity index 100% rename from data/magic-api/api/系统功能/角色管理/保存.ms rename to data/magic-api/api/系统管理/角色管理/保存.ms diff --git a/data/magic-api/api/系统功能/角色管理/全部.ms b/data/magic-api/api/系统管理/角色管理/全部.ms similarity index 100% rename from data/magic-api/api/系统功能/角色管理/全部.ms rename to data/magic-api/api/系统管理/角色管理/全部.ms diff --git a/data/magic-api/api/系统功能/角色管理/列表.ms b/data/magic-api/api/系统管理/角色管理/列表.ms similarity index 100% rename from data/magic-api/api/系统功能/角色管理/列表.ms rename to data/magic-api/api/系统管理/角色管理/列表.ms diff --git a/data/magic-api/api/系统功能/角色管理/删除.ms b/data/magic-api/api/系统管理/角色管理/删除.ms similarity index 100% rename from data/magic-api/api/系统功能/角色管理/删除.ms rename to data/magic-api/api/系统管理/角色管理/删除.ms diff --git a/data/magic-api/api/系统功能/角色管理/根据角色id删除缓存.ms b/data/magic-api/api/系统管理/角色管理/根据角色id删除缓存.ms similarity index 100% rename from data/magic-api/api/系统功能/角色管理/根据角色id删除缓存.ms rename to data/magic-api/api/系统管理/角色管理/根据角色id删除缓存.ms diff --git a/data/magic-api/api/系统功能/配置/group.json b/data/magic-api/api/系统管理/配置/group.json similarity index 100% rename from data/magic-api/api/系统功能/配置/group.json rename to data/magic-api/api/系统管理/配置/group.json diff --git a/data/magic-api/api/系统功能/配置/获取所有配置.ms b/data/magic-api/api/系统管理/配置/获取所有配置.ms similarity index 100% rename from data/magic-api/api/系统功能/配置/获取所有配置.ms rename to data/magic-api/api/系统管理/配置/获取所有配置.ms diff --git a/data/magic-api/component/系统管理/字典管理/列表.ms b/data/magic-api/component/系统管理/字典管理/列表.ms index 7e05033..ce4bd90 100644 --- a/data/magic-api/component/系统管理/字典管理/列表.ms +++ b/data/magic-api/component/系统管理/字典管理/列表.ms @@ -182,7 +182,7 @@ function reloadTable() { } function getSort() { - proxy.$get('dict/sort').then(res => { + proxy.$get('/system/dict/sort').then(res => { temp.value.sort = res.data }) } @@ -201,7 +201,7 @@ function save(d) { dataForm.value.validate((valid) => { if (valid) { d.loading() - proxy.$post('dict/save', temp.value).then((response) => { + proxy.$post('/system/dict/save', temp.value).then((response) => { d.hideLoading() temp.value.id = response.data dictDialog.value.hide() diff --git a/magic-boot-ui/src/components/magic/form/mb-upload-file.vue b/magic-boot-ui/src/components/magic/form/mb-upload-file.vue index ea825d6..c6bce24 100644 --- a/magic-boot-ui/src/components/magic/form/mb-upload-file.vue +++ b/magic-boot-ui/src/components/magic/form/mb-upload-file.vue @@ -86,7 +86,7 @@ export default { }, created() { if (this.externalId) { - this.$get('file/files', { externalId: this.externalId, externalType: this.externalType }).then(res => { + this.$get('/system/file/files', { externalId: this.externalId, externalType: this.externalType }).then(res => { const { data } = res this.fileList = data }) diff --git a/magic-boot-ui/src/components/magic/form/mb-upload-image.vue b/magic-boot-ui/src/components/magic/form/mb-upload-image.vue index 3340818..8a03426 100644 --- a/magic-boot-ui/src/components/magic/form/mb-upload-image.vue +++ b/magic-boot-ui/src/components/magic/form/mb-upload-image.vue @@ -156,7 +156,7 @@ export default { this.cropperOption = this.cropperConfig || {} this.cropperOption.img = '' if (this.externalId) { - this.$get('file/files', { externalId: this.externalId, externalType: this.externalType }).then(res => { + this.$get('/system/file/files', { externalId: this.externalId, externalType: this.externalType }).then(res => { this.urls = res.data }) this.action = this.action + `?externalId=${this.externalId}&externalType=${this.externalType}` @@ -218,7 +218,7 @@ export default { this.urls.forEach(url => { newUrls.push(encodeURI(url)) }) - this.$get('file/resort', { urls: newUrls.join(',') }) + this.$get('/system/file/resort', { urls: newUrls.join(',') }) }, onExceed() { this.$message({ @@ -238,7 +238,7 @@ export default { formData.append('file', dataFile) formData.append('url', encodeURI(this.cropperOption.relativeImg)) this.$request({ - url: 'file/cropper', + url: '/system/file/cropper', method: 'post', data: formData }).then(res => { diff --git a/magic-boot-ui/src/scripts/auth.js b/magic-boot-ui/src/scripts/auth.js index 0486431..61cfcb2 100644 --- a/magic-boot-ui/src/scripts/auth.js +++ b/magic-boot-ui/src/scripts/auth.js @@ -22,7 +22,7 @@ export function removeToken() { export async function getUserInfo() { await request({ - url: 'user/info', + url: '/system/user/info', method: 'get' }).then(response => { const { data } = response @@ -40,7 +40,7 @@ export async function getUserInfo() { export function login(data){ return new Promise((resolve, reject) => { request({ - url: 'security/login', + url: '/system/security/login', method: 'post', data }).then(res => { @@ -55,7 +55,7 @@ export function login(data){ export function logout(){ request({ - url: 'security/logout', + url: '/system/security/logout', method: 'get' }).then(() => { removeToken() diff --git a/magic-boot-ui/src/scripts/common.js b/magic-boot-ui/src/scripts/common.js index cd75316..38d0f5c 100644 --- a/magic-boot-ui/src/scripts/common.js +++ b/magic-boot-ui/src/scripts/common.js @@ -7,7 +7,7 @@ const common = {} let dictData = [] common.getDictData = async function() { await request({ - url: 'dict/items/all', + url: '/system/dict/items/all', method: 'get' }).then((response) => { const { data } = response @@ -160,7 +160,7 @@ common.getUrl = (url, data) => { // common.loadConfig = async() => { // await request({ -// url: 'config/list' +// url: '/system/config/list' // }).then(res => { // const { data } = res // global.filePrefix = data.filePrefix diff --git a/magic-boot-ui/src/scripts/dynamicComponent.js b/magic-boot-ui/src/scripts/dynamicComponent.js index 5e5d95c..fb73a7c 100644 --- a/magic-boot-ui/src/scripts/dynamicComponent.js +++ b/magic-boot-ui/src/scripts/dynamicComponent.js @@ -32,7 +32,7 @@ const install = (app) => { lock: true, background: 'rgba(255, 255, 255, 0)', }) - app.config.globalProperties.$post('/component/list').then((res) => { + app.config.globalProperties.$post('/system/component/list').then((res) => { res.data.forEach(it => { appComponent(app, it) }) diff --git a/magic-boot-ui/src/scripts/routerPermission.js b/magic-boot-ui/src/scripts/routerPermission.js index 84975cf..b4b989f 100644 --- a/magic-boot-ui/src/scripts/routerPermission.js +++ b/magic-boot-ui/src/scripts/routerPermission.js @@ -43,7 +43,7 @@ export const loadView = (view) => { export function generateRoutes(){ return new Promise((resolve, reject) => { request({ - url: 'menu/current/menus', + url: '/system/menu/current/menus', method: 'post' }).then(response => { const { data } = response diff --git a/magic-boot-ui/src/views/examples/editor-table.vue b/magic-boot-ui/src/views/examples/editor-table.vue index a5a7a0d..dfcc05f 100644 --- a/magic-boot-ui/src/views/examples/editor-table.vue +++ b/magic-boot-ui/src/views/examples/editor-table.vue @@ -12,7 +12,7 @@ import genCode from '@/scripts/gen/gen-mb-list.js' const { proxy } = getCurrentInstance() const tableDatas = reactive([]) -proxy.$get('/code/gen/columns', { tableName: 'sys_test' }).then(res => { +proxy.$get('/system/code/gen/columns', { tableName: 'sys_test' }).then(res => { var columns = res.data.columns var primary = res.data.primary columns.forEach(it => { @@ -161,7 +161,7 @@ const cols = reactive([{ field: 'dictType', label: '字典类型', props: { - url: 'dict/all', + url: '/system/dict/all', showValue: true } }]) diff --git a/magic-boot-ui/src/views/examples/test-mb-form.vue b/magic-boot-ui/src/views/examples/test-mb-form.vue index 86e2c3b..cd0eaa0 100644 --- a/magic-boot-ui/src/views/examples/test-mb-form.vue +++ b/magic-boot-ui/src/views/examples/test-mb-form.vue @@ -104,7 +104,7 @@ const formOptions = reactive({ label: 'treeselect', rules: [{ required: true, message: '请选择组织机构', trigger: 'change' }], props: { - url: 'user/offices' + url: '/system/user/offices' } }, { component: 'select', @@ -113,7 +113,7 @@ const formOptions = reactive({ label: 'select', rules: [{ required: true, message: '请选择角色', trigger: 'change' }], props: { - url: 'role/all', + url: '/system/role/all', placeholder: '请选择角色', multiple: true } diff --git a/magic-boot-ui/src/views/examples/test-mb-list.vue b/magic-boot-ui/src/views/examples/test-mb-list.vue index f0f0e25..3e5c405 100644 --- a/magic-boot-ui/src/views/examples/test-mb-list.vue +++ b/magic-boot-ui/src/views/examples/test-mb-list.vue @@ -28,10 +28,10 @@ const listOptions = reactive({ },{ type: 'delete', permission: 'user:delete', - url: 'user/delete' + url: '/system/user/delete' }], table: { - url: 'user/list', + url: '/system/user/list', where: { username: { label: '登录名称', @@ -43,7 +43,7 @@ const listOptions = reactive({ type: 'select', label: '角色', props: { - url: 'role/all', + url: '/system/role/all', el: { multiple: true } } } @@ -73,7 +73,7 @@ const listOptions = reactive({ type: 'switch', width: 100, change: (row) => { - proxy.$get('/user/change/login/status', { + proxy.$get('/system/user/change/login/status', { id: row.id, isLogin: row.isLogin }) @@ -106,7 +106,7 @@ const listOptions = reactive({ icon: 'ElDelete', click: (row) => { proxy.$common.handleDelete({ - url: 'user/delete', + url: '/system/user/delete', id: row.id, done: () => magicList.value.reload() }) @@ -120,7 +120,7 @@ const listOptions = reactive({ const formOptions = reactive({ detail: { request: { - url: 'user/get' + url: '/system/user/get' } }, form: { @@ -166,7 +166,7 @@ const formOptions = reactive({ label: '组织机构', rules: [{ required: true, message: '请选择组织机构', trigger: 'change' }], props: { - url: 'user/offices' + url: '/system/user/offices' } }, { component: 'select', @@ -175,7 +175,7 @@ const formOptions = reactive({ label: '选择角色', rules: [{ required: true, message: '请选择角色', trigger: 'change' }], props: { - url: 'role/all', + url: '/system/role/all', placeholder: '请选择角色', el: { multiple: true } } diff --git a/magic-boot-ui/src/views/login.vue b/magic-boot-ui/src/views/login.vue index 9002a33..09ea3d9 100644 --- a/magic-boot-ui/src/views/login.vue +++ b/magic-boot-ui/src/views/login.vue @@ -37,7 +37,7 @@ }) const loading = ref(false) function refreshCode(){ - proxy.$get('/security/verification/code').then(res => { + proxy.$get('/system/security/verification/code').then(res => { codeImg.value = 'data:image/png;base64,' + res.data.img loginForm.uuid = res.data.uuid }) diff --git a/magic-boot-ui/src/views/lowcode/code-gen-form.vue b/magic-boot-ui/src/views/lowcode/code-gen-form.vue index c064db6..977f12f 100644 --- a/magic-boot-ui/src/views/lowcode/code-gen-form.vue +++ b/magic-boot-ui/src/views/lowcode/code-gen-form.vue @@ -16,8 +16,6 @@ - 获取数据 - 代码生成 @@ -71,6 +69,17 @@ + + + + 代码生成 + + @@ -84,14 +93,23 @@ const dataForm = ref() const tables = ref([]) const emit = defineEmits(['reload']) + var validatePath = (rule, value, callback) => { + if(!value.startsWith('/')){ + callback(new Error('请以“/”开头')); + }else if(value.endsWith('/')){ + callback(new Error('不能以“/”结尾')); + }else{ + callback(); + } + } const genInfoRules = reactive({ tableName: [{ required: true, message: '请选择表', trigger: 'change' }], tableComment: [{ required: true, message: '请输入描述', trigger: 'change' }], 'info.template': [{ required: true, message: '请选择模板', trigger: 'change' }], 'info.moduleName': [{ required: true, message: '请输入模块名称', trigger: 'change' }], - 'info.modulePath': [{ required: true, message: '请输入模块路径', trigger: 'change' }], + 'info.modulePath': [{ required: true, message: '请输入模块路径', trigger: 'change' }, { validator: validatePath }], 'info.businessName': [{ required: true, message: '请输入功能名称', trigger: 'change' }], - 'info.businessPath': [{ required: true, message: '请输入功能路径', trigger: 'change' }] + 'info.businessPath': [{ required: true, message: '请输入功能路径', trigger: 'change' }, { validator: validatePath }] }) const genInfo = ref({ tableName: '', @@ -107,13 +125,13 @@ }) async function watchTableName(){ - await proxy.$get('/code/gen/tables').then(res => { + await proxy.$get('/system/code/gen/tables').then(res => { tables.value = res.data }) watch(() => genInfo.value.tableName, (value) => { genInfo.value.tableComment = tables.value.filter(it => it.value == value)[0].label.replace(value, '').replace('(','').replace(')','') genInfo.value.columns = [] - proxy.$get('/code/gen/columns', { tableName: value }).then(res => { + proxy.$get('/system/code/gen/columns', { tableName: value }).then(res => { var columns = res.data.columns var primary = res.data.primary columns.forEach(it => { @@ -274,7 +292,7 @@ field: 'dictType', label: '字典类型', props: { - url: 'dict/all', + url: '/system/dict/all', showValue: true } }]) @@ -283,10 +301,6 @@ genCode('test', genInfo.value.columns) } - function getData(){ - console.log(genInfo.value.columns) - } - function save(d){ dataForm.value.validate((valid) => { if (valid) { @@ -294,7 +308,7 @@ formData.info = JSON.stringify(genInfo.value.info) formData.columns = JSON.stringify(genInfo.value.columns) d.loading() - proxy.$post('/code/gen/save', formData).then(() => { + proxy.$post('/system/code/gen/save', formData).then(() => { d.hideLoading() proxy.$notify({ title: '成功', @@ -312,7 +326,7 @@ } function getDetail(id){ - proxy.$get('/code/gen/get', { id: id }).then(res => { + proxy.$get('/system/code/gen/get', { id: id }).then(res => { var formData = {...res.data} formData.info = JSON.parse(formData.info) formData.columns = JSON.parse(formData.columns) diff --git a/magic-boot-ui/src/views/lowcode/code-gen-list.vue b/magic-boot-ui/src/views/lowcode/code-gen-list.vue index 02dfd3d..bf443bb 100644 --- a/magic-boot-ui/src/views/lowcode/code-gen-list.vue +++ b/magic-boot-ui/src/views/lowcode/code-gen-list.vue @@ -24,7 +24,7 @@ } }], table: { - url: 'code/gen/list', + url: '/system/code/gen/list', where: { tableName: { label: '表名' @@ -72,7 +72,7 @@ icon: 'ElDelete', click: (row) => { proxy.$common.handleDelete({ - url: 'code/gen/delete', + url: '/system/code/gen/delete', id: row.id, done: () => magicList.value.reload() }) diff --git a/magic-boot-ui/src/views/system/dict/dict-items.vue b/magic-boot-ui/src/views/system/dict/dict-items.vue index 7a2711e..b20611f 100644 --- a/magic-boot-ui/src/views/system/dict/dict-items.vue +++ b/magic-boot-ui/src/views/system/dict/dict-items.vue @@ -59,7 +59,7 @@ const props = defineProps({ }) const tableOptions = reactive({ - url: 'dict/items/list', + url: '/system/dict/items/list', page: true, where: { label: { @@ -113,7 +113,7 @@ const tableOptions = reactive({ icon: 'ElDelete', click: (row) => { proxy.$common.handleDelete({ - url: 'dict/items/delete', + url: '/system/dict/items/delete', id: row.id, done: () => { reloadTable() @@ -153,7 +153,7 @@ function getTemp() { } function getSort() { - proxy.$get('dict/items/sort', { dictId: props.dictId }).then(res => { + proxy.$get('/system/dict/items/sort', { dictId: props.dictId }).then(res => { temp.value.sort = res.data }) } @@ -172,7 +172,7 @@ function save(d) { dataForm.value.validate((valid) => { if (valid) { d.loading() - proxy.$post('dict/items/save', temp.value).then(() => { + proxy.$post('/system/dict/items/save', temp.value).then(() => { d.hideLoading() formDialog.value.hide() proxy.$notify({ 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 7e42ab2..9b1b60c 100644 --- a/magic-boot-ui/src/views/system/dict/dict-list.vue +++ b/magic-boot-ui/src/views/system/dict/dict-list.vue @@ -66,7 +66,7 @@ import { ref, reactive, getCurrentInstance, nextTick } from 'vue' const { proxy } = getCurrentInstance() const tableOptions = reactive({ - url: 'dict/list', + url: '/system/dict/list', page: true, where: { type: { @@ -131,7 +131,7 @@ const tableOptions = reactive({ icon: 'ElDelete', click: (row) => { proxy.$common.handleDelete({ - url: 'dict/delete', + url: '/system/dict/delete', id: row.id, done: () => { reloadTable() @@ -185,7 +185,7 @@ function reloadTable() { } function getSort() { - proxy.$get('dict/sort').then(res => { + proxy.$get('/system/dict/sort').then(res => { temp.value.sort = res.data }) } @@ -204,7 +204,7 @@ function save(d) { dataForm.value.validate((valid) => { if (valid) { d.loading() - proxy.$post('dict/save', temp.value).then((response) => { + proxy.$post('/system/dict/save', temp.value).then((response) => { d.hideLoading() temp.value.id = response.data dictDialog.value.hide() diff --git a/magic-boot-ui/src/views/system/menu/menu-form.vue b/magic-boot-ui/src/views/system/menu/menu-form.vue index b7c3c62..365148f 100644 --- a/magic-boot-ui/src/views/system/menu/menu-form.vue +++ b/magic-boot-ui/src/views/system/menu/menu-form.vue @@ -124,7 +124,7 @@ const getTemp = () => { } } -proxy.$get('component/select').then(res => { +proxy.$get('/system/component/select').then(res => { componentTree.value = res.data }) @@ -202,7 +202,7 @@ function save(d) { temp.value.icon = '' temp.value.url = '' } - proxy.$post('menu/save', temp.value).then(() => { + proxy.$post('/system/menu/save', temp.value).then(() => { d.hideLoading() proxy.$notify({ title: '成功', @@ -252,7 +252,7 @@ function openIcons() { } function getSort() { - proxy.$get('menu/sort', { pid: temp.value.pid }).then(res => { + proxy.$get('/system/menu/sort', { pid: temp.value.pid }).then(res => { temp.value.sort = res.data }) } 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 5be8de3..9d5a304 100644 --- a/magic-boot-ui/src/views/system/menu/menu-list.vue +++ b/magic-boot-ui/src/views/system/menu/menu-list.vue @@ -97,7 +97,7 @@ const tableOptions = reactive({ type: 'text', icon: 'ElSortUp', click: (row) => { - proxy.$get('menu/sort/up',{ + proxy.$get('/system/menu/sort/up',{ id: row.id, pid: row.pid, sort: row.sort @@ -111,7 +111,7 @@ const tableOptions = reactive({ type: 'text', icon: 'ElSortDown', click: (row) => { - proxy.$get('menu/sort/down',{ + proxy.$get('/system/menu/sort/down',{ id: row.id, pid: row.pid, sort: row.sort @@ -128,7 +128,7 @@ const tableOptions = reactive({ type: 'switch', width: 100, change: (row) => { - proxy.$get('menu/change', { + proxy.$get('/system/menu/change', { id: row.id, isShow: row.isShow }) @@ -140,7 +140,7 @@ const tableOptions = reactive({ type: 'switch', width: 100, change: (row) => { - proxy.$get('menu/change', { + proxy.$get('/system/menu/change', { id: row.id, keepAlive: row.keepAlive }) @@ -178,7 +178,7 @@ const tableOptions = reactive({ icon: 'ElDelete', click: (row) => { proxy.$common.handleDelete({ - url: 'menu/delete', + url: '/system/menu/delete', id: row.id, done: () => reloadTable() }) @@ -194,7 +194,7 @@ const menuFormDialog = ref() const menuFormRef = ref() function reloadTable(){ - proxy.$get('menu/tree').then(res => { + proxy.$get('/system/menu/tree').then(res => { menuData.value = res.data.list tableOptions.data = menuData.value }) diff --git a/magic-boot-ui/src/views/system/monitor/login-log.vue b/magic-boot-ui/src/views/system/monitor/login-log.vue index 38c727a..a325edb 100644 --- a/magic-boot-ui/src/views/system/monitor/login-log.vue +++ b/magic-boot-ui/src/views/system/monitor/login-log.vue @@ -9,7 +9,7 @@ import { ref, reactive } from 'vue' const table = ref() const tableOptions = reactive({ - url: 'log/login/list', + url: '/system/log/login/list', where: { createDate: { type: 'datetimerange', diff --git a/magic-boot-ui/src/views/system/monitor/online-user.vue b/magic-boot-ui/src/views/system/monitor/online-user.vue index 0dc5c98..e3ab6bb 100644 --- a/magic-boot-ui/src/views/system/monitor/online-user.vue +++ b/magic-boot-ui/src/views/system/monitor/online-user.vue @@ -42,7 +42,7 @@ // }]) const listOptions = reactive({ table: { - url: 'online/list', + url: '/system/online/list', where: { username: { label: '登录名称', @@ -94,7 +94,7 @@ confirmButtonText: '确定', callback: (action) => { if (action === 'confirm') { - proxy.$get('online/logout',{ token: row.token }).then(() => { + proxy.$get('/system/online/logout',{ token: row.token }).then(() => { magicList.value.reload() }) } @@ -108,7 +108,7 @@ } }) // function disable(){ - // proxy.$get('online/logout',{ id: currRow.value.id, time: time.value }).then(() => { + // proxy.$get('/system/online/logout',{ id: currRow.value.id, time: time.value }).then(() => { // magicDialog.value.hide() // magicList.value.reload() // }) diff --git a/magic-boot-ui/src/views/system/monitor/oper-log.vue b/magic-boot-ui/src/views/system/monitor/oper-log.vue index eeae2e2..2988afa 100644 --- a/magic-boot-ui/src/views/system/monitor/oper-log.vue +++ b/magic-boot-ui/src/views/system/monitor/oper-log.vue @@ -9,7 +9,7 @@ import { ref, reactive } from 'vue' const table = ref() const tableOptions = reactive({ - url: 'log/oper/list', + url: '/system/log/oper/list', where: { createDate: { type: 'datetimerange', 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 40468b3..0418249 100644 --- a/magic-boot-ui/src/views/system/office/office-list.vue +++ b/magic-boot-ui/src/views/system/office/office-list.vue @@ -127,7 +127,7 @@ const tableOptions = reactive({ type: 'text', icon: 'ElSortUp', click: (row) => { - proxy.$get('office/sort/up',{ + proxy.$get('/system/office/sort/up',{ id: row.id, pid: row.pid, sort: row.sort @@ -141,7 +141,7 @@ const tableOptions = reactive({ type: 'text', icon: 'ElSortDown', click: (row) => { - proxy.$get('office/sort/down',{ + proxy.$get('/system/office/sort/down',{ id: row.id, pid: row.pid, sort: row.sort @@ -187,7 +187,7 @@ const tableOptions = reactive({ }, click: (row) => { proxy.$common.handleDelete({ - url: 'office/delete', + url: '/system/office/delete', id: row.id, done: () => reloadTable() }) @@ -267,7 +267,7 @@ function resetTemp() { } function getSort() { - proxy.$get('office/sort', { pid: temp.value.pid }).then(res => { + proxy.$get('/system/office/sort', { pid: temp.value.pid }).then(res => { temp.value.sort = res.data }) } @@ -306,7 +306,7 @@ function save(d) { }) return } - proxy.$post('office/save', temp.value).then(() => { + proxy.$post('/system/office/save', temp.value).then(() => { d.hideLoading() proxy.$notify({ title: '成功', @@ -322,7 +322,7 @@ function save(d) { } function reloadTable() { - proxy.$get('office/tree').then(res => { + proxy.$get('/system/office/tree').then(res => { officeData.value = res.data.list tableOptions.data = officeData.value }) diff --git a/magic-boot-ui/src/views/system/role/role-assign-permissions.vue b/magic-boot-ui/src/views/system/role/role-assign-permissions.vue index 2adf0bc..effb03b 100644 --- a/magic-boot-ui/src/views/system/role/role-assign-permissions.vue +++ b/magic-boot-ui/src/views/system/role/role-assign-permissions.vue @@ -17,13 +17,13 @@ console.log(props.id) const menus = ref('') -proxy.$get('menu/by/role',{ roleId: props.id }).then(res => { +proxy.$get('/system/menu/by/role',{ roleId: props.id }).then(res => { menus.value = res.data.join(',') }) function save(d) { d.loading() - proxy.$post('role/save', { + proxy.$post('/system/role/save', { id: props.id, menus: menus.value }).then((response) => { diff --git a/magic-boot-ui/src/views/system/role/role-list.vue b/magic-boot-ui/src/views/system/role/role-list.vue index 22eed4d..24293e8 100644 --- a/magic-boot-ui/src/views/system/role/role-list.vue +++ b/magic-boot-ui/src/views/system/role/role-list.vue @@ -89,7 +89,7 @@ const table = ref() const roleFormDialog = ref() const dataForm = ref() const tableOptions = reactive({ - url: 'role/list', + url: '/system/role/list', where: { name: { type: 'input', @@ -139,7 +139,7 @@ const tableOptions = reactive({ icon: 'ElDelete', click: (row) => { proxy.$common.handleDelete({ - url: 'role/delete', + url: '/system/role/delete', id: row.id, done: () => reloadTable() }) @@ -218,7 +218,7 @@ function save(d) { dataForm.value.validate((valid) => { if (valid) { d.loading() - proxy.$post('role/save', temp.value).then(() => { + proxy.$post('/system/role/save', temp.value).then(() => { d.hideLoading() reloadTable() roleFormDialog.value.hide() @@ -237,10 +237,10 @@ function handleUpdate(row) { for (var t in temp.value) { temp.value[t] = row[t] } - proxy.$get('menu/by/role',{ roleId: row.id }).then(res => { + proxy.$get('/system/menu/by/role',{ roleId: row.id }).then(res => { temp.value.menus = res.data.join(',') }) - proxy.$get('office/by/role',{ roleId: row.id }).then(res => { + proxy.$get('/system/office/by/role',{ roleId: row.id }).then(res => { temp.value.offices = res.data.join(',') }) dialogTitle.value = '修改' diff --git a/magic-boot-ui/src/views/system/test/test-list.vue b/magic-boot-ui/src/views/system/test/test-list.vue index ad72142..aaf1d41 100644 --- a/magic-boot-ui/src/views/system/test/test-list.vue +++ b/magic-boot-ui/src/views/system/test/test-list.vue @@ -40,7 +40,7 @@ import { ref, reactive, nextTick, getCurrentInstance } from 'vue' const { proxy } = getCurrentInstance() const tableOptions = reactive({ - url: 'test/list', + url: '/system/test/list', page: true, cols: [ { @@ -81,7 +81,7 @@ function handleCreate() { function save() { dataForm.value.validate((valid) => { if (valid) { - proxy.$post('test/save', temp.value).then((response) => { + proxy.$post('/system/test/save', temp.value).then((response) => { dialogFormVisible.value = false proxy.$notify({ title: '成功', diff --git a/magic-boot-ui/src/views/system/user/user-center.vue b/magic-boot-ui/src/views/system/user/user-center.vue index 03dcae7..e2dd2f2 100644 --- a/magic-boot-ui/src/views/system/user/user-center.vue +++ b/magic-boot-ui/src/views/system/user/user-center.vue @@ -77,7 +77,7 @@ function resetTemp() { function save() { dataForm.value.validate((valid) => { if (valid) { - proxy.$post('user/center/update', temp.value).then(() => { + proxy.$post('/system/user/center/update', temp.value).then(() => { proxy.$notify({ title: '成功', message: '修改成功', diff --git a/magic-boot-ui/src/views/system/user/user-form.vue b/magic-boot-ui/src/views/system/user/user-form.vue index 8110f3e..df70c69 100644 --- a/magic-boot-ui/src/views/system/user/user-form.vue +++ b/magic-boot-ui/src/views/system/user/user-form.vue @@ -64,7 +64,7 @@ const isForm = ref(true) const dataForm = ref() onBeforeMount(() => { - proxy.$get('user/offices').then(res => { + proxy.$get('/system/user/offices').then(res => { officeTree.value = res.data.list proxy.$treeTable.deleteEmptyChildren(officeTree.value) }) @@ -99,7 +99,7 @@ function save(d) { dataForm.value.validate((valid) => { if (valid) { d.loading() - proxy.$post('user/save', temp.value).then(() => { + proxy.$post('/system/user/save', temp.value).then(() => { d.hideLoading() proxy.$notify({ title: '成功', @@ -124,7 +124,7 @@ function getInfo(row) { temp.value[t] = row[t] } } - proxy.$get('user/roles', { userId: temp.value.id }).then((res) => { + proxy.$get('/system/user/roles', { userId: temp.value.id }).then((res) => { temp.value.roles = res.data.join(',') }) } 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 750c637..ea3fbe2 100644 --- a/magic-boot-ui/src/views/system/user/user-list.vue +++ b/magic-boot-ui/src/views/system/user/user-list.vue @@ -63,7 +63,7 @@ import { ref, reactive, getCurrentInstance, onMounted, nextTick } from 'vue' const { proxy } = getCurrentInstance() const tableOptions = reactive({ - url: 'user/list', + url: '/system/user/list', page: true, selection: true, where: { @@ -82,7 +82,7 @@ const tableOptions = reactive({ label: '角色', value: '', properties: { - url: 'role/all', + url: '/system/role/all', multiple: true } }, @@ -121,7 +121,7 @@ const tableOptions = reactive({ return row.id != '1' }, change: (row) => { - proxy.$get('/user/change/login/status', { + proxy.$get('/system/user/change/login/status', { id: row.id, isLogin: row.isLogin }) @@ -157,7 +157,7 @@ const tableOptions = reactive({ }, click: (row) => { proxy.$common.handleDelete({ - url: 'user/delete', + url: '/system/user/delete', id: row.id, done: () => reloadTable() }) 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 7e3aa48..3ee0223 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 @@ -50,7 +50,7 @@ public class PermissionInterceptor implements RequestInterceptor, HandlerInterce return StatusCode.CERTIFICATE_EXPIRED.json(); } else { // TODO - List permissions = (List) magicAPIService.execute("post", "/security/permissions", null); + List permissions = (List) magicAPIService.execute("post", "/system/security/permissions", null); String permission = Objects.toString(info.getOptionValue(Options.PERMISSION), ""); if (StringUtils.isNotBlank(permission) && !permissions.contains(permission)) { return StatusCode.FORBIDDEN.json(); @@ -61,21 +61,23 @@ public class PermissionInterceptor implements RequestInterceptor, HandlerInterce @Override public Object postHandle(RequestEntity requestEntity, Object returnValue) throws Exception { - try { - HttpServletRequest request = requestEntity.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(?,?,?,?,?,?,?,?)", + if(StpUtil.isLogin()){ + try { + HttpServletRequest request = requestEntity.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("/","-"), - PathUtils.replaceSlash(String.format("/%s/%s", magicResourceService.getGroupName(info.getGroupId()), info.getName())), - request.getRequestURI(), - request.getMethod(), - System.currentTimeMillis() - requestEntity.getRequestTime(), - StpUtil.getLoginId(), - new Date(requestEntity.getRequestTime()), - request.getHeader("User-Agent"), - ServletUtil.getClientIP(request)); - } catch (Exception ignored){ - ignored.printStackTrace(); + PathUtils.replaceSlash(String.format("/%s/%s", magicResourceService.getGroupName(info.getGroupId()), info.getName())), + request.getRequestURI(), + request.getMethod(), + System.currentTimeMillis() - requestEntity.getRequestTime(), + StpUtil.getLoginId(), + new Date(requestEntity.getRequestTime()), + request.getHeader("User-Agent"), + ServletUtil.getClientIP(request)); + } catch (Exception ignored){ + ignored.printStackTrace(); + } } return null; }