Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,892 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

1317 Commits (f961515317a33fe965287ca5c978b85e9ce1abcc)

Author SHA1 Message Date
648540858 f2c6210539 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	doc/_content/introduction/deployment.md
#	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/media/zlm/ZLMRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
 2023-02-10 16:24:27 +08:00
648540858 ec95a42985 Merge branch 'main' into main2 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
 2023-02-10 15:54:42 +08:00
648540858 e0c8216f58 恢复默认判断 2023-02-09 14:22:12 +08:00
648540858 48fad3582d Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-02-09 14:13:57 +08:00
648540858 03ee15ece2
Merge pull request #741 from gaofuwang/wvp-28181-2.0 
修复WVP作为下级平台接收上级平台DeviceControl、RecordInfo信令处理问题和Alarm信令上报上级平台问题
 2023-02-09 14:13:44 +08:00
gaofw189 5462b1f6c6 去除lombok依赖-后续考虑引入 2023-02-09 09:20:46 +08:00
648540858 6484f52e46 同时支持打包为Jar和War 2023-02-07 20:59:33 +08:00
648540858 31dcdab4d8 修复点播信令 2023-02-07 16:45:17 +08:00
648540858 922a9e8b32 修复语音对讲返回的地址 2023-02-07 14:52:33 +08:00
648540858 c226deacff 修复语音对讲发送页 2023-02-07 10:04:15 +08:00
gaofw189 c2e26291ce 修复WVP作为下级平台接受recordinfo指令上报上级平台的问题 2023-02-07 09:28:55 +08:00
gaofw189 55ee6f5f0d 修复WVP作为下级平台接受devicecontrol命令处理-调试修改逻辑 2023-02-07 09:26:08 +08:00
648540858 e46bf8a8bd 支持同时打war包和jar包 2023-02-06 17:34:47 +08:00
lin 375cd03575 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-02-06 16:43:04 +08:00
648540858 aa3cec0dfc 去除数据库自动更新，自动更新会导致wvp在arm架构服务上无法启动 2023-02-06 10:46:23 +08:00
gaofw189 25fca14e62 修复WVP作为下级平台接受deviceControl指令的问题-修复指令响应 2023-02-06 10:35:32 +08:00
xiaoQQya a5ed284658 fix(JsonUtil): 修复 Redis 中 Object 序列化与反序列化不一致导致报错的问题 2023-02-04 18:13:47 +08:00
xiaoQQya d50dd3fe84 perf(ZLMRESTfulUtils): 修改OkHttpClient 读取超时时间，解决点播时截图快照获取超时的问题 2023-02-04 18:12:25 +08:00
gaofw189 40ece192fe 修复WVP作为下级平台接收设备告警消息后上报上级平台的问题 2023-02-03 14:35:44 +08:00
gaoxun250@sina.com 0a380c6ff9 解决截图被占用无法打开问题 2023-02-03 14:19:10 +08:00
gaofw189 e5b1876012 修复WVP作为下级平台接收上级平台DeviceControl信令不做处理的问题。-修改日志备注 2023-02-02 18:24:32 +08:00
gaofw189 7a9f001dcb 修复WVP作为下级平台接收上级平台DeviceControl信令不做处理的问题。 2023-02-02 18:21:25 +08:00
kunlong-luo b89e46871a fix: 修复一些问题 
1. 修复空指针异常
2. 修复类型转换异常
3. 封装 JsonUtil 工具类支持类型转换
 2023-02-02 16:19:02 +08:00
kunlong-luo 8f2ce95165 fix: 修复空指针和类型转换问题 2023-02-02 14:36:19 +08:00
648540858 166272ad11 增加数据库自动更新开关 2023-02-01 15:54:03 +08:00
648540858 7470e1fe8e 优化数据库自动更新功能 2023-02-01 15:37:19 +08:00
648540858 d395f5d6c0
Merge pull request #730 from shijinting0321/wvp-28181-2.0 
数据库脚本版本管理，便于表结构更新维护
 2023-02-01 15:25:49 +08:00
