From bb0f38d32a4c44b9518d9d2347565ab85ede8703 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 20 Jan 2021 22:55:12 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=20=E6=96=B0=E5=A2=9E=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0demo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/controller/UploadController.java     | 20 +++++++++++++++++--
 .../src/main/resources/application.yml        |  8 ++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-demo/src/main/java/com/example/demo/controller/UploadController.java b/blade-service/blade-demo/src/main/java/com/example/demo/controller/UploadController.java
index e5b047443..95cd71108 100644
--- a/blade-service/blade-demo/src/main/java/com/example/demo/controller/UploadController.java
+++ b/blade-service/blade-demo/src/main/java/com/example/demo/controller/UploadController.java
@@ -3,6 +3,8 @@ package com.example.demo.controller;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.boot.file.LocalFile;
 import org.springblade.core.oss.minio.MinioTemplate;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.tool.api.R;
@@ -21,7 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
 @AllArgsConstructor
 @RequestMapping("/notice/upload")
 @Api(value = "对象存储接口", tags = "oss上传测试")
-public class UploadController {
+public class UploadController extends BladeController {
 
 	private final MinioTemplate minioTemplate;
 
@@ -29,7 +31,7 @@ public class UploadController {
 	 * minio上传demo
 	 *
 	 * @param file 上传文件
-	 * @return String
+	 * @return BladeFile
 	 */
 	@SneakyThrows
 	@PostMapping("put-object")
@@ -38,4 +40,18 @@ public class UploadController {
 		return R.data(bladeFile);
 	}
 
+	/**
+	 * 上传本地文件
+	 *
+	 * @param file 上传文件
+	 * @return LocalFile
+	 */
+	@SneakyThrows
+	@PostMapping("put-local-object")
+	public R<LocalFile> putLocalObject(@RequestParam MultipartFile file) {
+		LocalFile localFile = getFile(file);
+		localFile.transfer();
+		return R.data(localFile);
+	}
+
 }
diff --git a/blade-service/blade-demo/src/main/resources/application.yml b/blade-service/blade-demo/src/main/resources/application.yml
index 67bcebf8b..4b9291655 100644
--- a/blade-service/blade-demo/src/main/resources/application.yml
+++ b/blade-service/blade-demo/src/main/resources/application.yml
@@ -19,3 +19,11 @@ oss:
   access-key: D99KGE6ZTQXSATTJWU24
   secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ
   bucket-name: bladex
+
+#blade配置
+blade:
+  #本地文件上传
+  file:
+    remote-mode: true
+    upload-domain: http://localhost:8999
+    remote-path: /usr/share/nginx/html