Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
426 Commits 2 Branches 0 Tags 42 MiB
cd93716b67
Commit Graph

90 Commits

Author SHA1 Message Date
panlinlin
cd93716b67 统一axios写法 2021-04-12 16:04:04 +08:00
panlinlin
bcf8042730 规范api 2021-04-11 22:32:28 +08:00
panlinlin
b6b3aefd01 规范化api， 进行中。。。 2021-04-09 17:59:38 +08:00
panlinlin
912b9cb65e 规范化api， 进行中。。。 2021-04-07 18:35:13 +08:00
panlinlin
b502e2377d 修复添加级联平台是三个布尔字段无效的bug 2021-04-06 18:08:58 +08:00
panlinlin
850a5b2c6b 增加推流转发到国标，尚不完善 2021-04-02 19:04:01 +08:00
panlinlin
a3692072a1 添加拉流代理与国标关联, 支持代理rtsp/rtmp/...，转发到国标 2021-04-01 18:06:21 +08:00
panlinlin
22f58d318f 添加推流列表和拉流代理，下一步与国标关联 2021-03-30 18:46:34 +08:00
lawrencehj
9579fa905f 实现语音广播信令（web语音推流开发中） 2021-03-26 20:15:12 +08:00
lawrencehj
3a432a5c10 修正loggor提示信息 2021-03-15 15:17:55 +08:00
lawrencehj
2e403fc527 修正本地平台播放时上级无法点播同一流视频的问题 2021-03-14 21:23:47 +08:00
lawrencehj
f83bb3639a 去除冗余代码和死代码 2021-03-09 20:02:56 +08:00
panlinlin
48c0893de3 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
lawrencehj
347cac1859 去除冗余代码，修正编译报警项 2021-02-05 15:15:39 +08:00
lawrencehj
1457621ebb 增加多种信令的API调用接口 2021-02-03 11:08:10 +08:00
Lawrence
3b44b038ff 增加SSE跨域支持 2021-01-27 15:54:14 +08:00
Lawrence
4fe62869e0 增加移动位置API接口支持 2021-01-27 15:51:58 +08:00
Lawrence
cf438d9963 添加浏览器ID，确保SSE可同时推送到不同的前端 2021-01-21 20:58:11 +08:00
Lawrence
74460e7c95 添加浏览器ID，确保SSE可同时推送到不同的前端 2021-01-21 19:57:57 +08:00
Lawrence
a6ed1268e3 添加报警响应、发布和SSE推送功能 2021-01-20 23:31:00 +08:00
Lawrence
ea787fdcba 增加SSE前端推送支持 2021-01-20 20:42:58 +08:00
panlinlin
ca3fcef8a3 完成向上级联->点播--002 2021-01-15 18:22:57 +08:00
panlinlin
6d0133d27f 完成向上级联->点播--增加了sdp解析 
修复修改平台主键带来的bug
 2021-01-15 17:21:02 +08:00
Lawrence
a0f00fe8ba 将上级平台标识改为serverGBId 2021-01-15 00:00:45 +08:00
panlinlin
7c13ec0c42 Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 2021-01-13 17:56:01 +08:00
panlinlin
38799fca56 修复登陆的bug 2021-01-13 17:49:19 +08:00
panlinlin
f92b5ce097 完成向上级联->选择通道-003 2021-01-13 17:08:26 +08:00
Lawrence
62342c6d37 与2.0同步修改 2021-01-11 09:18:00 +08:00
Lawrence
eec405028f 调整格式 2021-01-10 23:14:58 +08:00
panlinlin
a796db6249 国标级联--选择通道003-前端页面 2021-01-10 20:14:11 +08:00
panlinlin
37b6afb9b2 Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
 2021-01-08 17:31:49 +08:00
panlinlin
82ee2034b1 修复检测字段是否存在带来的停止按钮无法点击 
修改错别字
 2021-01-08 17:27:13 +08:00
panlinlin
4cbf7205e2 完成向上级联->启动时自动注册 2021-01-07 14:56:10 +08:00
panlinlin
56bfa58efd 完成向上级联->保存时注册或注销 2021-01-07 14:09:41 +08:00
panlinlin
4ed02aa69b 完成向上级联->删除的时候注销 2021-01-07 13:15:39 +08:00
panlinlin
a8a36efb93 完成向上级联->保活 2021-01-06 18:35:38 +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
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
e4d849304c 增加对水星IPC的兼容 
增加对SIP错误的订阅，刷新通道或点播或回放出现sip错误时及时返回给页面
优化UI，增加按钮loading
 2020-12-26 16:44:27 +08:00
648540858
a742be7afe 修复重复调用open rtp server 的bug 
增加对rtp server开启释放的统一管理
 2020-12-21 15:29:17 +08:00
panlinlin
82cceb6a4b 去除ssrc作为流ID传递，ssrc只作为sdp消息使用。动态端口的情况下支持固定流地址，同时支持未点播时直接播放流地址，代码自动发起点播 2020-12-19 21:52:20 +08:00
Lawrence
e68f4e740c 增加本平台配置查询接口，方便上级级联参数填写 2020-12-17 14:49:34 +08:00
Lawrence
7b5fe25b96 与master分支同步 2020-12-16 20:29:19 +08:00
648540858
2bfef8ab6c 修改错误注释和错误日志 2020-12-14 15:11:48 +08:00
648540858
69f9e9ce22 修改转码接口以使用127.0.0.1, 作为源IP 2020-12-14 10:47:26 +08:00
648540858
726730cbaa 使用异步接口, 更好的并发, 对hook使用订阅机制 
替换前段播放器, 支持h265的播放
放弃循环获取编码信息,
 2020-12-08 18:11:02 +08:00