648540858
|
aa6bce35c7
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-09-05 09:44:24 +08:00 |
|
648540858
|
cfe9c762d6
|
修复前端播放
|
2022-09-05 09:40:14 +08:00 |
|
648540858
|
ee7ef0bf41
|
优化级联平台注册的周期时间
|
2022-09-02 15:49:40 +08:00 |
|
648540858
|
3146e63fc0
|
优化异常处理
|
2022-09-01 17:53:00 +08:00 |
|
648540858
|
03d6ad289b
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-09-01 14:50:28 +08:00 |
|
648540858
|
703c2e292a
|
云端录像详情页添加返回按钮
|
2022-08-31 18:07:53 +08:00 |
|
648540858
|
275b272160
|
hook订阅曾增加过期清除功能，防止内存溢出
|
2022-08-31 13:09:45 +08:00 |
|
648540858
|
2de4c322f6
|
去除对redis key过期事件的使用；重构国标级联的注册保活
|
2022-08-31 11:29:13 +08:00 |
|
648540858
|
d47902bdca
|
启动时redis未连接导致无法启动
|
2022-08-29 14:39:18 +08:00 |
|
648540858
|
9e2630ee32
|
增加zlm心跳超时的判定时间
|
2022-08-29 14:04:54 +08:00 |
|
648540858
|
6e90050db4
|
去除zlm使用redis过期作为心跳超时的方式
|
2022-08-29 11:50:36 +08:00 |
|
648540858
|
9f680a2e9e
|
修复bug以及日志按照，错误/sip/数据库 分割
|
2022-08-26 18:03:09 +08:00 |
|
648540858
|
8f7e8efc98
|
合并主线
|
2022-08-23 11:48:31 +08:00 |
|
648540858
|
020f9ea8a0
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
|
2022-08-23 11:01:53 +08:00 |
|
648540858
|
f24b6fa13f
|
优化国标录像的异常判断
|
2022-08-23 11:00:46 +08:00 |
|
648540858
|
ecf4fbb684
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# 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/Login.vue
|
2022-08-22 16:53:16 +08:00 |
|
648540858
|
042b28b2d6
|
支持全局异常和统一返回结果
|
2022-08-22 16:17:28 +08:00 |
|
648540858
|
5461b8ebf2
|
支持全局异常和统一返回结果，未完待续
|
2022-08-22 16:17:28 +08:00 |
|
648540858
|
1a9e49d9ff
|
依赖包版本升级
|
2022-08-19 17:11:51 +08:00 |
|
jiang
|
8f77d0c25c
|
根据redis消息更新推流列表
|
2022-08-18 16:17:23 +08:00 |
|
648540858
|
470aa47969
|
优化队列的处理逻辑
|
2022-08-17 15:38:06 +08:00 |
|
648540858
|
cb16cabb64
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
|
2022-08-15 15:37:13 +08:00 |
|
648540858
|
c041aaccb4
|
修复录像回放中的信令错误
|
2022-08-15 15:08:51 +08:00 |
|
648540858
|
dab04fcab7
|
优化使用tcp连接时的超时时间
|
2022-08-11 16:37:55 +08:00 |
|
648540858
|
82ab6b1760
|
去除jedis，方便支持redis集群
|
2022-08-10 18:14:33 +08:00 |
|
chenjialing
|
871b4e5359
|
优化--直播结束异步处理截图操作，提高接口响应速度和并发能力
|
2022-08-09 17:26:32 +08:00 |
|
648540858
|
116d979d87
|
合并主线
|
2022-08-09 16:58:31 +08:00 |
|
648540858
|
8b0ff3767b
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.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/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
|
2022-08-09 14:41:21 +08:00 |
|
wym
|
7ecc86b33d
|
zlm关闭一段时间后，重启后信令服务不重连zlm
|
2022-08-08 08:31:12 +08:00 |
|
gushouzheng
|
d21d281b2c
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-08-06 09:00:14 +08:00 |
|
gushouzheng
|
c273a6aa5a
|
更新级联查看直播视频及代理拉流视频bug
|
2022-08-06 08:58:17 +08:00 |
|
648540858
|
142efdd915
|
修复单个添加的推流级联国标的问题
|
2022-08-05 09:48:13 +08:00 |
|
648540858
|
e05d0aa0a9
|
修复ssrc变化时端口变化的问题
|
2022-07-29 11:57:04 +08:00 |
|
648540858
|
646c3e41b7
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-28 16:24:51 +08:00 |
|
648540858
|
778969f1eb
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-28 16:21:09 +08:00 |
|
648540858
|
fd091e545b
|
优化hook订阅机制
|
2022-07-28 16:18:41 +08:00 |
|
648540858
|
34f2832bef
|
优化gps信息存入数据库
|
2022-07-28 11:22:51 +08:00 |
|
庄梦蝶殇
|
fff3d64f85
|
fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug
|
2022-07-27 18:31:33 +08:00 |
|
648540858
|
f84eebdb75
|
优化部分hook订阅
|
2022-07-27 16:16:12 +08:00 |
|
648540858
|
bc38f5ef29
|
修复流地址返回错误
|
2022-07-27 14:48:21 +08:00 |
|
648540858
|
76dedb11f8
|
bug修复
|
2022-07-27 11:11:18 +08:00 |
|
648540858
|
b957ab61c7
|
bug修复
|
2022-07-26 11:43:56 +08:00 |
|
648540858
|
c77c1a956c
|
修复推流推流状态提示
|
2022-07-25 11:17:46 +08:00 |
|
648540858
|
e29d94c83f
|
增加推流添加功能，修复级联目录推送
|
2022-07-22 16:02:14 +08:00 |
|
chenjialing
|
f66bf823fa
|
优化----设备下线,通道状态也切换至离线状态
|
2022-07-20 17:02:55 +08:00 |
|
jiang
|
a51b411101
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-19 18:13:42 +08:00 |
|
jiang
|
fc0ad32f81
|
1.修复新增用户没有pushkey的问题
2.将重置pushkey改为修改pushkey
|
2022-07-19 18:13:19 +08:00 |
|
648540858
|
9e397ba9f6
|
移除共享所有直播流功能
|
2022-07-19 17:46:16 +08:00 |
|
648540858
|
28b5cc39d0
|
修复更新推流状态sql错误
|
2022-07-19 14:27:30 +08:00 |
|
jiang
|
1002150b2a
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-18 17:15:33 +08:00 |
|