diff --git a/magic-boot/.gitignore b/.gitignore
similarity index 69%
rename from magic-boot/.gitignore
rename to .gitignore
index 549e00a..d046517 100644
--- a/magic-boot/.gitignore
+++ b/.gitignore
@@ -31,3 +31,18 @@ build/
 
 ### VS Code ###
 .vscode/
+
+.DS_Store
+node_modules/
+dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+package-lock.json
+tests/**/coverage/
+
+# Editor directories and files
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
diff --git a/magic-boot/data/magic-api/api/后台/group.json b/data/magic-api/api/后台/group.json
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/group.json
rename to data/magic-api/api/后台/group.json
diff --git a/magic-boot/data/magic-api/api/后台/安全/group.json b/data/magic-api/api/后台/安全/group.json
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/安全/group.json
rename to data/magic-api/api/后台/安全/group.json
diff --git a/magic-boot/data/magic-api/api/后台/安全/登录.ms b/data/magic-api/api/后台/安全/登录.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/安全/登录.ms
rename to data/magic-api/api/后台/安全/登录.ms
diff --git a/magic-boot/data/magic-api/api/后台/安全/获取当前用户权限code.ms b/data/magic-api/api/后台/安全/获取当前用户权限code.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/安全/获取当前用户权限code.ms
rename to data/magic-api/api/后台/安全/获取当前用户权限code.ms
diff --git a/magic-boot/data/magic-api/api/后台/安全/退出登录.ms b/data/magic-api/api/后台/安全/退出登录.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/安全/退出登录.ms
rename to data/magic-api/api/后台/安全/退出登录.ms
diff --git a/magic-boot/data/magic-api/api/后台/安全/验证token.ms b/data/magic-api/api/后台/安全/验证token.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/安全/验证token.ms
rename to data/magic-api/api/后台/安全/验证token.ms
diff --git a/magic-boot/data/magic-api/api/后台/数据字典/group.json b/data/magic-api/api/后台/数据字典/group.json
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/数据字典/group.json
rename to data/magic-api/api/后台/数据字典/group.json
diff --git a/magic-boot/data/magic-api/api/后台/数据字典/保存.ms b/data/magic-api/api/后台/数据字典/保存.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/数据字典/保存.ms
rename to data/magic-api/api/后台/数据字典/保存.ms
diff --git a/magic-boot/data/magic-api/api/后台/数据字典/列表.ms b/data/magic-api/api/后台/数据字典/列表.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/数据字典/列表.ms
rename to data/magic-api/api/后台/数据字典/列表.ms
diff --git a/magic-boot/data/magic-api/api/后台/数据字典/删除.ms b/data/magic-api/api/后台/数据字典/删除.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/数据字典/删除.ms
rename to data/magic-api/api/后台/数据字典/删除.ms
diff --git a/magic-boot/data/magic-api/api/后台/数据字典/字典项/group.json b/data/magic-api/api/后台/数据字典/字典项/group.json
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/数据字典/字典项/group.json
rename to data/magic-api/api/后台/数据字典/字典项/group.json
diff --git a/magic-boot/data/magic-api/api/后台/数据字典/字典项/保存.ms b/data/magic-api/api/后台/数据字典/字典项/保存.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/数据字典/字典项/保存.ms
rename to data/magic-api/api/后台/数据字典/字典项/保存.ms
diff --git a/magic-boot/data/magic-api/api/后台/数据字典/字典项/列表.ms b/data/magic-api/api/后台/数据字典/字典项/列表.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/数据字典/字典项/列表.ms
rename to data/magic-api/api/后台/数据字典/字典项/列表.ms
diff --git a/magic-boot/data/magic-api/api/后台/数据字典/字典项/删除.ms b/data/magic-api/api/后台/数据字典/字典项/删除.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/数据字典/字典项/删除.ms
rename to data/magic-api/api/后台/数据字典/字典项/删除.ms
diff --git a/magic-boot/data/magic-api/api/后台/数据字典/字典项/获取所有字典项.ms b/data/magic-api/api/后台/数据字典/字典项/获取所有字典项.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/数据字典/字典项/获取所有字典项.ms
rename to data/magic-api/api/后台/数据字典/字典项/获取所有字典项.ms
diff --git a/magic-boot/data/magic-api/api/后台/数据字典/字典项/获取排序号.ms b/data/magic-api/api/后台/数据字典/字典项/获取排序号.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/数据字典/字典项/获取排序号.ms
rename to data/magic-api/api/后台/数据字典/字典项/获取排序号.ms
diff --git a/magic-boot/data/magic-api/api/后台/数据字典/获取排序号.ms b/data/magic-api/api/后台/数据字典/获取排序号.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/数据字典/获取排序号.ms
rename to data/magic-api/api/后台/数据字典/获取排序号.ms
diff --git a/magic-boot/data/magic-api/api/后台/文件管理/group.json b/data/magic-api/api/后台/文件管理/group.json
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/文件管理/group.json
rename to data/magic-api/api/后台/文件管理/group.json
diff --git a/magic-boot/data/magic-api/api/后台/文件管理/上传.ms b/data/magic-api/api/后台/文件管理/上传.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/文件管理/上传.ms
rename to data/magic-api/api/后台/文件管理/上传.ms
diff --git a/magic-boot/data/magic-api/api/后台/文件管理/删除.ms b/data/magic-api/api/后台/文件管理/删除.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/文件管理/删除.ms
rename to data/magic-api/api/后台/文件管理/删除.ms
diff --git a/magic-boot/data/magic-api/api/后台/文件管理/排序.ms b/data/magic-api/api/后台/文件管理/排序.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/文件管理/排序.ms
rename to data/magic-api/api/后台/文件管理/排序.ms
diff --git a/magic-boot/data/magic-api/api/后台/文件管理/获取文件列表.ms b/data/magic-api/api/后台/文件管理/获取文件列表.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/文件管理/获取文件列表.ms
rename to data/magic-api/api/后台/文件管理/获取文件列表.ms
diff --git a/magic-boot/data/magic-api/api/后台/文件管理/裁剪.ms b/data/magic-api/api/后台/文件管理/裁剪.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/文件管理/裁剪.ms
rename to data/magic-api/api/后台/文件管理/裁剪.ms
diff --git a/magic-boot/data/magic-api/api/后台/用户管理/group.json b/data/magic-api/api/后台/用户管理/group.json
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/用户管理/group.json
rename to data/magic-api/api/后台/用户管理/group.json
diff --git a/magic-boot/data/magic-api/api/后台/用户管理/保存.ms b/data/magic-api/api/后台/用户管理/保存.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/用户管理/保存.ms
rename to data/magic-api/api/后台/用户管理/保存.ms
diff --git a/magic-boot/data/magic-api/api/后台/用户管理/修改登录状态.ms b/data/magic-api/api/后台/用户管理/修改登录状态.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/用户管理/修改登录状态.ms
rename to data/magic-api/api/后台/用户管理/修改登录状态.ms
diff --git a/magic-boot/data/magic-api/api/后台/用户管理/列表.ms b/data/magic-api/api/后台/用户管理/列表.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/用户管理/列表.ms
rename to data/magic-api/api/后台/用户管理/列表.ms
diff --git a/magic-boot/data/magic-api/api/后台/用户管理/删除.ms b/data/magic-api/api/后台/用户管理/删除.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/用户管理/删除.ms
rename to data/magic-api/api/后台/用户管理/删除.ms
diff --git a/magic-boot/data/magic-api/api/后台/用户管理/根据用户id获取角色列表.ms b/data/magic-api/api/后台/用户管理/根据用户id获取角色列表.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/用户管理/根据用户id获取角色列表.ms
rename to data/magic-api/api/后台/用户管理/根据用户id获取角色列表.ms
diff --git a/magic-boot/data/magic-api/api/后台/用户管理/获取用户信息.ms b/data/magic-api/api/后台/用户管理/获取用户信息.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/用户管理/获取用户信息.ms
rename to data/magic-api/api/后台/用户管理/获取用户信息.ms
diff --git a/magic-boot/data/magic-api/api/后台/菜单管理/group.json b/data/magic-api/api/后台/菜单管理/group.json
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/菜单管理/group.json
rename to data/magic-api/api/后台/菜单管理/group.json
diff --git a/magic-boot/data/magic-api/api/后台/菜单管理/保存.ms b/data/magic-api/api/后台/菜单管理/保存.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/菜单管理/保存.ms
rename to data/magic-api/api/后台/菜单管理/保存.ms
diff --git a/magic-boot/data/magic-api/api/后台/菜单管理/修改是否显示.ms b/data/magic-api/api/后台/菜单管理/修改是否显示.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/菜单管理/修改是否显示.ms
rename to data/magic-api/api/后台/菜单管理/修改是否显示.ms
diff --git a/magic-boot/data/magic-api/api/后台/菜单管理/删除.ms b/data/magic-api/api/后台/菜单管理/删除.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/菜单管理/删除.ms
rename to data/magic-api/api/后台/菜单管理/删除.ms
diff --git a/magic-boot/data/magic-api/api/后台/菜单管理/当前用户菜单.ms b/data/magic-api/api/后台/菜单管理/当前用户菜单.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/菜单管理/当前用户菜单.ms
rename to data/magic-api/api/后台/菜单管理/当前用户菜单.ms
diff --git a/magic-boot/data/magic-api/api/后台/菜单管理/根据角色获取菜单.ms b/data/magic-api/api/后台/菜单管理/根据角色获取菜单.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/菜单管理/根据角色获取菜单.ms
rename to data/magic-api/api/后台/菜单管理/根据角色获取菜单.ms
diff --git a/magic-boot/data/magic-api/api/后台/菜单管理/获取排序号.ms b/data/magic-api/api/后台/菜单管理/获取排序号.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/菜单管理/获取排序号.ms
rename to data/magic-api/api/后台/菜单管理/获取排序号.ms
diff --git a/magic-boot/data/magic-api/api/后台/菜单管理/获取菜单tree.ms b/data/magic-api/api/后台/菜单管理/获取菜单tree.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/菜单管理/获取菜单tree.ms
rename to data/magic-api/api/后台/菜单管理/获取菜单tree.ms
diff --git a/magic-boot/data/magic-api/api/后台/角色管理/group.json b/data/magic-api/api/后台/角色管理/group.json
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/角色管理/group.json
rename to data/magic-api/api/后台/角色管理/group.json
diff --git a/magic-boot/data/magic-api/api/后台/角色管理/保存.ms b/data/magic-api/api/后台/角色管理/保存.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/角色管理/保存.ms
rename to data/magic-api/api/后台/角色管理/保存.ms
diff --git a/magic-boot/data/magic-api/api/后台/角色管理/列表.ms b/data/magic-api/api/后台/角色管理/列表.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/角色管理/列表.ms
rename to data/magic-api/api/后台/角色管理/列表.ms
diff --git a/magic-boot/data/magic-api/api/后台/角色管理/删除.ms b/data/magic-api/api/后台/角色管理/删除.ms
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/角色管理/删除.ms
rename to data/magic-api/api/后台/角色管理/删除.ms
diff --git a/magic-boot/data/magic-api/api/后台/配置/group.json b/data/magic-api/api/后台/配置/group.json
similarity index 100%
rename from magic-boot/data/magic-api/api/后台/配置/group.json
rename to data/magic-api/api/后台/配置/group.json
diff --git a/magic-boot/data/magic-api/api/后台/配置/获取所有配置.ms b/data/magic-api/api/后台/配置/获取所有配置.ms
similarity index 86%
rename from magic-boot/data/magic-api/api/后台/配置/获取所有配置.ms
rename to data/magic-api/api/后台/配置/获取所有配置.ms
index 0c2c8f8..b4186b5 100644
--- a/magic-boot/data/magic-api/api/后台/配置/获取所有配置.ms
+++ b/data/magic-api/api/后台/配置/获取所有配置.ms
@@ -5,7 +5,7 @@
   "groupId" : "5c36bdc1de454d6e9d1a464d87c96091",
   "name" : "获取所有配置",
   "createTime" : null,
