From 5a90071cd2797bcacc286fcad31a8b0b0875d6aa Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Feb 2021 10:27:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 blade-ops/blade-resource/src/main/resources/application.yml |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/blade-ops/blade-resource/src/main/resources/application.yml b/blade-ops/blade-resource/src/main/resources/application.yml
index d67f16e..8e175c9 100644
--- a/blade-ops/blade-resource/src/main/resources/application.yml
+++ b/blade-ops/blade-resource/src/main/resources/application.yml
@@ -1,13 +1,11 @@
 #服务器端口
 server:
   port: 8010
-
-#oss配置
-oss:
-  enabled: true
-  name: minio
-  tenant-mode: false
-  endpoint: http://s16s652780.51mypc.cn:21403
-  bucket-name: jfpt
-  access-key: minioadmin
-  secret-key: minioadmin
+  oss:
+    enabled: true
+    name: minio
+    tenant-mode: true
+    endpoint: https://s16s652780.51mypc.cn
+    access-key: minioadmin
+    secret-key: minioadmin
+    bucket-name: jfpt

--
Gitblit v1.9.3