lin 2d492c5b6b 国标回放超时时间使用点播超时一样的字段 2023-02-01 10:09:01 +08:00
648540858 bdf799fb64
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2023-02-01 09:47:58 +08:00
648540858 6374a8f2e5 优化目录推送 2023-01-30 14:25:25 +08:00
sjt ca1d66cfb8 数据库脚本版本管理，便于表结构更新维护 2023-01-18 15:27:24 +08:00
gaofw189 141b228267 修复WVP作为下级平台接收DeviceInfo指令固定响应的问题 2023-01-17 17:22:38 +08:00
648540858 c19ad94c3e 优化目录更新，更新失败时只更新收到的内容不重置所有通道和自动拉流 2023-01-15 15:27:47 +08:00
648540858 dea44dcd78 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
 2023-01-13 16:21:17 +08:00
648540858 ebcd2320a9 修复推流鉴权 2023-01-13 11:19:30 +08:00
648540858 955c893428
Merge pull request #724 from gaofuwang/wvp-28181-2.0 
修复WVP作为下级平台接收DeviceStatus指令固定响应的问题
 2023-01-12 15:53:24 +08:00
648540858 fb8a5d483b 修复redis查询 2023-01-11 11:33:01 +08:00
648540858 4babf2b47b 更新README 2023-01-10 16:26:52 +08:00
gaofw189 26cd7dbaf9 修复WVP作为下级平台接收DeviceStatus指令固定响应的问题 2023-01-10 15:55:56 +08:00
648540858 8b0662ebfe 优化国标录像下载错误提示 2023-01-10 11:36:54 +08:00
648540858 88878940af 修复录像下载 2023-01-09 18:12:41 +08:00
648540858 9b9a13ab36 国标录像UI重构 2023-01-09 16:31:51 +08:00
648540858 fd3a4ef472 修复国标录像回放以及录像下载 2023-01-06 11:43:27 +08:00
648540858 d03e8b0428 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-01-05 17:49:50 +08:00
648540858 09a23bc80e 修复布防撤防 #717 2023-01-05 17:49:34 +08:00
648540858 e14cef8062 优化语音对讲 2023-01-05 16:38:33 +08:00
648540858 f275daa3f8 合并主线 2023-01-05 15:01:10 +08:00
648540858 6fa5b37b96 Merge branch 'main' into main2 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.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/message/response/cmd/BroadcastResponseMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/resources/all-application.yml
 2023-01-05 11:07:06 +08:00
648540858 ce035dbcdb
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2023-01-05 09:38:11 +08:00
648540858 809e4c98c5 Merge remote-tracking branch 'gitee.com/wvp-28181-2.0' into wvp-28181-2.0 2023-01-04 10:41:17 +08:00
648540858 a82b831b8b 优化设备状态保持，自动记录心跳间隔，三次心跳失败则设备离线，不在使用设备有效期字段作为唯一判断标准，提高容错能力和稳定性。 2023-01-04 10:39:40 +08:00
xubinbin 7b601a3e8f 使用#替代$，防止SQL注入的风险（主要防止模糊查询sql部分的注入）。 2022-12-28 13:26:33 +08:00
jiang 37e973949f 优化兼容接口 2022-12-28 10:58:48 +08:00
648540858 276f077dc7 优化接口 2022-12-23 16:52:30 +08:00
648540858 16f3b0553d 设备离线清空语音对讲通道 2022-12-19 18:00:28 +08:00
648540858 49e937c396 修复invite超时任务的设置 2022-12-19 15:51:59 +08:00
648540858 28f4f688dd 优化语音遇到错误时主动终止对讲流程 2022-12-19 15:39:37 +08:00
648540858 fc90cd7951 优化tcp主动方式的语音对讲 2022-12-19 14:20:22 +08:00
648540858 4b827f3897 级联语音对讲部分 2022-12-13 11:57:07 +08:00
648540858 c1145a8163 优化级联注册，以及sip日志 2022-12-12 10:28:36 +08:00
648540858 1516991372 回滚via获取地址的方式 2022-12-06 17:12:12 +08:00
648540858 5606bce885 默认仍使用via ip 做为回复的ip 2022-12-06 16:35:14 +08:00
648540858 131ea77669 接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址 2022-12-06 10:33:43 +08:00
648540858 850260ec28 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-12-02 15:15:50 +08:00
648540858 142b17cc76 更新接口 2022-12-02 15:12:56 +08:00
xiaoQQya 8f39254dd0 perf(PlayService): 修改截图请求使用 FLV 地址，解决 RTSP 地址截图出现图像丢包模糊的问题 2022-11-30 16:32:28 +08:00
648540858 38a85d432a 修复合并的bug 2022-11-29 17:51:45 +08:00
648540858 ef6693aabb
Merge branch 'wvp-28181-2.0' into Zafu-Dev-1127 2022-11-29 15:18:56 +08:00
648540858 6c9d6f0054 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
 2022-11-29 13:16:20 +08:00
