From f4d5b46cfffc27d626afc3c43e8e20a11e686a00 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 29 Oct 2020 16:37:56 +0800
Subject: [PATCH] 修正查询科室名称是否存在的时候，没有排除已经删除/禁用的科室。
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 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..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,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
@@ -34,6 +34,7 @@
global-config:
db-config:
id-type: input
+
@@ -63,14 +64,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/
@@ -87,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