From 614eaa8f4fd1b8b6cedd1d737c67da17a0a33c29 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 01 六月 2023 15:58:19 +0800
Subject: [PATCH] Merge pull request #872 from xu-bin-bin/wvp-28181-2.0
---
src/main/resources/all-application.yml | 81 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index e3c2360..def2a3c 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -30,44 +30,27 @@
poolMaxWait: 5
# [蹇呴�塢 jdbc鏁版嵁搴撻厤缃�
datasource:
- type: com.alibaba.druid.pool.DruidDataSource
+ 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
username: root
password: root123
- druid:
+ hikari:
+ connection-timeout: 20000 # 鏄鎴风绛夊緟杩炴帴姹犺繛鎺ョ殑鏈�澶ф绉掓暟
initialSize: 10 # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
- maxActive: 200 # 杩炴帴姹犳渶澶ц繛鎺ユ暟
- minIdle: 5 # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
- maxWait: 60000 # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂达紝鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗锛岀己鐪佸惎鐢ㄥ叕骞抽攣锛屽苟鍙戞晥鐜囦細鏈夋墍涓嬮檷锛屽鏋滈渶瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣銆�
- keepAlive: true # 杩炴帴姹犱腑鐨刴inIdle鏁伴噺浠ュ唴鐨勮繛鎺ワ紝绌洪棽鏃堕棿瓒呰繃minEvictableIdleTimeMillis锛屽垯浼氭墽琛宬eepAlive鎿嶄綔銆�
- validationQuery: select 1 # 妫�娴嬭繛鎺ユ槸鍚︽湁鏁坰ql锛岃姹傛槸鏌ヨ璇彞锛屽父鐢╯elect 'x'銆傚鏋渧alidationQuery涓簄ull锛宼estOnBorrow銆乼estOnReturn銆乼estWhileIdle閮戒笉浼氳捣浣滅敤銆�
- testWhileIdle: true # 寤鸿閰嶇疆涓簍rue锛屼笉褰卞搷鎬ц兘锛屽苟涓斾繚璇佸畨鍏ㄦ�с�傜敵璇疯繛鎺ョ殑鏃跺�欐娴嬶紝濡傛灉绌洪棽鏃堕棿澶т簬timeBetweenEvictionRunsMillis锛屾墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堛��
- testOnBorrow: false # 鐢宠杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
- testOnReturn: false # 褰掕繕杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
- poolPreparedStatements: false # 鏄惁闁嬪暉PSCache锛屼甫涓旀寚瀹氭瘡鍊嬮�ｇ窔涓奝SCache鐨勫ぇ灏�
- timeBetweenEvictionRunsMillis: 60000 # 閰嶇疆闁撻殧澶氫箙鎵嶉�茶涓�娆℃娓紝妾㈡脯闇�瑕侀棞闁夌殑绌洪枓閫ｇ窔锛屽柈浣嶆槸姣
- minEvictableIdleTimeMillis: 300000 # 閰嶇疆涓�鍊嬮�ｇ窔鍦ㄦ睜涓渶灏忕敓瀛樼殑鏅傞枔锛屽柈浣嶆槸姣
- filters: stat,slf4j # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛岀洃鎺х粺璁＄敤鐨刦ilter:sta, 鏃ュ織鐢ㄧ殑filter:log4j
- useGlobalDataSourceStat: true # 鍚堝苟澶氫釜DruidDataSource鐨勭洃鎺ф暟鎹�
- # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
- connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=1000
- #stat-view-servlet.url-pattern: /admin/druid/*
+ maximum-pool-size: 200 # 杩炴帴姹犳渶澶ц繛鎺ユ暟
+ minimum-idle: 5 # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
+ idle-timeout: 300000 # 鍏佽杩炴帴鍦ㄨ繛鎺ユ睜涓┖闂茬殑鏈�闀挎椂闂达紙浠ユ绉掍负鍗曚綅锛�
+ max-lifetime: 1200000 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅)
-# druid绠＄悊鐩戞帶椤甸潰鐨勪竴浜涢厤缃�
-rj-druid-manage:
- allow: # 璁块棶druid鐩戞帶椤甸潰鐨処P鐧藉悕鍗�
- deny: 192.168.1.100 # 璁块棶druid鐩戞帶椤甸潰IP榛戝悕鍗�
- loginUsername: rjAdmin # 璁块棶druid鐩戞帶椤甸潰璐﹀彿
- loginPassword: rj@2022 # 璁块棶druid鐩戞帶椤甸潰瀵嗙爜
+# 淇敼涓烘暟鎹簱瀛楁涓嬪垝绾垮垎闅旂洿鎺ュ搴攋ava椹煎嘲鍛藉悕
+mybatis:
+ configuration:
+ map-underscore-to-camel-case: true
-#mybatis:
-# configuration:
-# # 杩欎釜閰嶇疆浼氬皢鎵ц鐨剆ql鎵撳嵃鍑烘潵锛屽湪寮�鍙戞垨娴嬭瘯鐨勬椂鍊欏彲浠ョ敤
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-# # 杩斿洖绫诲瀷涓篗ap,鏄剧ずnull瀵瑰簲鐨勫瓧娈�
-# call-setters-on-nulls: true
-## [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
+# 淇敼鍒嗛〉鎻掍欢涓� postgresql锛� 鏁版嵁搴撶被鍨嬩负mysql涓嶉渶瑕�
+#pagehelper:
+# helper-dialect: postgresql
# [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
server:
@@ -90,10 +73,13 @@
# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
sip:
- # [蹇呴』淇敼] 鏈満鐨処P, 蹇呴』鏄綉鍗′笂鐨処P锛岀敤浜巗ip涓嬪崗璁爤鐩戝惉ip锛屽鏋滅洃鍚墍鏈夎缃负0.0.0.0
- monitor-ip: 0.0.0.0
- # [蹇呴』淇敼] 鏈満鐨処P
- ip: 192.168.0.100
+ # [蹇呴』淇敼] 鏈満鐨処P锛屽搴斾綘鐨勭綉鍗★紝鐩戝惉浠�涔坕p灏辨槸浣跨敤浠�涔堢綉鍗★紝
+ # 濡傛灉瑕佺洃鍚寮犵綉鍗★紝鍙互浣跨敤閫楀彿鍒嗛殧澶氫釜IP锛� 渚嬪锛� 192.168.1.4,10.0.0.4
+ # 濡傛灉涓嶆槑鐧斤紝灏变娇鐢�0.0.0.0锛屽ぇ閮ㄥ垎鎯呭喌閮芥槸鍙互鐨�
+ # 璇蜂笉瑕佷娇鐢�127.0.0.1锛屼换浣曞寘鎷琹ocalhost鍦ㄥ唴鐨勫煙鍚嶉兘鏄笉鍙互鐨勩��
+ ip: 0.0.0.0
+ # [鍙�塢 娌℃湁浠讳綍涓氬姟闇�姹傦紝浠呬粎鏄湪鍓嶇灞曠ず鐨勬椂鍊欑敤
+ show-ip: 192.168.0.100
# [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
port: 5060
# 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
@@ -113,6 +99,15 @@
# keepalliveToOnline: false
# 鏄惁瀛樺偍alarm淇℃伅
alarm: false
+
+# 鍋氫负JT1078鏈嶅姟鍣ㄧ殑閰嶇疆
+jt1078:
+ #[蹇呴』淇敼] 鏄惁寮�鍚�1078鐨勬湇鍔�
+ enable: true
+ #[蹇呬慨淇敼] 1708璁惧鎺ュ叆鐨勭鍙�
+ port: 21078
+ #[鍙�塢 璁惧閴存潈鐨勫瘑鐮�
+ password: admin123
#zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
media:
@@ -199,6 +194,22 @@
sip-use-source-ip-as-remote-address: false
# 鏄惁寮�鍚痵ip鏃ュ織
sip-log: true
+ # 鏄惁寮�鍚痵ql鏃ュ織
+ sql-log: true
+ # 娑堟伅閫氶亾鍔熻兘-缂哄皯鍥芥爣ID鏄惁缁欐墍鏈変笂绾у彂閫佹秷鎭�
+ send-to-platforms-when-id-lost: true
+ # 淇濇寔閫氶亾鐘舵�侊紝涓嶆帴鍙梟otify閫氶亾鐘舵�佸彉鍖栵紝 鍏煎娴峰悍骞冲彴鍙戦�侀敊璇秷鎭�
+ refuse-channel-status-channel-form-notify: false
+ # 璁剧疆notify缂撳瓨闃熷垪鏈�澶ч暱搴︼紝瓒呰繃姝ら暱搴︾殑鏁版嵁灏嗚繑鍥�486 BUSY_HERE锛屾秷鎭涪寮�, 榛樿10000
+ max-notify-count-queue: 10000
+ # 璁惧/閫氶亾鐘舵�佸彉鍖栨椂鍙戦�佹秷鎭�
+ device-status-notify: false
+ # 涓婄骇骞冲彴鐐规挱鏃朵笉浣跨敤涓婄骇骞冲彴鎸囧畾鐨剆src锛屼娇鐢ㄨ嚜瀹氫箟鐨剆src锛屽弬鑰冨浗鏍囨枃妗�-鐐规挱澶栧煙璁惧濯掍綋娴丼SRC澶勭悊鏂瑰紡
+ use-custom-ssrc-for-parent-invite: true
+ # 璺ㄥ煙閰嶇疆锛岄厤缃綘璁块棶鍓嶇椤甸潰鐨勫湴鍧�鍗冲彲锛� 鍙互閰嶇疆澶氫釜
+ allowed-origins:
+ - http://localhost:8008
+ - http://192.168.1.3:8008
# 鍏抽棴鍦ㄧ嚎鏂囨。锛堢敓浜х幆澧冨缓璁叧闂級
springdoc:
--
Gitblit v1.8.0