-  "updateTime" : 1635043799494,
+  "updateTime" : 1635490462052,
   "lock" : "0",
   "method" : "GET",
   "path" : "/list",
@@ -93,19 +93,8 @@
   "optionMap" : { }
 }
 ================================
+import 'org.psyduck.common.utils.WebUtils'
+
 return {
-    filePrefix: '1',
-    upload: {
-        // oss,disk（磁盘）
-        type: 'disk',
-        dir: 'D:/psyduck/',
-        oss: {
-            endpoint: '',
-            accessKeyId: '',
-            accessKeySecret: '',
-            bucketName: '',
-            // https,http
-            transportProtocol: ''
-        }
-    }
+    filePrefix: WebUtils.getUeditorPrefix()
 }
\ No newline at end of file
diff --git a/magic-boot/db/magic-boot.sql b/db/magic-boot.sql
similarity index 100%
rename from magic-boot/db/magic-boot.sql
rename to db/magic-boot.sql
diff --git a/magic-boot-ui/.gitignore b/magic-boot-ui/.gitignore
deleted file mode 100644
index e65ab34..0000000
--- a/magic-boot-ui/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-.DS_Store
-node_modules/
-dist/
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-package-lock.json
-tests/**/coverage/
-
-# Editor directories and files
-.idea
-*.iml
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
diff --git a/magic-boot-ui/LICENSE b/magic-boot-ui/LICENSE
deleted file mode 100644
index 6151575..0000000
--- a/magic-boot-ui/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017-present PanJiaChen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/magic-boot-ui/README.md b/magic-boot-ui/README.md
deleted file mode 100644
index 938dc7a..0000000
--- a/magic-boot-ui/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-npm install  
-如果 npm install 报错
-可以尝试 npm降级
-npm install npm@6.14.8 -g
-npm run serve
\ No newline at end of file
diff --git a/magic-boot-ui/src/components/Psyduck/pd-upload-image.vue b/magic-boot-ui/src/components/Psyduck/pd-upload-image.vue
index 76d78c3..7b5d5e3 100644
--- a/magic-boot-ui/src/components/Psyduck/pd-upload-image.vue
+++ b/magic-boot-ui/src/components/Psyduck/pd-upload-image.vue
@@ -210,7 +210,7 @@ export default {
       this.urls.forEach(url => {
         newUrls.push(encodeURI(url))
       })
-      this.$get('file/resort', { urls: this.newUrls.join(',') })
+      this.$get('file/resort', { urls: newUrls.join(',') })
     },
     onExceed() {
       this.$message({
@@ -247,12 +247,14 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-.el-upload {
+<style scoped>
+.vue-draggable >>> .el-upload {
   width: 100%;
   height: 100%;
 }
+</style>
 
+<style lang="scss" scoped>
 // 上传按钮
 .uploadIcon {
   width: 100%;
diff --git a/magic-boot/pom.xml b/magic-boot/pom.xml
index 36a42f5..072637e 100644
--- a/magic-boot/pom.xml
+++ b/magic-boot/pom.xml
@@ -3,10 +3,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
-        <relativePath/>
+        <groupId>org.ssssssss</groupId>
+        <artifactId>magic-boot-parent</artifactId>
+        <version>0.0.1</version>
     </parent>
     <groupId>org.ssssssss</groupId>
     <artifactId>magic-boot</artifactId>
@@ -15,7 +14,7 @@
     <description>magic-boot</description>
     <properties>
         <java.version>1.8</java.version>
-        <magic-api.version>1.5.3</magic-api.version>
+        <magic-api.version>1.6.1</magic-api.version>
         <druid.version>1.2.1</druid.version>
         <hutool-all.version>5.7.13</hutool-all.version>
         <sa-token.version>1.26.0</sa-token.version>
diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/config/WebConfiguration.java b/magic-boot/src/main/java/org/ssssssss/magicboot/config/WebConfiguration.java
new file mode 100644
index 0000000..c542769
--- /dev/null
+++ b/magic-boot/src/main/java/org/ssssssss/magicboot/config/WebConfiguration.java
@@ -0,0 +1,22 @@
+package org.ssssssss.magicboot.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor;
+import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.ssssssss.magicboot.model.Global;
+
+import java.util.concurrent.Executors;
+
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler(Global.USER_FILES_BASE_URL + "**").addResourceLocations("file:" + Global.getDir() + Global.USER_FILES_BASE_URL);
+    }
+
+}
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..338bcaf
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>pom</packaging>
+	<modules>
+		<module>magic-boot</module>
+	</modules>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.4.5</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>org.ssssssss</groupId>
+	<artifactId>magic-boot-parent</artifactId>
+	<version>0.0.1</version>
+	<name>magic-boot-parent</name>
+	<description>magic-boot-parent</description>
+
+</project>