From 71f3101370c3db0ec00178d51a723816c9bcddbd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/resources/application-dev.yml |   48 +++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml
index 582766f..f1691ac 100644
--- a/ycl-platform/src/main/resources/application-dev.yml
+++ b/ycl-platform/src/main/resources/application-dev.yml
@@ -1,10 +1,26 @@
 server:
-  port: 8081
+  port: 8082
   tomcat:
     uri-encoding: UTF-8
   servlet:
     context-path: /sccg
     compression: true
+
+fdfs:
+  fileUrl: http://140.143.152.226:8410/
+  groupName: sczhzf
+  soTimeout: 1500
+  connectTimeout: 600
+  trackerList: #TrackerList鍙傛暟,鏀寔澶氫釜
+    - 140.143.152.226:22122
+
+cfg:
+  res: d://resources
+  media-res: 140.143.152.226/media/
+  snow-flake:
+    datacenterId: 1
+    machineId: 1
+
 spring:
   redis:
     database: 0
@@ -19,11 +35,11 @@
         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
-    driver-class-name: com.mysql.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
     filters: stat
     maxActive: 20
     initialSize: 1
@@ -37,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