648540858 3aabbd6919 更新配置说明文件 2022-11-29 12:13:54 +08:00
648540858 14151c07e3 优化队列处理逻辑 2022-11-29 11:42:09 +08:00
WuPeng d60452560e 弃用废弃方法toJavaObject，改用to方法，消除编译警告。 2022-11-27 10:28:42 +08:00
648540858 f89491ada3 修复单端口模式下ssrc的释放 #667 2022-11-25 14:38:46 +08:00
648540858 fb957b0dba 优化注释 2022-11-25 12:12:35 +08:00
648540858 bdd9ff1fd7 优化okhttp并发参数 2022-11-25 11:57:46 +08:00
648540858 0629d4cf0d 清空级联录像记录 #672 2022-11-25 11:17:48 +08:00
648540858 afd22f8171 清空级联录像记录 #672 2022-11-25 11:16:47 +08:00
648540858 dfb87c7685 合并主线 2022-11-25 10:58:26 +08:00
648540858 d7623b5ca8 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/RequestSendItemMsg.java
 2022-11-25 10:57:53 +08:00
648540858 fa2ccb4ec8 修复协议端口配置不全导致前端播放页面无法弹出的问题 2022-11-25 10:50:16 +08:00
648540858 80d96042e7 优化语音对讲 2022-11-24 20:01:03 +08:00
648540858 12fa3b4c8d Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2022-11-23 09:57:17 +08:00
648540858 278264a2c6 优化拉流代理注释 2022-11-22 17:30:49 +08:00
648540858 8ea6e192d9 优化拉流代理表单以及逻辑 2022-11-22 17:17:35 +08:00
648540858 1469971102 支持配置设备上线时自动更新查询通道，修复通道刷新进度展示 2022-11-22 15:02:25 +08:00
648540858 1983b8b0a7 国标级联->选择通道支持移除目前下所有以及全部添加到目录下 2022-11-22 12:55:29 +08:00
648540858 6b03568c5d 优化rtcp判断 2022-11-21 17:07:54 +08:00
648540858 8cab9f23b0 修复使用来源IP作为流ip配置 2022-11-21 10:07:27 +08:00
648540858 ecf84bb0f1 合并主线 2022-11-18 21:52:02 +08:00
648540858 f223aad705 Merge branch '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/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.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/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.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/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.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
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/dialog/devicePlayer.vue
 2022-11-18 18:39:44 +08:00
648540858 86c08db266 移除重复方法 2022-11-18 17:29:22 +08:00
648540858 a02883b394 更新文档 2022-11-18 17:26:58 +08:00
648540858 946e1dc245 添加远程启动信令 2022-11-18 17:17:01 +08:00
648540858 5f7c53823a 清理过期的推流鉴权信息 2022-11-17 18:21:45 +08:00
648540858 6b8ecd1f9d 优化级联注册稳定性 2022-11-17 18:09:28 +08:00
648540858 23710f1c64 优化多网卡下的localIp获取 2022-11-17 17:01:54 +08:00
648540858 d340a37a00 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	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/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2022-11-17 11:31:30 +08:00
648540858 c04de4cd70 注释与日志优化 2022-11-17 10:04:05 +08:00
648540858 694076dc8c 优化国标级联发流并发能力 2022-11-16 09:39:27 +08:00
648540858 2466a24860 去除发送流端口范围 2022-11-10 16:48:17 +08:00
648540858 8870f5f5a1 优化使用来源ip作为流ip 2022-11-10 09:40:01 +08:00
648540858 eb2a4139fa 添加缺少的导入 2022-11-09 10:18:42 +08:00
648540858 96bb3814f6 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	web_src/src/components/dialog/devicePlayer.vue
#	web_src/src/components/live.vue
 2022-11-08 20:43:25 +08:00
