From 0a8b731d9cf46c78c0c4c66fa9954eeb262e4017 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Mon, 10 Aug 2020 09:20:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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 4be85f5..9ce6fd3 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
@@ -13,7 +13,7 @@
url: jdbc:mysql://${kidgrow.datasource.ip}:3306/file_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
-# driver-class-name: com.mysql.jdbc.Driver
+ # driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
aop-patterns: com.kidgrow.filecenter.controller.*
@@ -38,26 +38,40 @@
kidgrow:
-# fdfs:
-# web-url: 192.168.28.130
-# trackerList: ${kidgrow.fdfs.web-url}:22122
+ # fdfs:
+ # web-url: 192.168.28.130
+ # trackerList: ${kidgrow.fdfs.web-url}:22122
file-server:
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: LTAI4GG27Q85eTB5YvVKZAyg
+# accessKeySecret: thEEFtCxYTPQGrHl0KmUUBXr7gWKdh
+## endpoint: kidgrow.oss-cn-beijing-internal.aliyuncs.com
+# endpoint: 123.kidgrow.cloud
+## endpoint: oss-accelerate.aliyuncs.com
# bucketName: kidgrow
-# domain: kidgrow.s3-cn-east-1.qiniucs.com
+# #注意加上/
+# domain: http://123.kidgrow.cloud/
+## domain: https://kidgrow.oss-accelerate.aliyuncs.com/
+# folder: kidgrow/
access-key: LTAI4FennfcwZupz3B6hkK3N
accessKeySecret: NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
- endpoint: oss-accelerate.aliyuncs.com
+ # endpoint: kidgrow.oss-cn-beijing-internal.aliyuncs.com
+ endpoint: 123.kidgrow.cloud
+ # endpoint: oss-accelerate.aliyuncs.com
bucketName: kidgrow
- #注意加上/
- domain: https://kidgrow.oss-accelerate.aliyuncs.com/
+ #注意加上/
+ domain: http://123.kidgrow.cloud/
+ # domain: https://kidgrow.oss-accelerate.aliyuncs.com/
folder: kidgrow/
swagger:
--
Gitblit v1.8.0