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 | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml
index cef9a78..f1691ac 100644
--- a/ycl-platform/src/main/resources/application-dev.yml
+++ b/ycl-platform/src/main/resources/application-dev.yml
@@ -35,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
@@ -54,6 +54,7 @@
poolPreparedStatements: true
maxOpenPreparedStatements: 20
+
e-mail:
sendHost: smtp.qq.com
username: 1723292425@qq.com
@@ -65,9 +66,16 @@
sign: sign
url: http://localhost:8082/sccg/text/sms_res
-point:
- severIpAddress: http://localhost:8082/sccg/text/point
- username: text
- password: 123456
- sendIp: 192.168.3.137
- os: WinPc
\ No newline at end of file
+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