648540858 039fbf7e24 Merge branch 'talk' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java # src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java		2023-03-20 14:32:53 +08:00
..
common	Merge branch 'wvp-28181-2.0'	2023-02-22 18:08:25 +08:00
conf	完善talk模式	2023-03-20 14:20:28 +08:00
gb28181	Merge branch 'talk' into main-dev	2023-03-20 14:32:53 +08:00
media/zlm	Merge branch 'talk' into main-dev	2023-03-20 14:32:53 +08:00
service	Merge branch 'talk' into main-dev	2023-03-20 14:32:53 +08:00
storager	Merge branch 'talk' into main-dev	2023-03-20 14:32:53 +08:00
utils	Merge pull request #744 from gaofuwang/wvp-28181-2.0	2023-02-20 09:57:21 +08:00
vmanager	Merge branch 'talk' into main-dev	2023-03-20 14:32:53 +08:00
web/gb28181	完善支持语音对讲talk	2023-02-19 12:46:53 +08:00
VManageBootstrap.java	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00