Commit Graph

1401 Commits (06bbe3fe01e5af9486c309693a975077df813f7c)

Author SHA1 Message Date
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 fa06602910 Merge branch 'wvp-28181-2.0' of https://github.com/ixingqiao/wvp-GB28181-pro into wvp-28181-2.0 2022-08-26 11:53:28 +08:00
xingqiao d66aab2e83 剔除lettuce 解决轮播场景下的redis读写超时问题 2022-08-26 11:53:11 +08:00
百鸣 0a404e2389
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-08-26 11:49:43 +08:00
648540858 938064199b 去除文档捐赠 2022-08-26 11:06:50 +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
648540858 ecd14d6757
Merge pull request #578 from urmyfaith/patch-1
fix PlatformKeepaliveExpireEvent typo
2022-08-22 15:03:18 +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 2591997dfc 修复文档错误 2022-08-12 10:00:18 +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
648540858 eb177a6742
Merge pull request #570 from TristingChen/optimize--play-complete
优化--直播接口流程结束异步处理截图操作,提高接口响应速度和并发能力
2022-08-09 17:34:36 +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
648540858 a88518f8b5 更新文档 2022-08-09 10:58:38 +08:00
648540858 842be1a485 更新文档 2022-08-09 10:57:33 +08:00