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
|
5461b8ebf2
|
支持全局异常和统一返回结果，未完待续
|
2022-08-22 16:17:28 +08:00 |
|
zx
|
4ee8924bd9
|
fix PlatformKeepaliveExpireEvent typo
|
2022-08-19 21:55:59 +08:00 |
|
648540858
|
1a9e49d9ff
|
依赖包版本升级
|
2022-08-19 17:11:51 +08:00 |
|
648540858
|
e666bb0407
|
去除连接池中wall配置，此配制影响批量执行sql
|
2022-08-18 10:15:49 +08:00 |
|
648540858
|
59bda74e88
|
处理获取消息体内容为空时造成的空指针异常
|
2022-08-17 17:06:33 +08:00 |
|
648540858
|
4fe5672623
|
处理获取消息体内容为空时造成的空指针异常
|
2022-08-17 16:45:06 +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
|
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 |
|
mrjackwang
|
28df05e261
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-08-06 09:42:28 +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
|
231582eb77
|
推流列表增加经纬度的添加
|
2022-08-05 17:10:53 +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
|
fd091e545b
|
优化hook订阅机制
|
2022-07-28 16:18:41 +08:00 |
|
庄梦蝶殇
|
fff3d64f85
|
fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug
|
2022-07-27 18:31:33 +08:00 |
|
648540858
|
bc38f5ef29
|
修复流地址返回错误
|
2022-07-27 14:48:21 +08:00 |
|
648540858
|
b957ab61c7
|
bug修复
|
2022-07-26 11:43:56 +08:00 |
|
648540858
|
91dc4566a2
|
修复级联无通道时更新停止在等待更新的问题
|
2022-07-25 09:44:43 +08:00 |
|
648540858
|
e29d94c83f
|
增加推流添加功能，修复级联目录推送
|
2022-07-22 16:02:14 +08:00 |
|
chenjialing
|
f66bf823fa
|
优化----设备下线,通道状态也切换至离线状态
|
2022-07-20 17:02:55 +08:00 |
|
648540858
|
9e397ba9f6
|
移除共享所有直播流功能
|
2022-07-19 17:46:16 +08:00 |
|
648540858
|
28b5cc39d0
|
修复更新推流状态sql错误
|
2022-07-19 14:27:30 +08:00 |
|
648540858
|
4451994959
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
|
648540858
|
81f69eb6f4
|
支持从redis消息更新推流设备状态
|
2022-07-12 17:33:17 +08:00 |
|
648540858
|
cfed860667
|
合并主线
|
2022-07-12 16:54:58 +08:00 |
|
648540858
|
66e6756909
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-07-12 16:28:51 +08:00 |
|
648540858
|
0b1cae75fe
|
动态人物管理增加自检机制。防止内存溢出
|
2022-07-12 10:32:45 +08:00 |
|
648540858
|
8aa0bdf539
|
数据库优化
|
2022-07-06 09:44:37 +08:00 |
|
648540858
|
10cb58391a
|
修复轨迹的储存与查询展示
|
2022-07-04 01:08:26 +08:00 |
|
648540858
|
7609d7836c
|
优化对讲逻辑
|
2022-07-03 16:23:31 +08:00 |
|
648540858
|
e78c402a24
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# sql/mysql.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-07-03 10:32:33 +08:00 |
|
648540858
|
f5fcc79a2c
|
优化国标树型展示
|
2022-07-03 07:40:54 +08:00 |
|
648540858
|
72c1b36d6d
|
优化对讲逻辑
|
2022-07-03 00:44:36 +08:00 |
|
648540858
|
07956b48df
|
添加界面优化接口
|
2022-07-01 18:26:35 +08:00 |
|
648540858
|
1d1f174852
|
合并主线
|
2022-06-27 14:40:07 +08:00 |
|
648540858
|
26739237e2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# web_src/src/components/dialog/deviceEdit.vue
# web_src/src/components/dialog/devicePlayer.vue
|
2022-06-27 10:16:21 +08:00 |
|
mk1990
|
23bd11869b
|
添加国标级联录像控制功能
|
2022-06-22 16:47:26 +08:00 |
|
mk1990
|
c239ee277c
|
添加国标级联录像控制功能
|
2022-06-22 16:39:07 +08:00 |
|
mk1990
|
5e5437b630
|
添加国标级联录像控制功能
|
2022-06-22 16:31:58 +08:00 |
|
mk1990
|
4b4afa4ef7
|
添加国标级联录像控制功能
|
2022-06-22 16:26:41 +08:00 |
|
mk1990
|
6c919937bd
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# 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/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
|
2022-06-22 14:42:46 +08:00 |
|
mk1990
|
519a08e530
|
添加国标级联录像控制功能
|
2022-06-22 14:39:57 +08:00 |
|
mk1990
|
1e105fb6e1
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-06-22 13:38:25 +08:00 |
|