panlinlin
|
4ed02aa69b
|
完成向上级联->删除的时候注销
|
2021-01-07 13:15:39 +08:00 |
|
panlinlin
|
a8a36efb93
|
完成向上级联->保活
|
2021-01-06 18:35:38 +08:00 |
|
panlinlin
|
80682bbe9d
|
修改错误的注释
|
2021-01-06 10:01:28 +08:00 |
|
panlinlin
|
20669ed768
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
# Conflicts:
# README.md
# src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
# 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/media/zlm/ZLMHTTPProxyController.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
# src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
# src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
# src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
# src/main/resources/application-dev.yml
# web_src/src/components/gb28181/devicePlayer.vue
|
2021-01-05 15:56:19 +08:00 |
|
panlinlin
|
3a6fc34a11
|
优化录像查询，优化注释
|
2021-01-05 14:35:43 +08:00 |
|
panlinlin
|
59237e9a55
|
更新application.yml
|
2021-01-05 14:28:18 +08:00 |
|
panlinlin
|
37957b7407
|
更新readme
|
2021-01-05 11:52:31 +08:00 |
|
panlinlin
|
b88ead03f9
|
存储部分使用sqlite代替redis-4
|
2021-01-05 11:25:05 +08:00 |
|
panlinlin
|
82c682c512
|
存储部分使用sqlite代替redis-3
|
2021-01-04 18:30:44 +08:00 |
|
panlinlin
|
15bee5e37d
|
存储部分使用sqlite代替redis-2
|
2020-12-31 13:22:22 +08:00 |
|
panlinlin
|
2ab8b942bd
|
存储部分使用sqlite代替redis
|
2020-12-31 13:15:50 +08:00 |
|
panlinlin
|
59f7fb1063
|
增加对 需要扩展SDP的设备的单独设置
|
2020-12-28 11:45:40 +08:00 |
|
panlinlin
|
098307cfe8
|
检查设备是否存在， 不存在则不回复心跳
|
2020-12-28 11:07:01 +08:00 |
|
panlinlin
|
27c0332052
|
修复空指针异常
|
2020-12-27 08:19:34 +08:00 |
|
panlinlin
|
071c2de9b8
|
兼容水星IPC的录像查询
|
2020-12-26 20:08:04 +08:00 |
|
panlinlin
|
e4d849304c
|
增加对水星IPC的兼容
增加对SIP错误的订阅，刷新通道或点播或回放出现sip错误时及时返回给页面
优化UI，增加按钮loading
|
2020-12-26 16:44:27 +08:00 |
|
panlinlin
|
3dcb759bda
|
增加对配置文件的校验
|
2020-12-25 18:11:03 +08:00 |
|
panlinlin
|
64aae8db3b
|
修复录像查询的VIA头
|
2020-12-25 15:27:25 +08:00 |
|
panlinlin
|
a2ac3c77dd
|
修复空指针
|
2020-12-25 15:05:55 +08:00 |
|
648540858
|
4ee6962fe6
|
添加maven源, 增加依赖下载速度
|
2020-12-22 15:04:19 +08:00 |
|
648540858
|
762507def6
|
替换线程不安全的map
|
2020-12-22 09:48:51 +08:00 |
|
648540858
|
e9476821e1
|
恢复配置文件
|
2020-12-21 17:40:05 +08:00 |
|
648540858
|
c8fd03682a
|
补充漏掉的文件
|
2020-12-21 16:01:47 +08:00 |
|
648540858
|
a742be7afe
|
修复重复调用open rtp server 的bug
增加对rtp server开启释放的统一管理
|
2020-12-21 15:29:17 +08:00 |
|
648540858
|
f6a59b06e3
|
修复重复调用open rtp server
|
2020-12-21 11:35:28 +08:00 |
|
648540858
|
51630f54e8
|
修复兼容接口
|
2020-12-21 11:13:27 +08:00 |
|
panlinlin
|
a1d7894bdb
|
update readme
|
2020-12-19 22:07:54 +08:00 |
|
panlinlin
|
82cceb6a4b
|
去除ssrc作为流ID传递，ssrc只作为sdp消息使用。动态端口的情况下支持固定流地址，同时支持未点播时直接播放流地址，代码自动发起点播
|
2020-12-19 21:52:20 +08:00 |
|
648540858
|
7cbe54e233
|
Merge pull request #15 from lawrencehj/wvp-28181-2.0
修复编译后运行报错“循环依赖”的问题，修复zlm在docker时代理错误
|
2020-12-18 09:25:41 +08:00 |
|
Lawrence
|
4fe7f7fe2e
|
上级注册Expires值根据填表值发送
|
2020-12-18 00:43:17 +08:00 |
|
Lawrence
|
e9360b423e
|
解决编译为jar后运行报循环依赖错误的问题
|
2020-12-17 22:37:45 +08:00 |
|
Lawrence
|
54bc9326a2
|
与主线同步，修复zlm在docker时代理错误
|
2020-12-17 15:42:29 +08:00 |
|
648540858
|
22cde8d802
|
Merge pull request #14 from lawrencehj/wvp-28181-2.0
修正上级注册的代码
|
2020-12-17 14:55:22 +08:00 |
|
Lawrence
|
bf62eb1177
|
新建上级级联平台时自动填入本级平台参数
|
2020-12-17 14:50:49 +08:00 |
|
Lawrence
|
e68f4e740c
|
增加本平台配置查询接口，方便上级级联参数填写
|
2020-12-17 14:49:34 +08:00 |
|
Lawrence
|
ef242dc164
|
注册过程中区分不同的CSeq值
|
2020-12-17 14:47:56 +08:00 |
|
Lawrence
|
0cd769e3da
|
注册信令包增加Expires头，修改CSeq值
|
2020-12-17 14:46:38 +08:00 |
|
648540858
|
4ec6c288cd
|
修复zlm在 docker时代理错误
|
2020-12-17 14:25:54 +08:00 |
|
648540858
|
94e2631195
|
Merge pull request #12 from lawrencehj/master
修正转码播放重复回调的错误
|
2020-12-17 13:10:43 +08:00 |
|
648540858
|
7952b7aaf9
|
Merge pull request #13 from lawrencehj/wvp-28181-2.0
与master分支同步
|
2020-12-17 13:10:14 +08:00 |
|
Lawrence
|
4aecbd8197
|
添加回放SDP信息，兼容海康设备
|
2020-12-16 20:36:59 +08:00 |
|
Lawrence
|
7b5fe25b96
|
与master分支同步
|
2020-12-16 20:29:19 +08:00 |
|
Lawrence
|
a76b464cd4
|
修正播放窗口关闭时销毁播放器的代码
|
2020-12-16 12:51:57 +08:00 |
|
Lawrence
|
8c3f97072a
|
Merge remote-tracking branch 'upstream/master'
|
2020-12-16 12:43:52 +08:00 |
|
Lawrence
|
b9c2a7c888
|
去掉重复添加的via头
|
2020-12-16 12:42:36 +08:00 |
|
Lawrence
|
f804dbfa34
|
修正转码播放停止后重复回调的错误
|
2020-12-16 12:41:49 +08:00 |
|
648540858
|
b954918fb7
|
Merge pull request #10 from lawrencehj/master
解决海康设备兼容问题等
|
2020-12-15 10:41:21 +08:00 |
|
Lawrence
|
2852561e50
|
临时修改解决内网Ack问题
|
2020-12-14 22:42:28 +08:00 |
|
Lawrence
|
abb682a044
|
修改查询录像回放接口，兼容部分设备发出MediaStatus信息时将ChannelId当作DeviceId的问题
|
2020-12-14 22:41:06 +08:00 |
|
Lawrence
|
685e2073f4
|
扩展点播SDP协议范围，兼容海康等设备（issue #7）
|
2020-12-14 22:35:40 +08:00 |
|