lin
|
27c7969b8f
|
更新README
|
2025-09-12 10:35:24 +08:00 |
|
lin
|
48eff320fd
|
[1078] 适配abl的播放1078
|
2025-07-09 12:32:31 +08:00 |
|
648540858
|
799932f614
|
优化日志以及属性设置代码
|
2024-07-03 16:14:18 +08:00 |
|
panlinlin
|
7b46769a16
|
修复国标录像下载后负载统计未清除的BUG
|
2024-06-13 23:15:51 +08:00 |
|
648540858
|
da2662ab27
|
国标28181-支持自动识别网卡监听，可以不再配置SIP.IP
|
2024-06-13 18:10:01 +08:00 |
|
648540858
|
6dd870e74c
|
修复点播端口为空
|
2024-04-09 10:59:59 +08:00 |
|
648540858
|
8b90fade9e
|
支持使用abl接收国标流
|
2024-04-02 00:05:09 +08:00 |
|
648540858
|
33b75be71a
|
支持abl hook
|
2024-04-01 18:21:38 +08:00 |
|
648540858
|
b90dc789b4
|
优化媒体节点服务的代码结构
|
2024-03-21 23:39:32 +08:00 |
|
648540858
|
181bf76862
|
优化节点在线状态
|
2024-03-20 18:54:39 +08:00 |
|
648540858
|
2e7c9a7341
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.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/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/AssistRESTfulUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.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/storager/dao/PlatformChannelMapper.java
# src/main/resources/all-application.yml
# src/main/resources/application-dev.yml
|
2024-02-07 20:30:37 +08:00 |
|
648540858
|
0c10c77a56
|
优化录像路径的设置
|
2024-01-10 11:14:49 +08:00 |
|
648540858
|
ffc8a530f3
|
修复定时录像删除
|
2023-11-24 10:47:33 +08:00 |
|
648540858
|
5d3f307b44
|
将录像存储路径迁移至wvp中配置，assist以有在需要视频合成的时候才会用
|
2023-11-01 14:07:32 +08:00 |
|
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
|
ef5018de2d
|
修复合并错误
|
2023-07-13 14:57:30 +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
|
04e7f48fde
|
合并主线的发流端口管理逻辑
|
2023-07-10 14:30:59 +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
|
b64f320805
|
优化发流逻辑
|
2023-07-01 18:10:33 +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
|
57192a49d1
|
修复引入的错误Order
|
2023-05-29 20:18:42 +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
|
2d2832dbe9
|
优化各个配置启动顺序
|
2023-02-22 18:01:30 +08:00 |
|
648540858
|
80d96042e7
|
优化语音对讲
|
2022-11-24 20:01:03 +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
|
2466a24860
|
去除发送流端口范围
|
2022-11-10 16:48:17 +08:00 |
|
648540858
|
aed45e0f0d
|
优化多网卡
|
2022-10-28 16:40:12 +08:00 |
|
648540858
|
688e222dcc
|
优化按需拉流配置，拉流代理支持按需拉流
|
2022-10-18 17:35:32 +08:00 |
|
648540858
|
cd117ed228
|
dialog去除以及异常情况处理优化
|
2022-09-23 23:15:39 +08:00 |
|
648540858
|
710600db6f
|
优化sip消息，去除自动dialog创建
|
2022-09-21 18:18:37 +08:00 |
|
648540858
|
5461b8ebf2
|
支持全局异常和统一返回结果，未完待续
|
2022-08-22 16:17:28 +08:00 |
|
648540858
|
78fac69cd5
|
支持sdp ip 配置为域名
|
2022-05-19 17:00:47 +08:00 |
|
648540858
|
f6893cf95b
|
优化设备在线状态
|
2022-05-11 18:37:24 +08:00 |
|
648540858
|
c1d7f867c2
|
优化目录订阅以及国标级联目录订阅回复
|
2022-03-10 20:53:56 +08:00 |
|
648540858
|
5bcd8495e0
|
兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。
|
2022-02-20 16:22:43 +08:00 |
|
648540858
|
9b1af8ef13
|
适配zlm的hook保活
|
2021-12-07 21:13:55 +08:00 |
|
648540858
|
a2f0854138
|
优化通道录入性能，优化启动后读取配置写入数据库的过程
|
2021-12-07 17:43:55 +08:00 |
|
648540858
|
715c7d2724
|
docker镜像使用自动生成的配置文件，修复#166
|
2021-09-26 14:32:42 +08:00 |
|
648540858
|
720231d33f
|
添加发送媒体流, 添加媒体服务器节点管理ui,修复修改密码
|
2021-09-25 22:12:15 +08:00 |
|
648540858
|
96bc081ea9
|
添加用户操作接口
|
2021-08-05 12:35:54 +08:00 |
|
lawrencehj
|
99d7bea977
|
去除多余Import
|
2021-07-28 09:46:08 +08:00 |
|
lawrencehj
|
719585bfda
|
解决hook.ip未设置时不能设默认值的问题
|
2021-07-28 09:41:29 +08:00 |
|
64850858
|
3469271ec2
|
优化集群方案， 每个zlm一套ssrc；
优化集群下的docker接入逻辑；
更正sql脚本；
支持重启不设置设备离线。重启SIP事务不丢失
|
2021-07-26 11:40:32 +08:00 |
|
lawrencehj
|
87e7d0026f
|
解决@value注解无法赋默认值问题
|
2021-07-23 16:56:32 +08:00 |
|
64850858
|
89a9ab4534
|
添加zlm集群支持
|
2021-07-16 16:34:51 +08:00 |
|
64850858
|
e48ef997c0
|
更换播放器， 修正和优化sql脚本，
|
2021-07-14 15:57:39 +08:00 |
|
64850858
|
0faa593658
|
规范配置文件，添加接口鉴权的例外接口配置
|
2021-07-06 16:38:31 +08:00 |
|
lawrencehj
|
f92a5da7c2
|
去除多余引用
|
2021-06-22 12:51:56 +08:00 |
|
64850858
|
ecb5b69101
|
增加同步通道超时时间，修复hookIP空字符串时的hookIP的默认值赋值
|
2021-06-09 09:28:29 +08:00 |
|