panlinlin
|
675ce2346d
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-08 15:40:46 +08:00 |
|
panlinlin
|
224e904306
|
修复更新设备和通道信息时检测字段是否存在
|
2021-01-08 14:46:55 +08:00 |
|
panlinlin
|
d3578a957d
|
添加对水星云台控制的支持
|
2021-01-08 13:33:19 +08:00 |
|
panlinlin
|
422ce8aebb
|
完成向上级联->选择通道-001
|
2021-01-08 11:04:29 +08:00 |
|
panlinlin
|
0020402685
|
完成向上级联->选择通道-001
|
2021-01-08 11:02:53 +08:00 |
|
panlinlin
|
397e0c4a27
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-07 16:52:18 +08:00 |
|
panlinlin
|
568141b2bc
|
增加云台控制的速度控制
|
2021-01-07 16:44:42 +08:00 |
|
panlinlin
|
059a5a678a
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-07 15:31:16 +08:00 |
|
panlinlin
|
05960d3573
|
修复重启zlm导致的点播失败
|
2021-01-07 15:29:58 +08:00 |
|
panlinlin
|
9bf87971e7
|
完成向上级联->启动时自动注册
|
2021-01-07 14:56:10 +08:00 |
|
panlinlin
|
53ffefe091
|
完成向上级联->保存时注册或注销
|
2021-01-07 14:09:41 +08:00 |
|
panlinlin
|
54d7953179
|
完成向上级联->删除的时候注销
|
2021-01-07 13:15:39 +08:00 |
|
panlinlin
|
627a14f37e
|
完成向上级联->保活
|
2021-01-06 18:35:38 +08:00 |
|
panlinlin
|
9aa9b15b62
|
修改错误的注释
|
2021-01-06 10:01:28 +08:00 |
|
panlinlin
|
34135cce5d
|
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
|
730a64be07
|
优化录像查询，优化注释
|
2021-01-05 14:35:43 +08:00 |
|
panlinlin
|
5ef229f02c
|
更新application.yml
|
2021-01-05 14:28:18 +08:00 |
|
panlinlin
|
70fca8ce5d
|
更新readme
|
2021-01-05 11:52:31 +08:00 |
|
panlinlin
|
381e3129a3
|
存储部分使用sqlite代替redis-4
|
2021-01-05 11:25:05 +08:00 |
|
panlinlin
|
dcd78a1cfa
|
存储部分使用sqlite代替redis-3
|
2021-01-04 18:30:44 +08:00 |
|
panlinlin
|
a25f7e4f99
|
存储部分使用sqlite代替redis-2
|
2020-12-31 13:22:22 +08:00 |
|
panlinlin
|
3d83775468
|
存储部分使用sqlite代替redis
|
2020-12-31 13:15:50 +08:00 |
|
panlinlin
|
00e61d9a80
|
增加对 需要扩展SDP的设备的单独设置
|
2020-12-28 11:45:40 +08:00 |
|
panlinlin
|
48896474e6
|
检查设备是否存在， 不存在则不回复心跳
|
2020-12-28 11:07:01 +08:00 |
|
panlinlin
|
6968839f21
|
修复空指针异常
|
2020-12-27 08:19:34 +08:00 |
|
panlinlin
|
418e441dfc
|
兼容水星IPC的录像查询
|
2020-12-26 20:08:04 +08:00 |
|
panlinlin
|
f2279859b3
|
增加对水星IPC的兼容
增加对SIP错误的订阅，刷新通道或点播或回放出现sip错误时及时返回给页面
优化UI，增加按钮loading
|
2020-12-26 16:44:27 +08:00 |
|
panlinlin
|
17f4fe254a
|
增加对配置文件的校验
|
2020-12-25 18:11:03 +08:00 |
|
panlinlin
|
642d93c061
|
修复录像查询的VIA头
|
2020-12-25 15:27:25 +08:00 |
|
panlinlin
|
d178c28317
|
修复空指针
|
2020-12-25 15:05:55 +08:00 |
|
648540858
|
ae32f978f6
|
添加maven源, 增加依赖下载速度
|
2020-12-22 15:04:19 +08:00 |
|
648540858
|
8d2ad02208
|
替换线程不安全的map
|
2020-12-22 09:48:51 +08:00 |
|
648540858
|
000bbad21e
|
恢复配置文件
|
2020-12-21 17:40:05 +08:00 |
|
648540858
|
b5c9de775d
|
补充漏掉的文件
|
2020-12-21 16:01:47 +08:00 |
|
648540858
|
bfd1628d5b
|
修复重复调用open rtp server 的bug
增加对rtp server开启释放的统一管理
|
2020-12-21 15:29:17 +08:00 |
|
648540858
|
1ec6c4506a
|
修复重复调用open rtp server
|
2020-12-21 11:35:28 +08:00 |
|
648540858
|
d58064587d
|
修复兼容接口
|
2020-12-21 11:13:27 +08:00 |
|
panlinlin
|
cebea64d36
|
update readme
|
2020-12-19 22:07:54 +08:00 |
|
panlinlin
|
b0080159d9
|
去除ssrc作为流ID传递，ssrc只作为sdp消息使用。动态端口的情况下支持固定流地址，同时支持未点播时直接播放流地址，代码自动发起点播
|
2020-12-19 21:52:20 +08:00 |
|
648540858
|
a63ae08f5d
|
Merge pull request #15 from lawrencehj/wvp-28181-2.0
修复编译后运行报错“循环依赖”的问题，修复zlm在docker时代理错误
|
2020-12-18 09:25:41 +08:00 |
|
Lawrence
|
28d17b04b1
|
上级注册Expires值根据填表值发送
|
2020-12-18 00:43:17 +08:00 |
|
Lawrence
|
ae336ae494
|
解决编译为jar后运行报循环依赖错误的问题
|
2020-12-17 22:37:45 +08:00 |
|
Lawrence
|
ed1fe4b938
|
与主线同步，修复zlm在docker时代理错误
|
2020-12-17 15:42:29 +08:00 |
|
648540858
|
bc2e5e7a37
|
Merge pull request #14 from lawrencehj/wvp-28181-2.0
修正上级注册的代码
|
2020-12-17 14:55:22 +08:00 |
|
Lawrence
|
273ece96b5
|
新建上级级联平台时自动填入本级平台参数
|
2020-12-17 14:50:49 +08:00 |
|
Lawrence
|
8a82a71ded
|
增加本平台配置查询接口，方便上级级联参数填写
|
2020-12-17 14:49:34 +08:00 |
|
Lawrence
|
87ce22e031
|
注册过程中区分不同的CSeq值
|
2020-12-17 14:47:56 +08:00 |
|
Lawrence
|
5cecb10b00
|
注册信令包增加Expires头，修改CSeq值
|
2020-12-17 14:46:38 +08:00 |
|
648540858
|
0188ffd19f
|
修复zlm在 docker时代理错误
|
2020-12-17 14:25:54 +08:00 |
|
648540858
|
288059eecd
|
Merge pull request #12 from lawrencehj/master
修正转码播放重复回调的错误
|
2020-12-17 13:10:43 +08:00 |
|