648540858
|
db6dd3f755
|
Merge branch 'wvp-28181-2.0' into main-dev
# 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/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-19 11:33:58 +08:00 |
|
648540858
|
deeff5533b
|
添加兼容目录同步兼容性
|
2023-07-05 17:20:20 +08:00 |
|
648540858
|
975ace051b
|
Merge branch 'wvp-28181-2.0' into main-dev
# 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/media/zlm/ZLMRTPServerFactory.java
|
2023-07-01 18:28:28 +08:00 |
|
648540858
|
2d4bbbea8e
|
优化更新通道的civicode判断
|
2023-06-29 17:10:14 +08:00 |
|
648540858
|
c014a90cc6
|
Merge branch 'wvp-28181-2.0' into main-dev
# 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
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-06-29 16:08:05 +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
|
a77628e875
|
优化端口预占用，防止占用无法释放
|
2023-06-28 14:50:46 +08:00 |
|
648540858
|
5a7a7a12bd
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.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/response/impl/InviteResponseProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
# src/main/resources/all-application.yml
# web_src/config/index.js
# web_src/src/components/dialog/devicePlayer.vue
|
2023-06-27 16:46:26 +08:00 |
|
648540858
|
155838ce2e
|
优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895
|
2023-06-22 22:35:35 +08:00 |
|
648540858
|
0532363192
|
优化国标级联注册机制
|
2023-06-20 09:29:12 +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 |
|
648540858
|
319cdd2151
|
优化移动位置的时间
|
2023-06-14 20:39:10 +08:00 |
|
648540858
|
fa80ba6f2b
|
修复sdp解析错误
|
2023-06-12 22:54:40 +08:00 |
|
648540858
|
446f729e55
|
优化sdp解析，兼容带有f=的设备
|
2023-06-10 00:32:42 +08:00 |
|
648540858
|
ca715e0234
|
优化via的branch生成规则
|
2023-06-07 21:45:15 +08:00 |
|
648540858
|
5639719879
|
Merge branch 'postgresql' into wvp-28181-2.0
|
2023-05-29 09:25:45 +08:00 |
|
shanyuanzz
|
5ebd788cef
|
优化低倍速下zoom变倍速率
1.优化zoom缩放在1-FH低倍速下的变倍速率。
避免变倍速率过大或者某些相机无法变倍的问题。
|
2023-05-28 14:01:51 +08:00 |
|
648540858
|
30ae9e929f
|
合并主线
|
2023-05-25 17:28:57 +08:00 |
|
648540858
|
5d40080468
|
优化部分sql实现
|
2023-05-15 15:29:39 +08:00 |
|
648540858
|
269ad8cedb
|
修身目录刷新，优化公网下远程IP端口的获取
|
2023-04-23 14:36:13 +08:00 |
|
648540858
|
5c3c3e6a4c
|
修复消息发送失败导致后续次通道无法点播的bug
|
2023-04-21 14:18:52 +08:00 |
|
648540858
|
5c5699ae11
|
redis优化
|
2023-04-13 17:14:04 +08:00 |
|
648540858
|
039fbf7e24
|
Merge branch 'talk' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.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/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2023-03-20 14:32:53 +08:00 |
|
648540858
|
019d95cfba
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2023-02-22 18:08:25 +08:00 |
|
648540858
|
663130df45
|
完善支持语音对讲talk
|
2023-02-19 12:46:53 +08:00 |
|
648540858
|
7be636f8b8
|
修复更新通道是更新各个坐标系德位置信息
|
2023-02-15 18:30:35 +08:00 |
|
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 |
|
gaofw189
|
55ee6f5f0d
|
修复WVP作为下级平台接受devicecontrol命令处理-调试修改逻辑
|
2023-02-07 09:26:08 +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
|
c1145a8163
|
优化级联注册，以及sip日志
|
2022-12-12 10:28:36 +08:00 |
|
648540858
|
1516991372
|
回滚via获取地址的方式
|
2022-12-06 17:12:12 +08:00 |
|
648540858
|
131ea77669
|
接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址
|
2022-12-06 10:33:43 +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 |
|
WuPeng
|
ab909feedf
|
升级Fastjson到Fastjson2
|
2022-11-05 20:49:56 +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
|
74714711aa
|
优化sip消息构建，去除ServerTransaction的使用
|
2022-10-18 17:35:42 +08:00 |
|
648540858
|
06bbe3fe01
|
添加第二种语音对讲实现
|
2022-09-29 16:27:59 +08:00 |
|
648540858
|
cd117ed228
|
dialog去除以及异常情况处理优化
|
2022-09-23 23:15:39 +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
|
394c40d8bb
|
修复目录订阅的状态异常
|
2022-09-08 16:42:46 +08:00 |
|
648540858
|
ec0ec5eb54
|
修复并发点播时可能出现的rtpServer开启但是还未收到流的情况，编码类型136，137,138默认开启音频通道
|
2022-09-07 16:18:35 +08:00 |
|
648540858
|
2de4c322f6
|
去除对redis key过期事件的使用；重构国标级联的注册保活
|
2022-08-31 11:29:13 +08:00 |
|
648540858
|
5461b8ebf2
|
支持全局异常和统一返回结果，未完待续
|
2022-08-22 16:17:28 +08:00 |
|
648540858
|
142efdd915
|
修复单个添加的推流级联国标的问题
|
2022-08-05 09:48:13 +08:00 |
|
648540858
|
4451994959
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
|
648540858
|
8aa0bdf539
|
数据库优化
|
2022-07-06 09:44:37 +08:00 |
|