改结构

.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

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',
+    filePrefix: WebUtils.getUeditorPrefix()
-    upload: {
-        // oss,disk（磁盘）
-        type: 'disk',
-        dir: 'D:/psyduck/',
-        oss: {
-            endpoint: '',
-            accessKeyId: '',
-            accessKeySecret: '',
-            bucketName: '',
-            // https,http
-            transportProtocol: ''
-        }
-    }
 }

magic-boot-ui/.gitignore

@@ -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

magic-boot-ui/LICENSE

@@ -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.

magic-boot-ui/README.md

@@ -1,5 +0,0 @@
-npm install  
-如果 npm install 报错
-可以尝试 npm降级
-npm install npm@6.14.8 -g
-npm run serve

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>
+<style scoped>
-.el-upload {
+.vue-draggable >>> .el-upload {
   width: 100%;
   height: 100%;
 }
+</style>
 
+<style lang="scss" scoped>
 // 上传按钮
 .uploadIcon {
   width: 100%;

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>
+        <groupId>org.ssssssss</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
+        <artifactId>magic-boot-parent</artifactId>
-        <version>2.4.5</version>
+        <version>0.0.1</version>
-        <relativePath/>
     </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>

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);
+    }
+
+}

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>