From 619a66f9998fa646a69903a4c22e2bbf92e2221b Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期三, 28 七月 2021 09:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/resources/all-application.yml |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 2552e01..c4bd7ca 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -17,6 +17,12 @@
         password:
         # [鍙�塢 瓒呮椂鏃堕棿
         timeout: 10000
+        # [鍙�塢 涓�涓猵ool鏈�澶氬彲鍒嗛厤澶氬皯涓猨edis瀹炰緥
+        poolMaxTotal: 1000
+        # [鍙�塢 涓�涓猵ool鏈�澶氭湁澶氬皯涓姸鎬佷负idle(绌洪棽)鐨刯edis瀹炰緥
+        poolMaxIdle: 500
+        # [鍙�塢 鏈�澶х殑绛夊緟鏃堕棿(绉�)
+        poolMaxWait: 5
     # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
     datasource:
         # 浣跨敤mysql 鎵撳紑23-28琛屾敞閲婏紝 鍒犻櫎29-36琛�
@@ -124,6 +130,7 @@
     level:
         com.genersoft.iot: debug
         com.genersoft.iot.vmp.storager.dao: info
+        com.genersoft.iot.vmp.gb28181: info
 # [鏍规嵁涓氬姟闇�姹傞厤缃甝
 user-settings:
     # [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱, 闇�瑕乺tp.enable=true

--
Gitblit v1.8.0