diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/group.json b/data/magic-api/api/后台/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/group.json rename to data/magic-api/api/后台/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/安全/group.json b/data/magic-api/api/后台/安全/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/安全/group.json rename to data/magic-api/api/后台/安全/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/安全/登录.ms b/data/magic-api/api/后台/安全/登录.ms similarity index 95% rename from magic-boot/src/main/resources/data/magic-api/api/后台/安全/登录.ms rename to data/magic-api/api/后台/安全/登录.ms index 2fcacb2..06562a9 100644 --- a/magic-boot/src/main/resources/data/magic-api/api/后台/安全/登录.ms +++ b/data/magic-api/api/后台/安全/登录.ms @@ -5,16 +5,16 @@ "groupId" : "1952f25c81084e24b55b11385767dc38", "name" : "登录", "createTime" : null, - "updateTime" : 1642773955109, + "updateTime" : 1643710774934, "lock" : "0", "method" : "POST", "path" : "/login", "parameters" : [ ], "option" : "[{\"name\":\"require_login\",\"value\":\"false\",\"description\":\"该接口需要登录才允许访问\"}]", - "requestBody" : "{\r\n \"username\": \"admin\",\r\n \"password\": \"1\"\r\n}", + "requestBody" : "{\r\n \"username\": \"admin\",\r\n \"password\": \"123456\"\r\n}", "headers" : [ ], "paths" : [ ], - "responseBody" : "{\n \"code\": 0,\n \"message\": \"用户名或密码错误\",\n \"data\": null,\n \"timestamp\": 1642321857211,\n \"executeTime\": 3\n}", + "responseBody" : "{\n \"code\": 0,\n \"message\": \"用户名或密码错误\",\n \"data\": null,\n \"timestamp\": 1643710761990,\n \"executeTime\": 6\n}", "description" : null, "requestBodyDefinition" : { "name" : "", @@ -41,7 +41,7 @@ "children" : [ ] }, { "name" : "password", - "value" : "1", + "value" : "123456", "description" : "", "required" : false, "dataType" : "String", @@ -102,7 +102,7 @@ "children" : [ ] }, { "name" : "timestamp", - "value" : "1642321857211", + "value" : "1643710761990", "description" : "", "required" : false, "dataType" : "Long", @@ -114,7 +114,7 @@ "children" : [ ] }, { "name" : "executeTime", - "value" : "3", + "value" : "6", "description" : "", "required" : false, "dataType" : "Integer", diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/安全/获取当前用户权限code.ms b/data/magic-api/api/后台/安全/获取当前用户权限code.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/安全/获取当前用户权限code.ms rename to data/magic-api/api/后台/安全/获取当前用户权限code.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/安全/退出登录.ms b/data/magic-api/api/后台/安全/退出登录.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/安全/退出登录.ms rename to data/magic-api/api/后台/安全/退出登录.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/安全/验证token.ms b/data/magic-api/api/后台/安全/验证token.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/安全/验证token.ms rename to data/magic-api/api/后台/安全/验证token.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/富文本/group.json b/data/magic-api/api/后台/富文本/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/富文本/group.json rename to data/magic-api/api/后台/富文本/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/富文本/上传图片.ms b/data/magic-api/api/后台/富文本/上传图片.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/富文本/上传图片.ms rename to data/magic-api/api/后台/富文本/上传图片.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/富文本/上传文件.ms b/data/magic-api/api/后台/富文本/上传文件.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/富文本/上传文件.ms rename to data/magic-api/api/后台/富文本/上传文件.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/富文本/入口get.ms b/data/magic-api/api/后台/富文本/入口get.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/富文本/入口get.ms rename to data/magic-api/api/后台/富文本/入口get.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/富文本/入口post.ms b/data/magic-api/api/后台/富文本/入口post.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/富文本/入口post.ms rename to data/magic-api/api/后台/富文本/入口post.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/富文本/配置.ms b/data/magic-api/api/后台/富文本/配置.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/富文本/配置.ms rename to data/magic-api/api/后台/富文本/配置.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/group.json b/data/magic-api/api/后台/数据字典/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/group.json rename to data/magic-api/api/后台/数据字典/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/保存.ms b/data/magic-api/api/后台/数据字典/保存.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/保存.ms rename to data/magic-api/api/后台/数据字典/保存.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/列表.ms b/data/magic-api/api/后台/数据字典/列表.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/列表.ms rename to data/magic-api/api/后台/数据字典/列表.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/删除.ms b/data/magic-api/api/后台/数据字典/删除.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/删除.ms rename to data/magic-api/api/后台/数据字典/删除.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/group.json b/data/magic-api/api/后台/数据字典/字典项/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/group.json rename to data/magic-api/api/后台/数据字典/字典项/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/保存.ms b/data/magic-api/api/后台/数据字典/字典项/保存.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/保存.ms rename to data/magic-api/api/后台/数据字典/字典项/保存.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/列表.ms b/data/magic-api/api/后台/数据字典/字典项/列表.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/列表.ms rename to data/magic-api/api/后台/数据字典/字典项/列表.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/删除.ms b/data/magic-api/api/后台/数据字典/字典项/删除.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/删除.ms rename to data/magic-api/api/后台/数据字典/字典项/删除.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/获取所有字典项.ms b/data/magic-api/api/后台/数据字典/字典项/获取所有字典项.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/获取所有字典项.ms rename to data/magic-api/api/后台/数据字典/字典项/获取所有字典项.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/获取排序号.ms b/data/magic-api/api/后台/数据字典/字典项/获取排序号.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/字典项/获取排序号.ms rename to data/magic-api/api/后台/数据字典/字典项/获取排序号.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/获取排序号.ms b/data/magic-api/api/后台/数据字典/获取排序号.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/数据字典/获取排序号.ms rename to data/magic-api/api/后台/数据字典/获取排序号.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/group.json b/data/magic-api/api/后台/文件管理/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/group.json rename to data/magic-api/api/后台/文件管理/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/上传.ms b/data/magic-api/api/后台/文件管理/上传.ms similarity index 90% rename from magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/上传.ms rename to data/magic-api/api/后台/文件管理/上传.ms index c96db61..89b0c4d 100644 --- a/magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/上传.ms +++ b/data/magic-api/api/后台/文件管理/上传.ms @@ -5,7 +5,7 @@ "groupId" : "fd3d225a1cf141bf9998c4ec4bf4a6ab", "name" : "上传", "createTime" : null, - "updateTime" : 1635075982440, + "updateTime" : 1643706737853, "lock" : "0", "method" : "POST", "path" : "/upload", @@ -21,7 +21,7 @@ "optionMap" : { } } ================================ -import 'org.ssssssss.magicboot.utils.FileUtils' +import org.ssssssss.magicboot.utils.FileUtils import request; var map = FileUtils.saveFile(request.getFile('file')); diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/删除.ms b/data/magic-api/api/后台/文件管理/删除.ms similarity index 79% rename from magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/删除.ms rename to data/magic-api/api/后台/文件管理/删除.ms index 83f7fd8..b6d93fe 100644 --- a/magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/删除.ms +++ b/data/magic-api/api/后台/文件管理/删除.ms @@ -5,7 +5,7 @@ "groupId" : "fd3d225a1cf141bf9998c4ec4bf4a6ab", "name" : "删除", "createTime" : null, - "updateTime" : 1635075573670, + "updateTime" : 1643706734133, "lock" : "0", "method" : "GET", "path" : "/delete", @@ -21,9 +21,10 @@ "optionMap" : { } } ================================ -import 'java.net.URLDecoder' -import 'org.ssssssss.magicboot.model.Global' -import 'org.ssssssss.magicboot.utils.FileUtils' +import java.net.URLDecoder +import org.ssssssss.magicboot.model.Global +import org.ssssssss.magicboot.utils.FileUtils +import cn.hutool.core.io.FileUtil; url = URLDecoder.decode(url, "UTF-8"); diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/排序.ms b/data/magic-api/api/后台/文件管理/排序.ms similarity index 88% rename from magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/排序.ms rename to data/magic-api/api/后台/文件管理/排序.ms index 4c8ff1c..6d12c69 100644 --- a/magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/排序.ms +++ b/data/magic-api/api/后台/文件管理/排序.ms @@ -4,8 +4,8 @@ "script" : null, "groupId" : "fd3d225a1cf141bf9998c4ec4bf4a6ab", "name" : "排序", - "createTime" : 1635074732708, - "updateTime" : 1635074732708, + "createTime" : null, + "updateTime" : 1643706726137, "lock" : "0", "method" : "GET", "path" : "/resort", @@ -21,7 +21,7 @@ "optionMap" : { } } ================================ -import 'java.net.URLDecoder' +import java.net.URLDecoder for(index,url in urls.split(',')){ url = URLDecoder.decode(url, "UTF-8") diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/获取文件列表.ms b/data/magic-api/api/后台/文件管理/获取文件列表.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/获取文件列表.ms rename to data/magic-api/api/后台/文件管理/获取文件列表.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/裁剪.ms b/data/magic-api/api/后台/文件管理/裁剪.ms similarity index 79% rename from magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/裁剪.ms rename to data/magic-api/api/后台/文件管理/裁剪.ms index 03be2a3..6405b99 100644 --- a/magic-boot/src/main/resources/data/magic-api/api/后台/文件管理/裁剪.ms +++ b/data/magic-api/api/后台/文件管理/裁剪.ms @@ -5,7 +5,7 @@ "groupId" : "fd3d225a1cf141bf9998c4ec4bf4a6ab", "name" : "裁剪", "createTime" : null, - "updateTime" : 1635075977442, + "updateTime" : 1643706719537, "lock" : "0", "method" : "POST", "path" : "/cropper", @@ -21,8 +21,11 @@ "optionMap" : { } } ================================ -import 'org.ssssssss.magicboot.model.Global' -import 'org.ssssssss.magicboot.utils.FileUtils' +import org.ssssssss.magicboot.model.Global +import org.ssssssss.magicboot.utils.FileUtils +import cn.hutool.core.io.FileUtil; +import java.net.URLDecoder +import request; url = URLDecoder.decode(url, "UTF-8"); String realPath = Global.getUserFilesBaseDir() + "/" + url; diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/测试数据/group.json b/data/magic-api/api/后台/测试数据/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/测试数据/group.json rename to data/magic-api/api/后台/测试数据/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/测试数据/保存.ms b/data/magic-api/api/后台/测试数据/保存.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/测试数据/保存.ms rename to data/magic-api/api/后台/测试数据/保存.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/测试数据/列表.ms b/data/magic-api/api/后台/测试数据/列表.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/测试数据/列表.ms rename to data/magic-api/api/后台/测试数据/列表.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/group.json b/data/magic-api/api/后台/用户管理/group.json similarity index 100% rename from magic-boot/src/main/resources/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 new file mode 100644 index 0000000..e0a87cc --- /dev/null +++ b/data/magic-api/api/后台/用户管理/个人信息修改.ms @@ -0,0 +1,34 @@ +{ + "properties" : { }, + "id" : "ebe40a0cf4b84192b6bbe923a0ecbd9c", + "script" : null, + "groupId" : "4f0230049d7e4f39b1e0897cc0f46f9a", + "name" : "个人信息修改", + "createTime" : null, + "updateTime" : 1643710989215, + "lock" : "0", + "method" : "POST", + "path" : "/center/update", + "parameters" : [ ], + "option" : "[]", + "requestBody" : "{\r\n\t\r\n}", + "headers" : [ ], + "paths" : [ ], + "responseBody" : null, + "description" : null, + "requestBodyDefinition" : null, + "responseBodyDefinition" : null, + "optionMap" : { } +} +================================ +import cn.dev33.satoken.secure.SaSecureUtil; + +var data = { + id, + phone, + headPortrait +} +if(newPassword){ + data.password = newPassword ? SaSecureUtil.sha256(newPassword) : '' +} +return db.table('sys_user').primary('id').update(data) \ No newline at end of file diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/保存.ms b/data/magic-api/api/后台/用户管理/保存.ms similarity index 92% rename from magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/保存.ms rename to data/magic-api/api/后台/用户管理/保存.ms index a6aa481..cfebd02 100644 --- a/magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/保存.ms +++ b/data/magic-api/api/后台/用户管理/保存.ms @@ -5,7 +5,7 @@ "groupId" : "4f0230049d7e4f39b1e0897cc0f46f9a", "name" : "保存", "createTime" : null, - "updateTime" : 1642085497821, + "updateTime" : 1643710594405, "lock" : "0", "method" : "POST", "path" : "/save", @@ -21,7 +21,7 @@ "optionMap" : { } } ================================ -import 'cn.dev33.satoken.secure.SaSecureUtil'; +import cn.dev33.satoken.secure.SaSecureUtil; import org.ssssssss.magicapi.cache.SqlCache password = password ? SaSecureUtil.sha256(password) : '' diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/修改登录状态.ms b/data/magic-api/api/后台/用户管理/修改登录状态.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/修改登录状态.ms rename to data/magic-api/api/后台/用户管理/修改登录状态.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/列表.ms b/data/magic-api/api/后台/用户管理/列表.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/列表.ms rename to data/magic-api/api/后台/用户管理/列表.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/删除.ms b/data/magic-api/api/后台/用户管理/删除.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/删除.ms rename to data/magic-api/api/后台/用户管理/删除.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/所有机构.ms b/data/magic-api/api/后台/用户管理/所有机构.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/所有机构.ms rename to data/magic-api/api/后台/用户管理/所有机构.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/根据用户id获取角色列表.ms b/data/magic-api/api/后台/用户管理/根据用户id获取角色列表.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/根据用户id获取角色列表.ms rename to data/magic-api/api/后台/用户管理/根据用户id获取角色列表.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/获取用户信息.ms b/data/magic-api/api/后台/用户管理/获取用户信息.ms similarity index 92% rename from magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/获取用户信息.ms rename to data/magic-api/api/后台/用户管理/获取用户信息.ms index dc86957..6d11342 100644 --- a/magic-boot/src/main/resources/data/magic-api/api/后台/用户管理/获取用户信息.ms +++ b/data/magic-api/api/后台/用户管理/获取用户信息.ms @@ -4,8 +4,8 @@ "script" : null, "groupId" : "4f0230049d7e4f39b1e0897cc0f46f9a", "name" : "获取用户信息", - "createTime" : 1634724871155, - "updateTime" : 1634724871155, + "createTime" : null, + "updateTime" : 1643710783720, "lock" : "0", "method" : "GET", "path" : "/info", @@ -14,7 +14,7 @@ "requestBody" : "{}", "headers" : [ ], "paths" : [ ], - "responseBody" : "{\n \"code\": 402,\n \"message\": \"凭证已过期\",\n \"data\": null,\n \"timestamp\": 1634093332235,\n \"executeTime\": null\n}", + "responseBody" : "{\n \"code\": 402,\n \"message\": \"凭证已过期\",\n \"data\": null,\n \"timestamp\": 1643710751531,\n \"executeTime\": null\n}", "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : { @@ -66,7 +66,7 @@ "children" : [ ] }, { "name" : "timestamp", - "value" : "1634093332235", + "value" : "1643710751531", "description" : "", "required" : false, "dataType" : "Long", diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/group.json b/data/magic-api/api/后台/组织机构/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/group.json rename to data/magic-api/api/后台/组织机构/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/上移.ms b/data/magic-api/api/后台/组织机构/上移.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/上移.ms rename to data/magic-api/api/后台/组织机构/上移.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/下移.ms b/data/magic-api/api/后台/组织机构/下移.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/下移.ms rename to data/magic-api/api/后台/组织机构/下移.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/保存.ms b/data/magic-api/api/后台/组织机构/保存.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/保存.ms rename to data/magic-api/api/后台/组织机构/保存.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/列表.ms b/data/magic-api/api/后台/组织机构/列表.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/列表.ms rename to data/magic-api/api/后台/组织机构/列表.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/删除.ms b/data/magic-api/api/后台/组织机构/删除.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/删除.ms rename to data/magic-api/api/后台/组织机构/删除.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/根据角色获取组织机构.ms b/data/magic-api/api/后台/组织机构/根据角色获取组织机构.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/根据角色获取组织机构.ms rename to data/magic-api/api/后台/组织机构/根据角色获取组织机构.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/获取排序号.ms b/data/magic-api/api/后台/组织机构/获取排序号.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/组织机构/获取排序号.ms rename to data/magic-api/api/后台/组织机构/获取排序号.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/group.json b/data/magic-api/api/后台/菜单管理/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/group.json rename to data/magic-api/api/后台/菜单管理/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/上移.ms b/data/magic-api/api/后台/菜单管理/上移.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/上移.ms rename to data/magic-api/api/后台/菜单管理/上移.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/下移.ms b/data/magic-api/api/后台/菜单管理/下移.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/下移.ms rename to data/magic-api/api/后台/菜单管理/下移.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/保存.ms b/data/magic-api/api/后台/菜单管理/保存.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/保存.ms rename to data/magic-api/api/后台/菜单管理/保存.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/修改是否显示.ms b/data/magic-api/api/后台/菜单管理/修改是否显示.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/修改是否显示.ms rename to data/magic-api/api/后台/菜单管理/修改是否显示.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/删除.ms b/data/magic-api/api/后台/菜单管理/删除.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/删除.ms rename to data/magic-api/api/后台/菜单管理/删除.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/当前用户菜单.ms b/data/magic-api/api/后台/菜单管理/当前用户菜单.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/当前用户菜单.ms rename to data/magic-api/api/后台/菜单管理/当前用户菜单.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/根据菜单id清除缓存.ms b/data/magic-api/api/后台/菜单管理/根据菜单id清除缓存.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/根据菜单id清除缓存.ms rename to data/magic-api/api/后台/菜单管理/根据菜单id清除缓存.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/根据角色获取菜单.ms b/data/magic-api/api/后台/菜单管理/根据角色获取菜单.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/根据角色获取菜单.ms rename to data/magic-api/api/后台/菜单管理/根据角色获取菜单.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/获取排序号.ms b/data/magic-api/api/后台/菜单管理/获取排序号.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/获取排序号.ms rename to data/magic-api/api/后台/菜单管理/获取排序号.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/获取菜单tree.ms b/data/magic-api/api/后台/菜单管理/获取菜单tree.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/菜单管理/获取菜单tree.ms rename to data/magic-api/api/后台/菜单管理/获取菜单tree.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/角色管理/group.json b/data/magic-api/api/后台/角色管理/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/角色管理/group.json rename to data/magic-api/api/后台/角色管理/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/角色管理/保存.ms b/data/magic-api/api/后台/角色管理/保存.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/角色管理/保存.ms rename to data/magic-api/api/后台/角色管理/保存.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/角色管理/列表.ms b/data/magic-api/api/后台/角色管理/列表.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/角色管理/列表.ms rename to data/magic-api/api/后台/角色管理/列表.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/角色管理/删除.ms b/data/magic-api/api/后台/角色管理/删除.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/角色管理/删除.ms rename to data/magic-api/api/后台/角色管理/删除.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/角色管理/根据角色id删除缓存.ms b/data/magic-api/api/后台/角色管理/根据角色id删除缓存.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/角色管理/根据角色id删除缓存.ms rename to data/magic-api/api/后台/角色管理/根据角色id删除缓存.ms diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/配置/group.json b/data/magic-api/api/后台/配置/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/配置/group.json rename to data/magic-api/api/后台/配置/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/api/后台/配置/获取所有配置.ms b/data/magic-api/api/后台/配置/获取所有配置.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/api/后台/配置/获取所有配置.ms rename to data/magic-api/api/后台/配置/获取所有配置.ms diff --git a/magic-boot/src/main/resources/data/magic-api/function/权限/group.json b/data/magic-api/function/权限/group.json similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/function/权限/group.json rename to data/magic-api/function/权限/group.json diff --git a/magic-boot/src/main/resources/data/magic-api/function/权限/组织机构.ms b/data/magic-api/function/权限/组织机构.ms similarity index 100% rename from magic-boot/src/main/resources/data/magic-api/function/权限/组织机构.ms rename to data/magic-api/function/权限/组织机构.ms diff --git a/magic-boot-ui/src/components/MagicBoot/mb-upload-image.vue b/magic-boot-ui/src/components/MagicBoot/mb-upload-image.vue index 2c925fb..83d5e84 100644 --- a/magic-boot-ui/src/components/MagicBoot/mb-upload-image.vue +++ b/magic-boot-ui/src/components/MagicBoot/mb-upload-image.vue @@ -51,7 +51,7 @@ - +