diff --git a/data/magic-api/api/后台/安全/登录.ms b/data/magic-api/api/后台/安全/登录.ms index 9c7701f..0c30cf0 100644 --- a/data/magic-api/api/后台/安全/登录.ms +++ b/data/magic-api/api/后台/安全/登录.ms @@ -5,7 +5,7 @@ "groupId" : "1952f25c81084e24b55b11385767dc38", "name" : "登录", "createTime" : null, - "updateTime" : 1635578719816, + "updateTime" : 1635925201035, "lock" : "0", "method" : "POST", "path" : "/login", diff --git a/data/magic-api/api/后台/富文本/group.json b/data/magic-api/api/后台/富文本/group.json new file mode 100644 index 0000000..0160cd6 --- /dev/null +++ b/data/magic-api/api/后台/富文本/group.json @@ -0,0 +1,22 @@ +{ + "properties" : { }, + "id" : "7eeba36706c24c1484ee4e84ad829f9b", + "name" : "富文本", + "type" : "1", + "parentId" : "02df51e4d7184780a98b632f43dc5848", + "path" : "/ueditor", + "paths" : [ ], + "options" : [ { + "name" : "require_login", + "value" : "false", + "description" : "该接口需要登录才允许访问", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : null, + "error" : null, + "expression" : null, + "children" : null + } ] +} \ No newline at end of file diff --git a/data/magic-api/api/后台/富文本/上传图片.ms b/data/magic-api/api/后台/富文本/上传图片.ms new file mode 100644 index 0000000..c26a094 --- /dev/null +++ b/data/magic-api/api/后台/富文本/上传图片.ms @@ -0,0 +1,100 @@ +{ + "properties" : { }, + "id" : "72d080dc9ed540eebe17a11e4077d775", + "script" : null, + "groupId" : "7eeba36706c24c1484ee4e84ad829f9b", + "name" : "上传图片", + "createTime" : null, + "updateTime" : 1635926424491, + "lock" : "0", + "method" : "POST", + "path" : "/uploadImage", + "parameters" : [ ], + "option" : "[]", + "requestBody" : "{}", + "headers" : [ ], + "paths" : [ ], + "responseBody" : "{\n \"code\": 500,\n \"message\": \"系统内部出现错误\",\n \"data\": null,\n \"timestamp\": 1635926293609,\n \"executeTime\": 33\n}", + "description" : null, + "requestBodyDefinition" : null, + "responseBodyDefinition" : { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "code", + "value" : "500", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "message", + "value" : "系统内部出现错误", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "data", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "timestamp", + "value" : "1635926293609", + "description" : "", + "required" : false, + "dataType" : "Long", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "executeTime", + "value" : "33", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + }, + "optionMap" : { } +} +================================ +import 'org.ssssssss.magicboot.utils.FileUtils' +import request; +import response; + +return response.json(FileUtils.saveFile(request.getFile("file"))); diff --git a/data/magic-api/api/后台/富文本/上传文件.ms b/data/magic-api/api/后台/富文本/上传文件.ms new file mode 100644 index 0000000..22b744d --- /dev/null +++ b/data/magic-api/api/后台/富文本/上传文件.ms @@ -0,0 +1,28 @@ +{ + "properties" : { }, + "id" : "4b61ead2862144b2a9115719c4550aa5", + "script" : null, + "groupId" : "7eeba36706c24c1484ee4e84ad829f9b", + "name" : "上传文件", + "createTime" : 1635926414330, + "updateTime" : 1635926414330, + "lock" : "0", + "method" : "POST", + "path" : "/uploadFile", + "parameters" : [ ], + "option" : "[]", + "requestBody" : "{\r\n\t\r\n}", + "headers" : [ ], + "paths" : [ ], + "responseBody" : null, + "description" : null, + "requestBodyDefinition" : null, + "responseBodyDefinition" : null, + "optionMap" : { } +} +================================ +import 'org.ssssssss.magicboot.utils.FileUtils' +import request; +import response; + +return response.json(FileUtils.saveFile(request.getFile("file"))); \ No newline at end of file diff --git a/data/magic-api/api/后台/富文本/入口get.ms b/data/magic-api/api/后台/富文本/入口get.ms new file mode 100644 index 0000000..3558a2e --- /dev/null +++ b/data/magic-api/api/后台/富文本/入口get.ms @@ -0,0 +1,111 @@ +{ + "properties" : { }, + "id" : "d129fd774adc4279b94908c4e08eda83", + "script" : null, + "groupId" : "7eeba36706c24c1484ee4e84ad829f9b", + "name" : "入口get", + "createTime" : null, + "updateTime" : 1635927863001, + "lock" : "0", + "method" : "GET", + "path" : "/main", + "parameters" : [ ], + "option" : "[]", + "requestBody" : "{}", + "headers" : [ ], + "paths" : [ ], + "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": {\n \"filePrefix\": \"http://192.168.0.106:8081/\"\n },\n \"timestamp\": 1635925203745,\n \"executeTime\": 9\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" : "filePrefix", + "value" : "http://192.168.0.106:8081/", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + }, { + "name" : "timestamp", + "value" : "1635925203745", + "description" : "", + "required" : false, + "dataType" : "Long", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "executeTime", + "value" : "9", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + }, + "optionMap" : { + "require_login" : "false" + } +} +================================ +import response; +return response.dispatcher(`/ueditor/${action}`); \ No newline at end of file diff --git a/data/magic-api/api/后台/富文本/入口post.ms b/data/magic-api/api/后台/富文本/入口post.ms new file mode 100644 index 0000000..e90c914 --- /dev/null +++ b/data/magic-api/api/后台/富文本/入口post.ms @@ -0,0 +1,27 @@ +{ + "properties" : { }, + "id" : "c9e512bc233f4b53822f9a1d94e074ff", + "script" : null, + "groupId" : "7eeba36706c24c1484ee4e84ad829f9b", + "name" : "入口post", + "createTime" : null, + "updateTime" : 1635927291775, + "lock" : "0", + "method" : "POST", + "path" : "/main", + "parameters" : [ ], + "option" : "[]", + "requestBody" : "", + "headers" : [ ], + "paths" : [ ], + "responseBody" : null, + "description" : null, + "requestBodyDefinition" : null, + "responseBodyDefinition" : null, + "optionMap" : { + "require_login" : "false" + } +} +================================ +import response; +return response.dispatcher(`/ueditor/${action}`); \ No newline at end of file diff --git a/data/magic-api/api/后台/富文本/配置.ms b/data/magic-api/api/后台/富文本/配置.ms new file mode 100644 index 0000000..b2fad9e --- /dev/null +++ b/data/magic-api/api/后台/富文本/配置.ms @@ -0,0 +1,504 @@ +{ + "properties" : { }, + "id" : "c73741fd4a4d4677a97f16bd1afd6d16", + "script" : null, + "groupId" : "7eeba36706c24c1484ee4e84ad829f9b", + "name" : "配置", + "createTime" : null, + "updateTime" : 1635927563365, + "lock" : "0", + "method" : "GET", + "path" : "/config", + "parameters" : [ ], + "option" : "[{\"name\":\"\",\"value\":\"\",\"description\":\"\"}]", + "requestBody" : "{}", + "headers" : [ ], + "paths" : [ ], + "responseBody" : "{\n \"imageActionName\": \"uploadImage\",\n \"imageFieldName\": \"file\",\n \"imageMaxSize\": 2048000,\n \"imageAllowFiles\": [\n \".png\",\n \".jpg\",\n \".jpeg\",\n \".gif\",\n \".bmp\"\n ],\n \"imageCompressEnable\": true,\n \"imageCompressBorder\": 1600,\n \"imageInsertAlign\": \"none\",\n \"imageUrlPrefix\": \"http://192.168.0.106:8081/\",\n \"imagePathFormat\": \"/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n \"catcherLocalDomain\": [\n \"127.0.0.1\",\n \"localhost\",\n \"img.baidu.com\"\n ],\n \"catcherActionName\": \"catchimage\",\n \"catcherFieldName\": \"source\",\n \"catcherPathFormat\": \"/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n \"catcherMaxSize\": 2048000,\n \"catcherAllowFiles\": [\n \".png\",\n \".jpg\",\n \".jpeg\",\n \".gif\",\n \".bmp\"\n ],\n \"fileActionName\": \"uploadFile\",\n \"fileFieldName\": \"file\",\n \"filePathFormat\": \"/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}\",\n \"fileUrlPrefix\": \"http://192.168.0.106:8081/\",\n \"fileMaxSize\": 51200000,\n \"fileAllowFiles\": [\n \".png\",\n \".jpg\",\n \".jpeg\",\n \".gif\",\n \".bmp\",\n \".flv\",\n \".swf\",\n \".mkv\",\n \".avi\",\n \".rm\",\n \".rmvb\",\n \".mpeg\",\n \".mpg\",\n \".ogg\",\n \".ogv\",\n \".mov\",\n \".wmv\",\n \".mp4\",\n \".mp3\",\n \".wav\",\n \".mid\",\n \".rar\",\n \".zip\",\n \".tar\",\n \".gz\",\n \".7z\",\n \".doc\",\n \".docx\",\n \".xls\",\n \".xlsx\",\n \".ppt\",\n \".pptx\",\n \".pdf\",\n \".txt\"\n ],\n \"imageManagerActionName\": \"listimage\",\n \"imageManagerListPath\": \"/upload/image/\",\n \"imageManagerListSize\": 20,\n \"imageManagerUrlPrefix\": \"http://192.168.0.106:8081/\",\n \"imageManagerInsertAlign\": \"none\",\n \"imageManagerAllowFiles\": [\n \".png\",\n \".jpg\",\n \".jpeg\",\n \".gif\",\n \".bmp\"\n ],\n \"fileManagerActionName\": \"listfile\",\n \"fileManagerListPath\": \"/upload/file/\",\n \"fileManagerUrlPrefix\": \"http://192.168.0.106:8081/\",\n \"fileManagerListSize\": 20,\n \"fileManagerAllowFiles\": [\n \".png\",\n \".jpg\",\n \".jpeg\",\n \".gif\",\n \".bmp\",\n \".flv\",\n \".swf\",\n \".mkv\",\n \".avi\",\n \".rm\",\n \".rmvb\",\n \".mpeg\",\n \".mpg\",\n \".ogg\",\n \".ogv\",\n \".mov\",\n \".wmv\",\n \".mp4\",\n \".mp3\",\n \".wav\",\n \".mid\",\n \".rar\",\n \".zip\",\n \".tar\",\n \".gz\",\n \".7z\",\n \".doc\",\n \".docx\",\n \".xls\",\n \".xlsx\",\n \".ppt\",\n \".pptx\",\n \".pdf\",\n \".txt\"\n ]\n}", + "description" : null, + "requestBodyDefinition" : null, + "responseBodyDefinition" : { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "imageActionName", + "value" : "uploadImage", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imageFieldName", + "value" : "file", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imageMaxSize", + "value" : "2048000", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imageAllowFiles", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "", + "value" : ".png", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + }, { + "name" : "imageCompressEnable", + "value" : "true", + "description" : "", + "required" : false, + "dataType" : "Boolean", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imageCompressBorder", + "value" : "1600", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imageInsertAlign", + "value" : "none", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imageUrlPrefix", + "value" : "http://192.168.0.106:8081/", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imagePathFormat", + "value" : "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "catcherLocalDomain", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "", + "value" : "127.0.0.1", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + }, { + "name" : "catcherActionName", + "value" : "catchimage", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "catcherFieldName", + "value" : "source", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "catcherPathFormat", + "value" : "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "catcherMaxSize", + "value" : "2048000", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "catcherAllowFiles", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "", + "value" : ".png", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + }, { + "name" : "fileActionName", + "value" : "uploadFile", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "fileFieldName", + "value" : "file", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "filePathFormat", + "value" : "/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "fileUrlPrefix", + "value" : "http://192.168.0.106:8081/", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "fileMaxSize", + "value" : "51200000", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "fileAllowFiles", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "", + "value" : ".png", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + }, { + "name" : "imageManagerActionName", + "value" : "listimage", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imageManagerListPath", + "value" : "/upload/image/", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imageManagerListSize", + "value" : "20", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imageManagerUrlPrefix", + "value" : "http://192.168.0.106:8081/", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imageManagerInsertAlign", + "value" : "none", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "imageManagerAllowFiles", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "", + "value" : ".png", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + }, { + "name" : "fileManagerActionName", + "value" : "listfile", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "fileManagerListPath", + "value" : "/upload/file/", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "fileManagerUrlPrefix", + "value" : "http://192.168.0.106:8081/", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "fileManagerListSize", + "value" : "20", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "fileManagerAllowFiles", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "", + "value" : ".png", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + } ] + }, + "optionMap" : { + "" : "", + "require_login" : "false" + } +} +================================ +import 'org.ssssssss.magicboot.model.UeditorConfig' +import 'org.ssssssss.magicapi.utils.JsonUtils' +import response; + +response.setHeader("content-type","text/javascript") + +if(null == callback || "".equals(callback)) { + return response.json(new UeditorConfig()); +} +return response.json(`${callback}(${new UeditorConfig()::stringify})`) \ No newline at end of file diff --git a/magic-boot/pom.xml b/magic-boot/pom.xml index 072637e..3e79984 100644 --- a/magic-boot/pom.xml +++ b/magic-boot/pom.xml @@ -14,7 +14,7 @@ magic-boot 1.8 - 1.6.1 + 1.6.3 1.2.1 5.7.13 1.26.0