From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-user/src/main/resources/application-dev.yml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-user/src/main/resources/application-dev.yml b/blade-service/blade-user/src/main/resources/application-dev.yml
index 2d9323b..9c04c1b 100644
--- a/blade-service/blade-user/src/main/resources/application-dev.yml
+++ b/blade-service/blade-user/src/main/resources/application-dev.yml
@@ -8,3 +8,11 @@
     url: ${blade.datasource.dev.url}
     username: ${blade.datasource.dev.username}
     password: ${blade.datasource.dev.password}
+  oss:
+    enabled: true
+    name: minio
+    tenant-mode: true
+    endpoint: http://36.134.81.48:9000
+    access-key: adminminio
+    secret-key: adminminio
+    bucket-name: jfpt

--
Gitblit v1.9.3