From 0852fce564e3dfb56389647f6115424282861260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Wed, 24 Aug 2022 11:07:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fast-server/pom.xml                                | 99 +++++++++++-----------
 .../src/test/java/net/maku/FileUploadTest.java     | 11 ++-
 2 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/fast-server/pom.xml b/fast-server/pom.xml
index fd946b5..878bf56 100644
--- a/fast-server/pom.xml
+++ b/fast-server/pom.xml
@@ -1,52 +1,53 @@
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<groupId>net.maku</groupId>
-		<artifactId>fast-boot</artifactId>
-		<version>${revision}</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>fast-server</artifactId>
-	<packaging>jar</packaging>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>net.maku</groupId>
+        <artifactId>fast-boot</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>fast-server</artifactId>
+    <packaging>jar</packaging>
 
-	<dependencies>
-		<dependency>
-			<groupId>net.maku</groupId>
-			<artifactId>fast-boot-new</artifactId>
-			<version>${revision}</version>
-		</dependency>
-		<dependency>
-			<groupId>net.maku</groupId>
-			<artifactId>fast-boot-quartz</artifactId>
-			<version>${revision}</version>
-		</dependency>
-		<dependency>
-			<groupId>net.maku</groupId>
-			<artifactId>fast-boot-message</artifactId>
-			<version>${revision}</version>
-		</dependency>
-		<dependency>
-			<groupId>net.maku</groupId>
-			<artifactId>fast-boot-system</artifactId>
-			<version>${revision}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>knife4j-springdoc-ui</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>net.maku</groupId>
+            <artifactId>fast-boot-new</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.maku</groupId>
+            <artifactId>fast-boot-quartz</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.maku</groupId>
+            <artifactId>fast-boot-message</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.maku</groupId>
+            <artifactId>fast-boot-system</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-springdoc-ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<finalName>${project.artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/fast-server/src/test/java/net/maku/FileUploadTest.java b/fast-server/src/test/java/net/maku/FileUploadTest.java
index 7e2f4d8..dd87e3e 100644
--- a/fast-server/src/test/java/net/maku/FileUploadTest.java
+++ b/fast-server/src/test/java/net/maku/FileUploadTest.java
@@ -1,7 +1,7 @@
 package net.maku;
 
 import cn.hutool.core.io.IoUtil;
-import net.maku.api.module.storage.StorageService;
+import net.maku.storage.service.StorageService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -15,9 +15,12 @@ public class FileUploadTest {
     private StorageService storageService;
 
     @Test
-    public void uploadTest() throws Exception{
-        byte[] data = IoUtil.readBytes(Files.newInputStream(new File("D://upload//1.png").toPath()));
-        String url = storageService.uploadSuffix(data, "png");
+    public void uploadTest() throws Exception {
+        File file = new File("D://upload//1.png");
+        byte[] data = IoUtil.readBytes(Files.newInputStream(file.toPath()));
+
+        String path = storageService.getPath(file.getName());
+        String url = storageService.upload(data, path);
         System.out.println(url);
     }