From 8190823a593d3123384d3a75774ad19ecea07204 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 15 Jun 2020 11:20:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml
index 056cc3c..4be85f5 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml
@@ -42,16 +42,24 @@
# web-url: 192.168.28.130
# trackerList: ${kidgrow.fdfs.web-url}:22122
file-server:
- type: qiniu
+ type: aliyun
fdfs:
web-url: ${kidgrow.fdfs.web-url}
#oss配置
oss:
- access-key: j977Ii3DODvQXzE241Z6ouW9so4Q6_6PeOPwN5UZ
- accessKeySecret: W8ArRp3mr-w3n4R-lHEvSFzGdgdrYfC9wHkZlqec
- endpoint: http://q68nl7reu.bkt.clouddn.com
+# access-key: j977Ii3DODvQXzE241Z6ouW9so4Q6_6PeOPwN5UZ
+# accessKeySecret: W8ArRp3mr-w3n4R-lHEvSFzGdgdrYfC9wHkZlqec
+# endpoint: http://q68nl7reu.bkt.clouddn.com
+# bucketName: kidgrow
+# domain: kidgrow.s3-cn-east-1.qiniucs.com
+ access-key: LTAI4FennfcwZupz3B6hkK3N
+ accessKeySecret: NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
+ endpoint: oss-accelerate.aliyuncs.com
bucketName: kidgrow
- domain: kidgrow.s3-cn-east-1.qiniucs.com
+ #注意加上/
+ domain: https://kidgrow.oss-accelerate.aliyuncs.com/
+ folder: kidgrow/
+
swagger:
base-package: com.kidgrow.filecenter.controller
description: 文件上传服务接口文档
--
Gitblit v1.8.0