From 917e2b577dfddb9d7ea43da51780b12f22819ec0 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 26 二月 2022 15:38:59 +0800
Subject: [PATCH] Merge pull request #352 from walkTtalk/wvp-28181-2.0

---
 src/main/resources/all-application.yml |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 6328bc3..5e77236 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -5,6 +5,11 @@
 
 
 spring:
+    # [鍙�塢涓婁紶鏂囦欢澶у皬闄愬埗
+    servlet:
+        multipart:
+            max-file-size: 10MB
+            max-request-size: 100MB
     # REDIS鏁版嵁搴撻厤缃�
     redis:
         # [蹇呴』淇敼] Redis鏈嶅姟鍣↖P, REDIS瀹夎鍦ㄦ湰鏈虹殑,浣跨敤127.0.0.1
@@ -27,7 +32,7 @@
     datasource:
         # 浣跨敤mysql 鎵撳紑23-28琛屾敞閲婏紝 鍒犻櫎29-36琛�
         # name: wvp
-        # url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
+        # url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowMultiQueries=true
         # username:
         # password:
         # type: com.alibaba.druid.pool.DruidDataSource
@@ -38,6 +43,9 @@
         password:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name:  org.sqlite.JDBC
+        journal_mode: WAL
+        synchronous: NORMAL
+        transaction_mode: IMMEDIATE
         max-active: 1
         min-idle: 1
 
@@ -80,10 +88,12 @@
     ptz-speed: 50
     # TODO [鍙�塢 鏀跺埌蹇冭烦鍚庤嚜鍔ㄤ笂绾匡紝 閲嶅惎鏈嶅姟鍚庝細灏嗘墍鏈夎澶囩疆涓虹绾匡紝榛樿false锛岀瓑寰呮敞鍐屽悗涓婄嚎銆傝缃负true鍒欐敹鍒板績璺宠缃负涓婄嚎銆�
     # keepalliveToOnline: false
+    # 鏄惁瀛樺偍alarm淇℃伅
+    alarm: false
 
 #zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
 media:
-    # [鍙�塢 zlm鏈嶅姟鍣ㄥ敮涓�id锛岀敤浜庤Е鍙慼ook鏃跺尯鍒槸鍝彴鏈嶅姟鍣�,general.mediaServerId
+    # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄥ敮涓�id锛岀敤浜庤Е鍙慼ook鏃跺尯鍒槸鍝彴鏈嶅姟鍣�,general.mediaServerId
     id:
     # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP
     ip: 192.168.0.100
@@ -134,7 +144,7 @@
     level:
         com.genersoft.iot: debug
         com.genersoft.iot.vmp.storager.dao: info
-        com.genersoft.iot.vmp.gb28181: info
+        com.genersoft.iot.vmp.gb28181: debug
 # [鏍规嵁涓氬姟闇�姹傞厤缃甝
 user-settings:
     # [鍙�塢 鏈嶅姟ID锛屼笉鍐欏垯涓�000000
@@ -151,13 +161,19 @@
     wait-track: false
     # 鏄惁寮�鍚帴鍙i壌鏉�
     interface-authentication: true
+    # 鑷姩閰嶇疆redis 鍙互杩囨湡浜嬩欢
+    redis-config: true
     # 鎺ュ彛閴存潈渚嬪鐨勬帴鍙�, 鍗充笉杩涜鎺ュ彛閴存潈鐨勬帴鍙�,灏介噺璇︾粏涔﹀啓锛屽敖閲忎笉鐢�/**锛岃嚦灏戜袱绾х洰褰�
     interface-authentication-excludes:
         - /api/v1/**
     # 鎺ㄦ祦鐩存挱鏄惁褰曞埗
     record-push-live: true
+    # 鍥芥爣鏄惁褰曞埗
+    record-sip: true
     # 鏄惁灏嗘棩蹇楀瓨鍌ㄨ繘鏁版嵁搴�
     logInDatebase: true
+    # 绗笁鏂瑰尮閰嶏紝鐢ㄤ簬浠巗tream閽熻幏鍙栨湁鏁堜俊鎭�
+    thirdPartyGBIdReg: [\s\S]*
 
 # 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
 swagger-ui:
@@ -167,4 +183,4 @@
 version:
     version: "@project.version@"
     description: "@project.description@"
-    artifact-id: "@project.artifactId@"
\ No newline at end of file
+    artifact-id: "@project.artifactId@"

--
Gitblit v1.8.0