From 9a96597e666fa32caefcfff5246b4cb722e9b1bc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 16 一月 2024 14:10:27 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/resources/all-application.yml | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 8196b7c..3d0fddd 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -34,6 +34,19 @@
poolMaxWait: 5
# [蹇呴�塢 jdbc鏁版嵁搴撻厤缃�
datasource:
+ # kingbase閰嶇疆
+ # type: com.zaxxer.hikari.HikariDataSource
+ # driver-class-name: com.kingbase8.Driver
+ # url: jdbc:kingbase8://192.168.1.55:54321/wvp?useUnicode=true&characterEncoding=utf8
+ # username: system
+ # password: system
+ # postgresql閰嶇疆
+ # type: com.zaxxer.hikari.HikariDataSource
+ # driver-class-name: org.postgresql.Driver
+ # url: jdbc:postgresql://192.168.1.242:3306/242wvp
+ # username: root
+ # password: SYceshizu1234
+ # mysql閰嶇疆
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
@@ -41,9 +54,9 @@
password: root123
hikari:
connection-timeout: 20000 # 鏄鎴风绛夊緟杩炴帴姹犺繛鎺ョ殑鏈�澶ф绉掓暟
- initialSize: 10 # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
+ initialSize: 50 # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
maximum-pool-size: 200 # 杩炴帴姹犳渶澶ц繛鎺ユ暟
- minimum-idle: 5 # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
+ minimum-idle: 10 # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
idle-timeout: 300000 # 鍏佽杩炴帴鍦ㄨ繛鎺ユ睜涓┖闂茬殑鏈�闀挎椂闂达紙浠ユ绉掍负鍗曚綅锛�
max-lifetime: 1200000 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅)
@@ -139,6 +152,10 @@
auto-config: true
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
+ # 褰曞儚璺緞
+ record-path: ./www/record
+ # 褰曞儚淇濆瓨鏃堕暱
+ record-day: 7
# 鍚敤澶氱鍙ｆā寮�, 澶氱鍙ｆā寮忎娇鐢ㄧ鍙ｅ尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙ｄ娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙ｆ祴璇�
rtp:
# [鍙�塢 鏄惁鍚敤澶氱鍙ｆā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
@@ -182,7 +199,7 @@
# 浣跨敤鎺ㄦ祦鐘舵�佷綔涓烘帹娴侀�氶亾鐘舵��
use-pushing-as-status: true
# 浣跨敤鏉ユ簮璇锋眰ip浣滀负streamIp,褰撲笖浠呭綋浣犲彧鏈墇lm鑺傜偣瀹冧笌wvp鍦ㄤ竴璧风殑鎯呭喌涓嬪紑鍚�
- use-source-ip-as-stream-ip: true
+ use-source-ip-as-stream-ip: false
# 鍥芥爣鐐规挱 鎸夐渶鎷夋祦, true锛氭湁浜鸿鐪嬫媺娴侊紝鏃犱汉瑙傜湅閲婃斁锛� false锛氭媺璧峰悗涓嶈嚜鍔ㄩ噴鏀�
stream-on-demand: true
# 鎺ㄦ祦閴存潈锛� 榛樿寮�鍚�
--
Gitblit v1.8.0