648540858
|
88350873ee
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# 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/info/InfoRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
|
2023-09-11 11:21:50 +08:00 |
|
648540858
|
91e49745e4
|
修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化
|
2023-08-16 01:55:50 +08:00 |
|
648540858
|
f223aad705
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# 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/SIPRequestProcessorParent.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.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/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
# src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
# web_src/src/components/dialog/devicePlayer.vue
|
2022-11-18 18:39:44 +08:00 |
|
WuPeng
|
ab909feedf
|
升级Fastjson到Fastjson2
|
2022-11-05 20:49:56 +08:00 |
|
648540858
|
cfed860667
|
合并主线
|
2022-07-12 16:54:58 +08:00 |
|
648540858
|
66e6756909
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-07-12 16:28:51 +08:00 |
|
648540858
|
afbec28906
|
增加推流鉴权。保护服务安全
|
2022-07-11 16:21:01 +08:00 |
|
648540858
|
07956b48df
|
添加界面优化接口
|
2022-07-01 18:26:35 +08:00 |
|
648540858
|
f61051c463
|
优化streamchannge hook以及对推流的识别
|
2021-11-24 11:19:52 +08:00 |
|
64850858
|
3469271ec2
|
优化集群方案， 每个zlm一套ssrc；
优化集群下的docker接入逻辑；
更正sql脚本；
支持重启不设置设备离线。重启SIP事务不丢失
|
2021-07-26 11:40:32 +08:00 |
|
64850858
|
89a9ab4534
|
添加zlm集群支持
|
2021-07-16 16:34:51 +08:00 |
|
64850858
|
0faa593658
|
规范配置文件，添加接口鉴权的例外接口配置
|
2021-07-06 16:38:31 +08:00 |
|
lawrencehj
|
f92a5da7c2
|
去除多余引用
|
2021-06-22 12:51:56 +08:00 |
|
panlinlin
|
937e591430
|
解决串流，解决编辑上级平台却新建了的问题
|
2021-04-15 17:48:52 +08:00 |
|
lawrencehj
|
8b4f7095e2
|
去除多余引用，修正个别错误
|
2021-04-13 10:13:36 +08:00 |
|
panlinlin
|
b17280522b
|
增加推流转发到国标，尚不完善
|
2021-04-02 19:04:01 +08:00 |
|