From 8005c2f4618bc9c4fef6cf3c230a0a7633276b43 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sat, 15 Aug 2020 11:01:51 +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 | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 15 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 52c5050..ced8b2c 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.*
@@ -37,28 +37,44 @@
+
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
- access-key: LTAI4FennfcwZupz3B6hkK3N
- accessKeySecret: NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
- 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/
+ 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
description: 文件上传服务接口文档
@@ -72,3 +88,38 @@
# trackerList: ${kidgrow.fdfs.trackerList}
+#创蓝
+chuanglan:
+ sms:
+ sendUrl: http://smssh1.253.com/msg/send/json
+ account: N2561124
+ password: Mguj6qlRWX7b5e
+ num: 5
+ timeLimit: 720000
+#阿里云相关
+aliyun:
+ sms:
+ accessKeyId: LTAIX1whVSBUUKNW
+ accessKeySecret: j7UywJDoUkPRvGafKrik1pyYtEC2ys
+ signName: 微课堂
+ templates:
+ ### 模板key
+ key1:
+ ## 模板code 需要在阿里云控制台设置
+ templateCode: SMS_151231928 # 与阿里云设置的保持一致，模板内容需在后面加上，方便使用：****
+ key2:
+ templateCode: SMS_105665033 # 与阿里云设置的保持一致，模板内容需在后面加上，方便使用：****
+ commonRequest:
+ domain: dysmsapi.aliyuncs.com
+ ## 版本号
+ version: 2017-05-25
+ ##
+ action: SendSms
+
+## 短信验证码过期时间，时间单位/秒
+sms:
+ verificationCode:
+ ## 短信验证码过期时间，时间单位/秒
+ timeOut: 120
+ ## 缓存手机号key值前缀
+ prefix: "sms:aliyun:code:"
\ No newline at end of file
--
Gitblit v1.8.0