From bf1563dbb4a19380daa610eeb7d49fc4b47282e0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 14 Aug 2020 15:15:16 +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 | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 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 0b06792..9f1d5ad 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,10 +10,10 @@
application:
name: filecenter-server
datasource:
- url: jdbc:mysql://${kidgrow.datasource.ip}:3306/file_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://${kidgrow.datasource.ip}:3306/file_center_${spring.profiles.active}?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,28 +38,41 @@
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
-# bucketName: kidgrow
-# domain: kidgrow.s3-cn-east-1.qiniucs.com
- access-key: LTAI4FennfcwZupz3B6hkK3N
- accessKeySecret: NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
- endpoint: oss-accelerate.aliyuncs.com
- bucketName: kidgrow
- #注意加上/ http://123.kidgrow.cloud
- domain: /
- folder: kidgrow/
+ # 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: http://123.kidgrow.cloud/
+## domain: https://kidgrow.oss-accelerate.aliyuncs.com/
+# folder: kidgrow/
+ access-key: ${kidgrow.oss.access-key}
+ accessKeySecret: ${kidgrow.oss.accessKeySecret}
+ # endpoint: kidgrow.oss-cn-beijing-internal.aliyuncs.com
+ endpoint: ${kidgrow.oss.endpoint}
+ # endpoint: oss-accelerate.aliyuncs.com
+ bucketName: ${kidgrow.oss.bucketName}
+ #注意加上/
+ domain: ${kidgrow.oss.domain}
+ # domain: https://kidgrow.oss-accelerate.aliyuncs.com/
+ folder: kidgrow/
swagger:
base-package: com.kidgrow.filecenter.controller
--
Gitblit v1.8.0