648540858 c62a8986dd 优化线程休眠异常日志 2022-11-08 20:40:03 +08:00
648540858 cc4c4ac144 支持配置是否开去推流鉴权 2022-11-08 20:29:27 +08:00
648540858 4c8e2beb4d 优化hook处理速度 2022-11-08 19:58:36 +08:00
WuPeng ab909feedf 升级Fastjson到Fastjson2 2022-11-05 20:49:56 +08:00
ljm c56258ba8a 【同步设备通道】第一次收到同步请求应该将通道放入 不然会造成通道数量不一致 同步时也会漏掉第一个通道 2022-11-01 17:25:47 +08:00
648540858 aed45e0f0d 优化多网卡 2022-10-28 16:40:12 +08:00
648540858 1ab73f69eb 支持多网卡 2022-10-26 17:15:29 +08:00
648540858 f3454caaf6
Merge pull request #647 from L120820/wvp-28181-2.0 
【zlm心跳hook】重复查询redis了
 2022-10-25 14:43:12 +08:00
648540858 662a70e20f 修复设备信息后同步redis 2022-10-25 10:27:32 +08:00
648540858 0f0ece2401 设备编辑增加收流IP 2022-10-25 10:17:59 +08:00
648540858 958474c646 首页改造完成,添加系统信息 2022-10-24 18:14:31 +08:00
648540858 ca891f367c 首页改造完成,待添加系统信息 2022-10-24 15:20:35 +08:00
ljm d6fe626b1c 【zlm心跳hook】重复查询redis了 
变量也不需要多次定义
数据库有的话应该恢复zlm
缓存没有的话需要重新加载缓存
 2022-10-22 09:48:45 +08:00
648540858 3ffe205082 首页改造,完成cpu,内存,网络图 2022-10-20 18:03:40 +08:00
ljm 2bf7cdc2df 【zlm心跳hook】重复查询redis了 
变量也不需要多次定义
数据库有的话应该恢复zlm
 2022-10-20 16:04:47 +08:00
648540858 95d367702a 增加启动时清理redis中错误zlm数据 2022-10-19 16:25:38 +08:00
648540858 6dbc7a68bd 兼容设备通道信息中自己为自己父节点的情况 2022-10-19 11:20:23 +08:00
648540858 b25f3631ee 国标级联支持拉流代理自动拉起 2022-10-19 11:17:08 +08:00
648540858 b6bcb5f2f4 隐藏liveplayer 2022-10-19 10:28:51 +08:00
648540858 7bfa85424a 增加日志 2022-10-18 23:04:44 +08:00
648540858 84c60381cc 增加设备通道数为0时自动发起更新通道 2022-10-18 23:03:33 +08:00
648540858 f9ae4cfdbe 更新readme 2022-10-18 22:40:43 +08:00
648540858 1af77ab5f7
Merge pull request #645 from IKangXu/wvp-28181-2.0 
优化 国标设备中通道内查看的逻辑，保证与分屏与电子地图中树结构的数据一致
 2022-10-18 22:18:49 +08:00
648540858 c9fd7f940f 修复录像回放ssrc不一致无法播放的问题 2022-10-18 17:32:08 +08:00
648540858 3c52a16e5f 支持手动添加，为设备设置单独的密码 2022-10-18 17:02:05 +08:00
648540858 882e6a027e 去除多余引入 2022-10-18 14:37:33 +08:00
648540858 878dc33e6b 去除国标级联中ServerTransaction的使用 2022-10-18 14:30:39 +08:00
648540858 80d2edeef2 优化sip消息构建，去除ServerTransaction的使用 2022-10-18 13:07:38 +08:00
IKangXu 58b9dab89f 优化 分屏设备与电子地图中树结构展示信息 
优化 国标设备中通道内查看的逻辑，保证与分屏与电子地图中树结构的数据一致
 2022-10-18 09:27:12 +08:00
648540858 3e91483d4b 支持锁定编辑后的设备名 #642 2022-10-17 17:16:59 +08:00
648540858 f6320c7dd3 合并主线 2022-10-17 17:02:16 +08:00
648540858 82fd369ce5 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
 2022-10-17 16:56:13 +08:00
