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 | 12 ++++++------
1 files changed, 6 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 9ce6fd3..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,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=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
@@ -63,14 +63,14 @@
# domain: http://123.kidgrow.cloud/
## domain: https://kidgrow.oss-accelerate.aliyuncs.com/
# folder: kidgrow/
- access-key: LTAI4FennfcwZupz3B6hkK3N
- accessKeySecret: NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
+ access-key: ${kidgrow.oss.access-key}
+ accessKeySecret: ${kidgrow.oss.accessKeySecret}
# endpoint: kidgrow.oss-cn-beijing-internal.aliyuncs.com
- endpoint: 123.kidgrow.cloud
+ endpoint: ${kidgrow.oss.endpoint}
# endpoint: oss-accelerate.aliyuncs.com
- bucketName: kidgrow
+ bucketName: ${kidgrow.oss.bucketName}
#注意加上/
- domain: http://123.kidgrow.cloud/
+ domain: ${kidgrow.oss.domain}
# domain: https://kidgrow.oss-accelerate.aliyuncs.com/
folder: kidgrow/
--
Gitblit v1.8.0