From 519a87f05bd981ae4fcb56fb4cbe56cd119e24b0 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 20 Apr 2020 17:32:06 +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 | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 e7c6109..52c5050 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
@@ -10,7 +10,7 @@
application:
name: filecenter-server
datasource:
- url: jdbc:mysql://${kidgrow.datasource.ip}:3306/file_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+ 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
@@ -42,16 +42,23 @@
# 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