648540858 7918f03734 优化按需拉流配置，拉流代理支持按需拉流 2022-10-17 16:38:28 +08:00
648540858 1e1364e51a 修复开始点播功能接口调用返回参数与定义的不符 #635 2022-10-17 14:33:25 +08:00
648540858 2f11618199 修复用户删除失败，#636 2022-10-17 14:08:44 +08:00
648540858 6a2ff99515 合并主线 2022-10-17 12:47:02 +08:00
648540858 6bfd48776d Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2022-10-17 12:45:56 +08:00
648540858 0ff4ed217d 优化消息处理中存在可能异常的处理流程 2022-10-17 12:39:58 +08:00
648540858 c4fc4abf7c 优化代码空字符串判断 2022-10-17 09:39:21 +08:00
XiaoQiTong dabee4ed7d 增加指定流媒体收流功能 2022-10-15 20:57:24 +08:00
648540858 ad246bf921 去除ffmpeg模板配置 2022-10-14 23:11:47 +08:00
648540858 5bf1fe84ec 还原#640点播开始后的截图任务，判断启用https后使用https_fmp4流地址 2022-10-13 22:25:46 +08:00
duzeng a463b676e2 feat: 点播开始后的截图任务，判断启用https后使用https_fmp4流地址 
Signed-off-by: duzeng <duzengrass@163.com>
 2022-10-13 20:42:35 +08:00
jshqhxm c18dd55c74 去除 com.sun.javafx 无引用包，会导致在linux环境下编译不通过 2022-10-09 16:20:39 +08:00
648540858 a4f48a1522 修复回看控制失效 #619 2022-09-30 17:54:58 +08:00
648540858 e1af52fb5e 更新文档 2022-09-30 15:51:28 +08:00
648540858 06bbe3fe01 添加第二种语音对讲实现 2022-09-29 16:27:59 +08:00
648540858 ebe8667b13 Merge branch 'wvp-28181-2.0' 2022-09-26 15:40:31 +08:00
648540858 386b48192d 修复点播时viatag不规范的问题 2022-09-26 15:38:55 +08:00
648540858 6ae33f2a67 修复空指针 2022-09-26 14:01:22 +08:00
648540858 2ff3cdb6a1 Merge branch '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/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2022-09-26 11:25:53 +08:00
648540858 30979eb6ea
Merge pull request #627 from 648540858/wvp-dialog 
修复兼通api错误
 2022-09-26 10:41:04 +08:00
648540858 3fb9694c2d 修复兼通api错误 2022-09-26 10:40:20 +08:00
648540858 bf97908c5e
Merge pull request #626 from 648540858/wvp-dialog 
合并bug修复
 2022-09-26 10:38:48 +08:00
648540858 0cc5917d8a 修复通道更新 2022-09-26 10:14:31 +08:00
648540858 559fbf1258 添加缺失的打印信息 2022-09-26 10:02:26 +08:00
648540858 d7a1b94f90 Merge branch '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/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
 2022-09-24 21:04:58 +08:00
648540858 d176b5231b
Merge pull request #620 from xu-bin-bin/wvp-28181-2.0 
处理上级平台发送的invite请求不携带“y=”sdp信息时，使用默认“y=0000000000”视频无法播放的问题。
 2022-09-23 23:18:06 +08:00
648540858 4c6c77be7a 异常情况打印信息优化 2022-09-23 23:15:44 +08:00
648540858 cd117ed228 dialog去除以及异常情况处理优化 2022-09-23 23:15:39 +08:00
xubinbin fc7f1b3459 处理上级平台发送的invite请求不携带“y=”sdp信息时，使用默认“y=0000000000”视频无法播放的问题。 2022-09-23 10:55:42 +08:00
648540858 a574ff0944 修复使用队列导致的问题 2022-09-22 16:56:20 +08:00
648540858 70c20364af 修复流注销时移除流认证信息 2022-09-22 14:10:26 +08:00
648540858 1abfced3b4 修复点播后bye信息的发送 2022-09-22 11:32:01 +08:00
648540858 5e73874880 添加队列处理redis消息和sip消息，支持使用推流状态作为通道在线状态 2022-09-22 11:22:08 +08:00
648540858 710600db6f 优化sip消息，去除自动dialog创建 2022-09-21 18:18:37 +08:00
648540858 692f716788 优化点播时RtpServer为正常关闭的问题 2022-09-16 18:02:56 +08:00
648540858 ab74d1cff9 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
 2022-09-14 20:51:21 +08:00
