panlinlin
|
b37a77f23f
|
解决循环依赖导致的打包失败
|
2021-03-25 16:45:29 +08:00 |
|
panlinlin
|
d0f5d684a9
|
同步主线
|
2021-02-26 11:10:22 +08:00 |
|
panlinlin
|
0f58218bad
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
# Conflicts:
# README.md
# src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
# src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.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/impl/VideoManagerStoragerImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
# src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
# src/main/resources/wvp.sqlite
# web_src/.postcssrc.js
# web_src/src/components/UiHeader.vue
# web_src/src/main.js
# web_src/src/router/index.js
|
2021-02-25 18:10:02 +08:00 |
|
Lawrence
|
cda49944f7
|
支持移动位置存储
|
2021-01-27 15:26:28 +08:00 |
|
Lawrence
|
f3975fdefc
|
调整格式
|
2021-01-21 21:02:59 +08:00 |
|
Lawrence
|
e4918d29f3
|
添加浏览器ID，确保SSE可同时推送到不同的前端
|
2021-01-21 20:58:11 +08:00 |
|
Lawrence
|
217d42983e
|
parent_platform表修改主键为serverGBId
|
2021-01-14 23:49:34 +08:00 |
|
panlinlin
|
f082797d9b
|
完成向上级联->选择通道-003
|
2021-01-13 17:08:26 +08:00 |
|
panlinlin
|
700398ba13
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-12 10:37:31 +08:00 |
|
Lawrence
|
5de358d38e
|
格式调整
|
2021-01-11 20:44:24 +08:00 |
|
panlinlin
|
658bec3ecc
|
国标级联--选择通道003-前端页面
|
2021-01-10 20:14:11 +08:00 |
|
panlinlin
|
7ed4a26be6
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-09 12:16:16 +08:00 |
|
panlinlin
|
0dc017704a
|
去除无用的配置项
|
2021-01-09 12:12:50 +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
|
627a14f37e
|
完成向上级联->保活
|
2021-01-06 18:35:38 +08:00 |
|
panlinlin
|
5ef229f02c
|
更新application.yml
|
2021-01-05 14:28:18 +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
|
3d83775468
|
存储部分使用sqlite代替redis
|
2020-12-31 13:15:50 +08:00 |
|
panlinlin
|
00e61d9a80
|
增加对 需要扩展SDP的设备的单独设置
|
2020-12-28 11:45:40 +08:00 |
|
648540858
|
000bbad21e
|
恢复配置文件
|
2020-12-21 17:40:05 +08:00 |
|
648540858
|
b5c9de775d
|
补充漏掉的文件
|
2020-12-21 16:01:47 +08:00 |
|
648540858
|
d58064587d
|
修复兼容接口
|
2020-12-21 11:13:27 +08:00 |
|
panlinlin
|
b0080159d9
|
去除ssrc作为流ID传递，ssrc只作为sdp消息使用。动态端口的情况下支持固定流地址，同时支持未点播时直接播放流地址，代码自动发起点播
|
2020-12-19 21:52:20 +08:00 |
|
648540858
|
0046d32f1c
|
优化配置文件使用方式, 规范前端文件打包路径
|
2020-12-04 14:29:34 +08:00 |
|
648540858
|
45237888e3
|
修正使用默认配置
|
2020-12-02 15:35:21 +08:00 |
|
648540858
|
3c8507daee
|
增加hookip设置, 是否开启自动配置设置
|
2020-12-02 15:33:19 +08:00 |
|
648540858
|
09470bef96
|
添加网页自动转码,以支持h265 g.711的播放
|
2020-11-19 16:00:02 +08:00 |
|
648540858
|
4e9c6b2f91
|
配置丢失了一个空格
|
2020-11-17 17:41:19 +08:00 |
|
648540858
|
cef80c7533
|
配置丢失了一个空格
|
2020-11-17 17:40:03 +08:00 |
|
648540858
|
4cdeeb4a36
|
修复一些日志设置
|
2020-11-17 15:27:13 +08:00 |
|
648540858
|
33b51c40dd
|
增加强制不查询编码信息配置
|
2020-11-13 18:12:21 +08:00 |
|
648540858
|
81f9119da6
|
支持公网部署
|
2020-11-09 13:33:00 +08:00 |
|
Lawrence
|
ac7cc458be
|
修正RTP端口上限数值
|
2020-10-19 20:32:55 +08:00 |
|
panll
|
04af6de363
|
修改默认参数与ZLM统一
|
2020-10-17 16:41:40 +08:00 |
|
648540858
|
b15115565c
|
更新配置
|
2020-10-15 17:05:14 +08:00 |
|
648540858
|
b55374c75a
|
支持使用udp端口段来启用高性能udp
|
2020-10-14 16:13:39 +08:00 |
|
648540858
|
3ec3b88456
|
修复点播判断错误导致的15s超长延时
增加默认不关闭推流, 无人观看超时或点击停止按钮关闭流
修复点播其他bug
|
2020-10-14 14:39:10 +08:00 |
|
648540858
|
f9ab13a145
|
添加通道音频设置
添加media配置
|
2020-10-13 17:16:38 +08:00 |
|
648540858
|
d881c98224
|
web页面集成
|
2020-10-10 17:33:02 +08:00 |
|
648540858
|
57fd18cd7c
|
增加分页,搜索,等
|
2020-09-30 17:59:11 +08:00 |
|
648540858
|
764daa8a36
|
添加静态页
|
2020-09-25 17:55:32 +08:00 |
|
648540858
|
da14c7f24c
|
拆分redis中device与channel的存储方式
支持分页
接口直接返回播放地址
|
2020-09-25 17:22:22 +08:00 |
|
Lawrence
|
89c6224062
|
实现PTZ控制代码
|
2020-06-09 15:39:51 +08:00 |
|
songww
|
1b6f0137b9
|
优化配置
|
2020-05-14 09:22:30 +08:00 |
|
songww
|
6ecd801c23
|
增加设备删除接口，只允许删除离线设备；增加视频停止播放接口
|
2020-05-13 20:38:32 +08:00 |
|
songww
|
ca5139929b
|
尝试修复catalog获取失败。服务重启后设备未注册仍上报keeplive处理
|
2020-05-13 14:55:06 +08:00 |
|
songww
|
b9e4682d3f
|
完善ssrc符合国标，并完善很多小问题
|
2020-05-10 22:33:43 +08:00 |
|
songww
|
3a502b36a8
|
完善ssrc符合国标，并完善很多小问题
|
2020-05-10 22:33:21 +08:00 |
|