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,861 Commits
17 Branches
1 Tag
55 MiB
Commit Graph

106 Commits (51634b1b96fab233c6735c82c747b7de5423bf86)

Author SHA1 Message Date
648540858 d48f89eee4 修复端口分配的并发问题 2023-07-24 09:04:47 +08:00
648540858 668dc8f0dd Merge branch '2.6.8' into 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/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
 2023-07-13 14:47:24 +08:00
648540858 885842249f 优化第三方对接接口 2023-07-07 18:17:24 +08:00
648540858 43ef195543 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
 2023-07-03 16:54:09 +08:00
648540858 ba8fffd907 增加与第三方对接的接口 2023-07-03 16:53:03 +08:00
648540858 f62bf7b2c6 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Gb28181Sdp.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/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/utils/SipUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
 2023-06-29 09:52:05 +08:00
648540858 c7d1515023 增加redis通道 2023-06-27 15:34:38 +08:00
648540858 155838ce2e 优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895 2023-06-22 22:35:35 +08:00
648540858 9e28923b8c
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2023-06-20 14:15:27 +08:00
648540858 6b3732b8c4 Merge branch '2.6.8' into wvp-28181-2.0 
# 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/gb28181/utils/XmlUtil.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
#	src/main/resources/all-application.yml
#	web_src/package-lock.json
 2023-06-19 20:19:31 +08:00
648540858 8942ab0112 优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范 2023-06-19 18:42:36 +08:00
‘sxh’ 652489b47e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2023-06-15 11:10:20 +08:00
‘sxh’ 15df08964b 新增设备主子码流选择，默认为不开启 2023-06-15 11:00:29 +08:00
648540858 534be3f580 支持redis消息强制关闭流 2023-06-07 20:58:35 +08:00
648540858 b7f2a6b25b Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
 2023-06-07 20:21:10 +08:00
648540858 97b04c4dba 修复录像下载，优化拉流代理接口 2023-06-07 20:15:08 +08:00
648540858 e2f9ee8f7b 修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题 2023-05-06 17:40:57 +08:00
648540858 0f50904992 支持设备/通道状态变化时发送redis通知 2023-04-20 10:26:42 +08:00
648540858 d46fc9de82 优化下级平台自定义ssrc的情况，优化国标录像下载流程 2023-04-14 14:59:22 +08:00
648540858 66234dc288 优化点播后截图以及截图的展示 2023-03-22 15:21:22 +08:00
xiaoQQya df9f6a8927 perf(streamInfo): 优化点播接口返回流信息中的 RTMP/RTSP/RTC 链接 2023-03-22 15:21:22 +08:00
648540858 22a205e8fc 优化异常处理 2023-03-17 14:02:16 +08:00
648540858 c3ce2bc5d0 优化异常处理以及级联设备状态查询 2023-03-17 13:22:05 +08:00
gaofw189 39199a1daa 优化WVP作为下级平台查询设备录像列表上报缓慢问题 2023-02-13 10:37:00 +08:00
gaofw189 5462b1f6c6 去除lombok依赖-后续考虑引入 2023-02-09 09:20:46 +08:00
gaofw189 55ee6f5f0d 修复WVP作为下级平台接受devicecontrol命令处理-调试修改逻辑 2023-02-07 09:26:08 +08:00
gaofw189 7a9f001dcb 修复WVP作为下级平台接收上级平台DeviceControl信令不做处理的问题。 2023-02-02 18:21:25 +08:00
648540858 a82b831b8b 优化设备状态保持，自动记录心跳间隔，三次心跳失败则设备离线，不在使用设备有效期字段作为唯一判断标准，提高容错能力和稳定性。 2023-01-04 10:39:40 +08:00
648540858 fa2ccb4ec8 修复协议端口配置不全导致前端播放页面无法弹出的问题 2022-11-25 10:50:16 +08:00
648540858 23710f1c64 优化多网卡下的localIp获取 2022-11-17 17:01:54 +08:00
648540858 8870f5f5a1 优化使用来源ip作为流ip 2022-11-10 09:40:01 +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
WuPeng ab909feedf 升级Fastjson到Fastjson2 2022-11-05 20:49:56 +08:00
648540858 aed45e0f0d 优化多网卡 2022-10-28 16:40:12 +08:00
648540858 958474c646 首页改造完成,添加系统信息 2022-10-24 18:14:31 +08:00
648540858 ca891f367c 首页改造完成,待添加系统信息 2022-10-24 15:20:35 +08:00
648540858 3ffe205082 首页改造,完成cpu,内存,网络图 2022-10-20 18:03:40 +08:00
648540858 470be2dc36 修复开始点播功能接口调用返回参数与定义的不符 #635 2022-10-18 17:35:32 +08:00
648540858 a4f48a1522 修复回看控制失效 #619 2022-09-30 17:54:58 +08:00
648540858 5b3dc4d595 优化点播结束后关闭RTPServer 2022-09-14 16:11:18 +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 1a9e49d9ff 依赖包版本升级 2022-08-19 17:11:51 +08:00
jiang 8f77d0c25c 根据redis消息更新推流列表 2022-08-18 16:17:23 +08:00
648540858 c041aaccb4 修复录像回放中的信令错误 2022-08-15 15:08:51 +08:00
648540858 81f69eb6f4 支持从redis消息更新推流设备状态 2022-07-12 17:33:17 +08:00
648540858 afbec28906 增加推流鉴权。保护服务安全 2022-07-11 16:21:01 +08:00
648540858 e0344ccf97 国标级联推送推流 支持多wvp间自动选择与推送 2022-06-14 14:37:34 +08:00
648540858 f6893cf95b 优化设备在线状态 2022-05-11 18:37:24 +08:00
648540858 5d901b5e3f 使用阿里代码规范。规范代码写法 2022-05-06 10:12:34 +08:00