648540858 5b3dc4d595 优化点播结束后关闭RTPServer 2022-09-14 16:11:18 +08:00
648540858 250a059ca0 优化目录发送 2022-09-13 14:53:41 +08:00
648540858 243edbd143 为User-Agent添加必要的版本信息 2022-09-09 23:19:19 +08:00
648540858 221f99c764 优化sip消息 2022-09-09 17:06:19 +08:00
648540858 b5fb82934e 修复发送目录信息是状态错误 2022-09-08 21:22:49 +08:00
648540858 bd5b9ca1f7 获取实际内容长度，不使用header中的长度信息 2022-09-08 20:20:43 +08:00
648540858 feb9996538 修复添加业务分组失败 2022-09-08 17:51:12 +08:00
648540858 394c40d8bb 修复目录订阅的状态异常 2022-09-08 16:42:46 +08:00
648540858 4bda14b098 修复cseq序号回退 2022-09-08 15:27:47 +08:00
648540858 a6f9c090cb 重启服务时上级平台直接注销再注册 2022-09-08 10:50:44 +08:00
648540858 2f76fa98bb Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	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/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
 2022-09-08 09:46:35 +08:00
648540858 6a5ab117f5 修复推流列表状态过滤 2022-09-08 09:21:11 +08:00
648540858 f1c7d612ca
Merge pull request #590 from ixingqiao/wvp-28181-2.0 
1.解决轮询内存增长过快问题
 2022-09-08 09:19:57 +08:00
648540858 60c4f767f0 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-09-07 16:18:52 +08:00
648540858 ec0ec5eb54 修复并发点播时可能出现的rtpServer开启但是还未收到流的情况，编码类型136，137,138默认开启音频通道 2022-09-07 16:18:35 +08:00
jiang 3884e9a56a 1.根据redis消息更新推流列表时同时更新在线状态 
2.推流列表的模板增加在线状态
 2022-09-07 15:56:48 +08:00
648540858 e7bdcc1f8d 修复选择通道时默认节点显示错误的问题 2022-09-06 16:31:28 +08:00
648540858 d5e8aa62a1 添加对海康平台录像回放的兼容，修复录像信息发送失败, 级联平台支持开启rtcp保活 2022-09-05 17:10:21 +08:00
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 0134488428 优化推流列表查询 2022-09-02 17:00:41 +08:00
648540858 ee7ef0bf41 优化级联平台注册的周期时间 2022-09-02 15:49:40 +08:00
648540858 7db2bf7b51 使用equalsIgnoreCase代替equals,忽略大小写差异 2022-09-02 10:51:55 +08:00
648540858 b46e5efad2 测试sip消息预处理 2022-09-01 22:27:18 +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 8b6449ce3a 升级版本号 2022-08-29 09:55:09 +08:00
648540858 9f680a2e9e 修复bug以及日志按照，错误/sip/数据库 分割 2022-08-26 18:03:09 +08:00
xingqiao 3c025a5ac0 1.解决轮询内存增长过快问题 2022-08-26 11:03:43 +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 942c5caa7c Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-08-23 11:00:57 +08:00
648540858 f24b6fa13f 优化国标录像的异常判断 2022-08-23 11:00:46 +08:00
648540858 c0e5478a84 Merge branch 'wvp-28181-2.0' 2022-08-23 08:45:38 +08:00
648540858 89a2e62702 Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0 2022-08-22 23:01:52 +08:00
648540858 977bab158b 修复使用ssl的配置 2022-08-22 23:00:13 +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
zx 4ee8924bd9
fix PlatformKeepaliveExpireEvent typo 2022-08-19 21:55:59 +08:00
648540858 117387be8f 更新在线文档的等新方式 2022-08-19 17:22:08 +08:00
648540858 7f05c91176 依赖包版本升级 2022-08-19 17:12:03 +08:00
648540858 1a9e49d9ff 依赖包版本升级 2022-08-19 17:11:51 +08:00
jiang 8f77d0c25c 根据redis消息更新推流列表 2022-08-18 16:17:23 +08:00
jiang b67841b319 实时直播 - 开始直播接口返回值增加WEBRTC字段 2022-08-18 15:32:12 +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 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
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 97d4599390 修复二级目录添加失败的问题 2022-08-02 11:34:56 +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