Commit Graph

14 Commits (38a85d432ae9bb861dbcbf090d68fb3dca0d85f6)

Author SHA1 Message Date
648540858 12fa3b4c8d Merge branch 'wvp-28181-2.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
2022-11-23 09:57:17 +08:00
648540858 1469971102 支持配置设备上线时自动更新查询通道,修复通道刷新进度展示 2022-11-22 15:02:25 +08:00
648540858 ecf84bb0f1 合并主线 2022-11-18 21:52:02 +08:00
648540858 d340a37a00 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
2022-11-17 11:31:30 +08:00
648540858 694076dc8c 优化国标级联发流并发能力 2022-11-16 09:39:27 +08:00
648540858 96bb3814f6 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	web_src/src/components/dialog/devicePlayer.vue
#	web_src/src/components/live.vue
2022-11-08 20:43:25 +08:00
648540858 cc4c4ac144 支持配置是否开去推流鉴权 2022-11-08 20:29:27 +08:00
648540858 aed45e0f0d 优化多网卡 2022-10-28 16:40:12 +08:00
648540858 688e222dcc 优化按需拉流配置,拉流代理支持按需拉流 2022-10-18 17:35:32 +08:00
648540858 5e73874880 添加队列处理redis消息和sip消息,支持使用推流状态作为通道在线状态 2022-09-22 11:22:08 +08:00
648540858 2de4c322f6 去除对redis key过期事件的使用;重构国标级联的注册保活 2022-08-31 11:29:13 +08:00
庄梦蝶殇 fff3d64f85 fix 优化pom依赖,去除几个重复客户端。并改了几个 equals判断不精准的bug 2022-07-27 18:31:33 +08:00
648540858 c286ecb455 使用阿里代码规范。规范代码写法 2022-05-05 17:07:16 +08:00
648540858 7e755f405d 支持国标移动位置订阅,收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug 2022-04-01 16:45:29 +08:00