Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java # src/main/resources/all-application.yml # src/main/resources/application-dev.yml
This commit is contained in:
648540858
@@ -34,18 +34,42 @@ spring:
|
||||
poolMaxWait: 5
|
||||
# [必选] jdbc数据库配置
|
||||
datasource:
|
||||
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
|
||||
username: root
|
||||
password: root123
|
||||
hikari:
|
||||
connection-timeout: 20000 # 是客户端等待连接池连接的最大毫秒数
|
||||
initialSize: 10 # 连接池初始化连接数
|
||||
maximum-pool-size: 200 # 连接池最大连接数
|
||||
minimum-idle: 5 # 连接池最小空闲连接数
|
||||
idle-timeout: 300000 # 允许连接在连接池中空闲的最长时间（以毫秒为单位）
|
||||
max-lifetime: 1200000 # 是池中连接关闭后的最长生命周期（以毫秒为单位)
|
||||
# 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配置
|
||||
dynamic:
|
||||
primary: master
|
||||
datasource:
|
||||
master:
|
||||
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
|
||||
hikari:
|
||||
connection-timeout: 20000 # 是客户端等待连接池连接的最大毫秒数
|
||||
initialSize: 50 # 连接池初始化连接数
|
||||
maximum-pool-size: 200 # 连接池最大连接数
|
||||
minimum-idle: 10 # 连接池最小空闲连接数
|
||||
idle-timeout: 300000 # 允许连接在连接池中空闲的最长时间（以毫秒为单位）
|
||||
max-lifetime: 1200000 # 是池中连接关闭后的最长生命周期（以毫秒为单位)
|
||||
share:
|
||||
type: com.zaxxer.hikari.HikariDataSource
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://127.0.0.1:3306/wvp269_1?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
|
||||
username: root
|
||||
password: 12345678
|
||||
|
||||
|
||||
|
||||
# 修改分页插件为 postgresql， 数据库类型为mysql不需要
|
||||
@@ -139,6 +163,10 @@ media:
|
||||
auto-config: true
|
||||
# [可选] zlm服务器的hook.admin_params=secret
|
||||
secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
|
||||
# 录像路径
|
||||
record-path: ./www/record
|
||||
# 录像保存时长
|
||||
record-day: 7
|
||||
# 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
|
||||
rtp:
|
||||
# [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
|
||||
@@ -182,7 +210,7 @@ user-settings:
|
||||
# 使用推流状态作为推流通道状态
|
||||
use-pushing-as-status: true
|
||||
# 使用来源请求ip作为streamIp,当且仅当你只有zlm节点它与wvp在一起的情况下开启
|
||||
use-source-ip-as-stream-ip: true
|
||||
use-source-ip-as-stream-ip: false
|
||||
# 国标点播 按需拉流, true：有人观看拉流，无人观看释放， false：拉起后不自动释放
|
||||
stream-on-demand: true
|
||||
# 推流鉴权， 默认开启
|
||||
@@ -213,7 +241,7 @@ user-settings:
|
||||
register-again-after-time: 60
|
||||
# 国标续订方式，true为续订，每次注册在同一个会话里，false为重新注册，每次使用新的会话
|
||||
register-keep-int-dialog: false
|
||||
# 跨域配置，配置你访问前端页面的地址即可， 可以配置多个
|
||||
# 跨域配置，不配置此项则允许所有跨域请求，配置后则只允许配置的页面的地址请求， 可以配置多个
|
||||
allowed-origins:
|
||||
- http://localhost:8008
|
||||
- http://192.168.1.3:8008
|
||||
|
||||
Reference in New Issue
Block a user