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 | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml
index c903937..f1691ac 100644
--- a/ycl-platform/src/main/resources/application-dev.yml
+++ b/ycl-platform/src/main/resources/application-dev.yml
@@ -34,30 +34,10 @@
min-idle: 0
timeout: 0
-# datasource:
-# url: jdbc:mysql://42.193.1.25:3306/sccg?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.cj.jdbc.Driver
-# filters: stat
-# maxActive: 20
-# initialSize: 1
-# maxWait: 60000
-# minIdle: 1
-# timeBetweenEvictionRunsMillis: 60000
-# minEvictableIdleTimeMillis: 300000
-# validationQuery: select 'x'
-# testWhileIdle: true
-# testOnBorrow: false
-# testOnReturn: false
-# poolPreparedStatements: true
-# maxOpenPreparedStatements: 20
-
datasource:
- url: jdbc:mysql://124.222.18.104:3319/sccg?characterEncoding=utf-8
+ url: jdbc:mysql://42.193.1.25:3306/sccg0318?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
username: root
- password: root
+ password: 321$YcYl@1970!
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -73,6 +53,7 @@
testOnReturn: false
poolPreparedStatements: true
maxOpenPreparedStatements: 20
+
e-mail:
sendHost: smtp.qq.com
@@ -90,4 +71,11 @@
port: 8281
userName: suichang
passWord: a12345677
- ip: 10.10.10.10
\ No newline at end of file
+ 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