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
|
6484f52e46
|
同时支持打包为Jar和War
|
2023-02-07 20:59:33 +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
|
0f0ece2401
|
设备编辑增加收流IP
|
2022-10-25 10:17:59 +08:00 |
|
648540858
|
55b53caef1
|
支持手动添加，为设备设置单独的密码
|
2022-10-18 17:35:44 +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 |
|
XiaoQiTong
|
dabee4ed7d
|
增加指定流媒体收流功能
|
2022-10-15 20:57:24 +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
|
e78c402a24
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# sql/mysql.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-07-03 10:32:33 +08:00 |
|
648540858
|
f5fcc79a2c
|
优化国标树型展示
|
2022-07-03 07:40:54 +08:00 |
|
648540858
|
26739237e2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.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/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# web_src/src/components/dialog/deviceEdit.vue
# web_src/src/components/dialog/devicePlayer.vue
|
2022-06-27 10:16:21 +08:00 |
|
648540858
|
c2faa8c3ce
|
显示效果优化
|
2022-06-15 16:04:36 +08:00 |
|
648540858
|
c022213972
|
设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84
|
2022-06-14 17:00:24 +08:00 |
|
648540858
|
c2aaae9325
|
初步实现语音喊话
|
2022-05-09 18:15:30 +08:00 |
|
648540858
|
ca16a79255
|
添加语音发送通道和语音接收通道字段
|
2022-05-07 09:52:02 +08:00 |
|
648540858
|
4d975c21da
|
优化国标级联目录推送，支持zlm新特性ssrc校验
|
2022-04-19 11:52:03 +08:00 |
|
648540858
|
f10b458fc9
|
优化订阅信息的发送与取消订阅
|
2022-04-08 14:44:49 +08:00 |
|
648540858
|
7e755f405d
|
支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug
|
2022-04-01 16:45:29 +08:00 |
|
648540858
|
e8090bc84c
|
修复bug与目录订阅添加最小值60
|
2022-01-19 10:23:52 +08:00 |
|
648540858
|
bc82662e90
|
升级invite+subscribe的cseq为递增
|
2021-12-15 09:27:12 +08:00 |
|
648540858
|
720231d33f
|
添加发送媒体流, 添加媒体服务器节点管理ui,修复修改密码
|
2021-09-25 22:12:15 +08:00 |
|
648540858
|
5e8a7ce21e
|
添加utf-8解析设备信息
|
2021-09-13 16:08:40 +08:00 |
|