From c6f15400d502852b43acefcd33dbcfbb4610b5fc Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 18:10:20 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/application-dev.yml | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml
index 85f7ad1..f1691ac 100644
--- a/ycl-platform/src/main/resources/application-dev.yml
+++ b/ycl-platform/src/main/resources/application-dev.yml
@@ -11,7 +11,7 @@
groupName: sczhzf
soTimeout: 1500
connectTimeout: 600
- trackerList: #TrackerList鍙傛暟,鏀寔澶氫釜
+ trackerList: #TrackerList鍙傛暟,鏀寔澶氫釜
- 140.143.152.226:22122
cfg:
@@ -20,10 +20,6 @@
snow-flake:
datacenterId: 1
machineId: 1
-mail:
- host: smtp.163.com
- username: maokecheng2015@163.com
- authorizationCode: JOMMIXUTGAJYOSNA
spring:
redis:
@@ -39,7 +35,7 @@
timeout: 0
datasource:
- url: jdbc:mysql://42.193.1.25:3306/sccg?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+ url: jdbc:mysql://42.193.1.25:3306/sccg0318?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
username: root
password: 321$YcYl@1970!
type: com.alibaba.druid.pool.DruidDataSource
@@ -57,3 +53,29 @@
testOnReturn: false
poolPreparedStatements: true
maxOpenPreparedStatements: 20
+
+
+e-mail:
+ sendHost: smtp.qq.com
+ username: 1723292425@qq.com
+ password: qizcitupatzoeeij
+
+SMS:
+ ecName: ycl
+ apId: 1
+ sign: sign
+ url: http://localhost:8082/sccg/text/sms_res
+
+videoPoint:
+ url: http://183.245.159.161:8281
+ port: 8281
+ userName: suichang
+ passWord: a12345677
+ ip: 10.10.10.10
+
+aliyun:
+ oss:
+ endpoint: https://oss-cn-chengdu.aliyuncs.com
+ keyId: LTAI5tHsdviW3iYc4MPLcvrK
+ keySecret: n1GNJeH5AaXmnHlxmr0OYisyrwHTYV
+ bucketName: new-upload
--
Gitblit v1.8.0