648540858
|
107caf1171
|
调整前端使用转码后的流
|
2024-06-14 17:24:57 +08:00 |
|
panlinlin
|
317c5455c6
|
修复位置信息保存失败的BUG
|
2024-06-13 23:19:26 +08:00 |
|
648540858
|
2cf7178cb7
|
Merge branch 'refs/heads/2.7.1'
|
2024-06-11 10:14:14 +08:00 |
|
648540858
|
f8ef14bfea
|
修复移动位置位置订阅上报间隔为0的bug
|
2024-06-11 10:08:13 +08:00 |
hexq
|
09efdef4ce
|
解决MacOS 14寸 M2：最新Chrome国标设备通道“直播”Jessibuca播放下方出现黑屏的兼容BUG
|
2024-05-16 13:25:06 +08:00 |
BradyXu
|
7565b2ea77
|
fix 优化及联本地IP选择
|
2024-05-15 23:28:38 +08:00 |
|
BradyXu
|
a8c424e49d
|
修复sip绑定监听多网卡IP时，新增上级平台新增失败的问题，本地IP改成从配置的多IP下拉选择
|
2024-05-12 02:00:55 +08:00 |
|
648540858
|
fa8ff09b42
|
新功能-云端录像列表支持下载
|
2024-04-30 17:53:31 +08:00 |
|
648540858
|
69185d3db8
|
修复云端录像下载
|
2024-04-30 17:51:15 +08:00 |
|
648540858
|
2ae4226e89
|
修复云端录像按年月查询时时间条件错误的BUG
|
2024-04-30 15:45:39 +08:00 |
|
648540858
|
78c2b5a63d
|
修复云端录像详情页时间显示错误
|
2024-04-30 15:36:32 +08:00 |
|
648540858
|
b6e604f244
|
修改云端录像详情页使用直接访问zlm的方式播放录像
|
2024-04-30 15:20:03 +08:00 |
|
648540858
|
d41d6b34af
|
Merge branch 'refs/heads/2.7.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.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/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
# src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
# src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
# src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
|
2024-04-23 20:59:20 +08:00 |
|
648540858
|
313243195e
|
修复通道位置的展示
|
2024-04-17 17:56:36 +08:00 |
|
648540858
|
0f4b5eed7d
|
优化apikey列表样式
|
2024-04-10 23:09:28 +08:00 |
|
648540858
|
b45d71ba6d
|
Merge pull request #1389 from ancienter/develop-add-api-key
[add]新增ApiKey管理功能
|
2024-04-10 22:56:14 +08:00 |
|
648540858
|
31be0a3874
|
更新webrtc调用
|
2024-04-10 22:44:19 +08:00 |
leesam
|
16b7e4a7ef
|
Merge branch 'refs/heads/master' into develop-add-api-key
|
2024-04-10 20:49:44 +08:00 |
|
648540858
|
b1b6fae22c
|
Merge branch 'master' into dev/zlm
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
|
2024-04-09 10:35:11 +08:00 |
ancienter
|
25ff2fc4ef
|
Merge branch '648540858:master' into develop-add-api-key
|
2024-04-09 09:52:23 +08:00 |
|
648540858
|
a890b62fa1
|
Merge branch '2.7.0'
|
2024-04-08 18:13:33 +08:00 |
|
648540858
|
48351c875e
|
国标级联支持制定200OK中sdp的IP
|
2024-04-08 18:13:15 +08:00 |
|
648540858
|
b7b950ec8b
|
支持展示abl-logo
|
2024-04-01 16:47:45 +08:00 |
|
648540858
|
0324855190
|
Merge branch 'master' into dev/abl支持
|
2024-03-29 22:55:09 +08:00 |
|
648540858
|
d34371a9f9
|
优化通道列表按钮排列
|
2024-03-28 23:06:27 +08:00 |
|
648540858
|
7dda1f6a2e
|
Merge branch 'master' into dev/abl支持
|
2024-03-27 17:18:35 +08:00 |
|
648540858
|
e886aa4833
|
修复PTZType导致声音开关失效的问题
|
2024-03-27 11:15:35 +08:00 |
|
648540858
|
08696a57d3
|
Merge branch 'master' into dev/abl支持
|
2024-03-22 14:28:24 +08:00 |
Kairlec
|
afed8161b1
|
fix webrtc player assert failed because media empty
|
2024-03-21 14:25:45 +08:00 |
|
648540858
|
181bf76862
|
优化节点在线状态
|
2024-03-20 18:54:39 +08:00 |
|
leesam
|
76208975bf
|
[add]支持其他平台通过ApiKey调用系统相关接口
|
2024-03-19 16:53:01 +08:00 |
|
648540858
|
97dc926b28
|
调整ptzType字段名称
|
2024-03-18 17:41:49 +08:00 |
|
648540858
|
010e73b0c7
|
修复弹窗播放和分屏播放窗口尺寸异常的BUG
|
2024-03-11 22:56:24 +08:00 |
|
648540858
|
ad4e61d7e7
|
修复页面开启音频失败
|
2024-03-11 14:22:40 +08:00 |
|
648540858
|
509d9b3cbb
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
|
2024-02-27 10:22:13 +08:00 |
|
648540858
|
f6c48588da
|
支持支持主码流子码流切换
|
2024-02-22 17:22:28 +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
|
33b125262b
|
优化jessibuca播放窗口尺寸
|
2024-01-31 11:07:31 +08:00 |
|
648540858
|
3436e73e72
|
修复云端录像时间显示错误
|
2024-01-30 10:55:41 +08:00 |
|
648540858
|
97a87542a6
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# pom.xml
|
2024-01-22 10:37:13 +08:00 |
|
648540858
|
79c8447298
|
支持使用多数据源
|
2024-01-22 00:29:09 +08:00 |
|
648540858
|
88721511e7
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-16 14:51:17 +08:00 |
|
648540858
|
9b62fbe467
|
优化设备编辑页面
|
2024-01-15 18:36:31 +08:00 |
|
648540858
|
1af6324a09
|
优化jessibuca播放器
|
2024-01-08 17:30:48 +08:00 |
|
648540858
|
07b182da98
|
Merge branch 'wvp-28181-2.0' into feature/record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
|
2023-12-26 15:38:40 +08:00 |
xiaoQQya
|
9ae520a58a
|
feat(channel): 新增通道支持自定义名称、位置及云台类型
|
2023-12-19 15:22:09 +08:00 |
|
648540858
|
67d1ff0d26
|
Merge branch 'wvp-28181-2.0' into feature/record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-12-18 14:23:48 +08:00 |
|
648540858
|
92e5ed2e30
|
优化前端云端录像的播放
|
2023-12-06 16:10:32 +08:00 |
|
648540858
|
7e136c9ac7
|
完成下载文件的前后调试
|
2023-12-06 15:11:21 +08:00 |
|
648540858
|
ad36354ef4
|
优化国标录像服务端，使用zlm新接口实现功能
|
2023-12-05 11:29:05 +08:00 |
|
xiaoQQya
|
a30ff222ec
|
fix(player): 修复分屏页面视频无法自动播放的问题
|
2023-11-07 09:37:40 +08:00 |
|
xiaoQQya
|
f78657473e
|
fix(报警推送): 修复报警推送功能无效的问题
该问题原因为 com.genersoft.iot.vmp.conf.GlobalResponseAdvice 类改变了 sse 响应体的数据结构，导致前端无法正确解析 sse 数据，调试后未发现 GlobalResponseAdvice 如何修改的 sse 数据结构，故根据 sse 消息体结构自定义实现了 sse 连接
|
2023-11-06 20:34:58 +08:00 |
|
xiaoQQya
|
e1d604a560
|
feat: 升级 Jessibuca 播放器到 2023-09-15 v3.1.36 版本，优化部分配置
|
2023-10-25 17:44:07 +08:00 |
|
648540858
|
9b036fb71d
|
优化云端录像页面
|
2023-10-18 15:33:31 +08:00 |
|
648540858
|
92a25393f3
|
基于新的云端录像实现页面功能
|
2023-10-17 17:55:40 +08:00 |
|
648540858
|
5a75381a00
|
基于新的云端录像结构实现国标录像
|
2023-10-17 15:34:01 +08:00 |
|
648540858
|
7aa8444e67
|
临时提交
|
2023-10-13 18:25:36 +08:00 |
|
648540858
|
e4d37864d1
|
开始重构云端录像继续
|
2023-10-13 15:26:51 +08:00 |
|
648540858
|
7de73ebd2b
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
|
2023-10-11 01:36:12 +08:00 |
|
648540858
|
b9a33f03d6
|
国标级联支持添加通道后主动推动到上级
|
2023-09-22 17:46:31 +08:00 |
|
648540858
|
4df90d9ba4
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2023-09-20 09:17:28 +08:00 |
|
648540858
|
a6fb1cdb74
|
修复Web页面播放国标录像无声音的问题
|
2023-09-11 16:17:29 +08:00 |
|
648540858
|
88350873ee
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# 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/info/InfoRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.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/service/impl/MediaServerServiceImpl.java
|
2023-09-11 11:21:50 +08:00 |
|
648540858
|
d739017678
|
适配assist新的命名规则
|
2023-08-31 16:41:44 +08:00 |
|
648540858
|
91e49745e4
|
修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化
|
2023-08-16 01:55:50 +08:00 |
|
648540858
|
becea82736
|
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/ZLMHttpHookListener.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
|
2023-07-04 10:10:48 +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
|
4604aaea99
|
优化语音对讲支持根据设备设置释放收到ACK后开始发流
|
2023-07-02 13:53:45 +08:00 |
|
648540858
|
3571ca272b
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# web_src/config/index.js
|
2023-07-02 12:42:05 +08:00 |
|
648540858
|
8237cd25af
|
修复添加拉流代理提交错误
|
2023-07-01 22:50:24 +08:00 |
|
648540858
|
228c57399a
|
修复打开分享页需要登陆的BUG
|
2023-07-01 22:14:53 +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
|
7f0be280c3
|
修复未验证通过的表单被应该提交
|
2023-06-29 11:09:41 +08:00 |
|
648540858
|
9bd588957a
|
修复获取pushKey
|
2023-06-28 20:27:25 +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
|
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
|
5b8ffd5b61
|
修复前端空指针异常 #831
|
2023-06-14 18:14:40 +08:00 |
winfed
|
1bdc0621b8
|
feat:删除拉流代理时，提示是否确认删除，防止误删
|
2023-06-09 15:50:33 +08:00 |
|
winfed
|
a2d93fce81
|
fix:修复拉流代理配置展示问题:音频、录制、无人观看
|
2023-06-09 15:19:18 +08:00 |
|
648540858
|
a45fab423b
|
修复国标级联语音对讲
|
2023-06-05 15:01:20 +08:00 |
|
648540858
|
2ef4111297
|
修复拉流代理的ffmpeg代理方式
|
2023-06-05 10:28:11 +08:00 |
|
648540858
|
6bbac849b3
|
修复设备列表状态显示
|
2023-05-29 15:24:18 +08:00 |
|
648540858
|
d0083447bb
|
修复地图页面云台状态显示以及状态显示
|
2023-05-29 15:16:44 +08:00 |
|
648540858
|
30ae9e929f
|
合并主线
|
2023-05-25 17:28:57 +08:00 |
|
648540858
|
ccecda7859
|
Merge pull request #845 from 648540858/wvp-28181-2.0-test
Wvp 28181 2.0 test
|
2023-05-09 17:56:29 +08:00 |
|
648540858
|
21258d6ba3
|
优化录像下载页面
|
2023-05-09 17:54:36 +08:00 |
|
648540858
|
a2da81f79a
|
支持级联国标录像下载
|
2023-05-09 17:31:58 +08:00 |
|
xiaoQQya
|
98bd8913e7
|
fix(通道快照): 修复前后端分离部署后通道快照不显示的问题
|
2023-05-08 16:15:50 +08:00 |
wangjunyi
|
8ef5e2618d
|
解决国标设备-通道-设备录像处的视频下载问题
|
2023-04-27 17:39:45 +08:00 |
|
wangjunyi
|
c561dda269
|
创建回调函数时，不可带上括号，否则会在调用此语句时，立即执行一次回调函数
|
2023-04-27 16:26:29 +08:00 |
|
Kairlec
|
ea3f899593
|
fix `Notification is not defined` on Android Webview or under ios16.4
如果没有这一行import,那么使用的会是Notification Web API,这在部分场景下是不支持的,具体见[Notification浏览器兼容性](https://developer.mozilla.org/zh-CN/docs/Web/API/Notification#%E6%B5%8F%E8%A7%88%E5%99%A8%E5%85%BC%E5%AE%B9%E6%80%A7)
比如在一些使用Android Webview的浏览器或部分ios系统上会导致报错而白屏
在此处应该为使用`element-ui`的Notification组件(下面有用到注册为element-ui的Notification全局属性$notify)
|
2023-04-23 17:08:53 +08:00 |
|
648540858
|
0f3898910c
|
收流时设置re_use_port参数解决端口关闭快速打开造成的端口未释放问题， 支持点播的tcp主动
|
2023-04-19 16:21:28 +08:00 |
|
648540858
|
d46fc9de82
|
优化下级平台自定义ssrc的情况，优化国标录像下载流程
|
2023-04-14 14:59:22 +08:00 |
|
648540858
|
b4048fbe80
|
合并开源主线
|
2023-04-04 09:09:07 +08:00 |
|
648540858
|
2e5d94181a
|
支持修改页面展示的sip ip
|
2023-03-31 08:56:54 +08:00 |
|
648540858
|
58d1f0ea16
|
修复云端录像界面
|
2023-03-27 15:47:04 +08:00 |
|
648540858
|
3b1516afe5
|
优化录像配置。不再使用zlm默认的http服务器
|
2023-03-25 18:40:29 +08:00 |
|
648540858
|
4f22994cdb
|
优化国标级联的更新
|
2023-03-25 10:04:57 +08:00 |
|
648540858
|
f210952ed2
|
优化国标级联中的通道全部导入
|
2023-03-22 15:21:22 +08:00 |
|
xiaoQQya
|
219f863191
|
fix(国标设备): 修复设备列表云台类型不显示的问题
|
2023-03-22 15:21:22 +08:00 |
|
xiaoQQya
|
aac3e95159
|
perf(jessibuca): 优化 videoInfo 重复 log 的问题
|
2023-03-22 15:21:22 +08:00 |
|
648540858
|
0f3f3c077b
|
修复添加zlm节点使用默认值的问题 #781
|
2023-03-22 15:21:22 +08:00 |
|
648540858
|
455e58f866
|
优化合并对讲broadcast级联模式
|
2023-03-21 14:21:45 +08:00 |
|
648540858
|
6b1d966255
|
优化合并对讲broadcast级联模式
|
2023-03-21 10:27:07 +08:00 |
|
648540858
|
4362a5b499
|
主线合并对讲broadcast级联模式
|
2023-03-20 15:42:59 +08:00 |
|
648540858
|
26bdf2e776
|
Merge branch '级联' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.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/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
# web_src/src/components/dialog/devicePlayer.vue
|
2023-03-20 15:31:43 +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
|
a000ed6062
|
完善talk模式
|
2023-03-20 14:20:28 +08:00 |
|
648540858
|
22a205e8fc
|
优化异常处理
|
2023-03-17 14:02:16 +08:00 |
|
648540858
|
c3ce2bc5d0
|
优化异常处理以及级联设备状态查询
|
2023-03-17 13:22:05 +08:00 |
|
648540858
|
2bf07305aa
|
Merge branch 'wvp-28181-2.0' into wvp-jwt-token
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/resources/all-application.yml
|
2023-03-15 22:58:28 +08:00 |
|
648540858
|
be6666db03
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-03-15 22:57:20 +08:00 |
|
648540858
|
5fab97cf7e
|
支持不同域的前后端分离部署
|
2023-03-15 19:05:56 +08:00 |
|
648540858
|
943f95ba8c
|
增加消息通道配置，可以通道redis在wvp上下级之间发送消息
|
2023-03-14 14:02:33 +08:00 |
|
xiaoQQya
|
84595e0c84
|
perf(jessibuca): 升级 jessibuca 2023-03-8 v3.1.28 版本, 修改 jessibuca 参数使用硬解码优化播放黑屏问题, https 环境下使用 WCS 硬解码, http 环境下使用 MSE 硬解码, H265 视频自动使用 wasm 软解码
|
2023-03-13 17:53:50 +08:00 |
|
xiaoQQya
|
bdcd006a7e
|
fix(jessibuca): 修复 jessibuca 组件截图报错的问题
|
2023-03-13 17:42:39 +08:00 |
|
648540858
|
a7c3cf5316
|
优化跨域配置，支持同域的前后端分离部署
|
2023-03-05 09:53:26 +08:00 |
|
648540858
|
420dbce900
|
Merge branch 'main' into 级联
# Conflicts:
# 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-02-22 18:14: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 |
逐浪人
|
342361cef8
|
Update CloudRecordDetail.vue
修复 download.html 找不到 的问题，它被 assist放在www目录不是 recored目录
|
2023-02-11 22:08:51 +08:00 |
|
648540858
|
197f80581b
|
Merge branch 'main' into main2
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-02-10 16:25:33 +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 |
|
648540858
|
ec95a42985
|
Merge branch 'main' into main2
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/resources/all-application.yml
# web_src/src/components/dialog/devicePlayer.vue
|
2023-02-10 15:54:42 +08:00 |
|
648540858
|
6484f52e46
|
同时支持打包为Jar和War
|
2023-02-07 20:59:33 +08:00 |
|
648540858
|
922a9e8b32
|
修复语音对讲返回的地址
|
2023-02-07 14:52:33 +08:00 |
|
648540858
|
c226deacff
|
修复语音对讲发送页
|
2023-02-07 10:04:15 +08:00 |
|
648540858
|
2b1f7a4739
|
Merge branch 'wvp-28181-2.0' into fix-269
|
2023-02-01 10:56:40 +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
|
d4fdea3df9
|
修复国标录像查询ui
|
2023-01-11 10:43:56 +08:00 |
|
648540858
|
72a1f12208
|
优化国标录像UI
|
2023-01-10 14:01:03 +08:00 |
|
648540858
|
8b0662ebfe
|
优化国标录像下载错误提示
|
2023-01-10 11:36:54 +08:00 |
|
648540858
|
9b9a13ab36
|
国标录像UI重构
|
2023-01-09 16:31:51 +08:00 |
Lyon1994
|
aa71a33c38
|
[ fix bug ] 修复分屏播放无效的问题,这是一个json解析错误
|
2022-12-26 11:36:31 +08:00 |
|
648540858
|
4b827f3897
|
级联语音对讲部分
|
2022-12-13 11:57:07 +08:00 |
|
648540858
|
131ea77669
|
接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址
|
2022-12-06 10:33:43 +08:00 |
|
xiaoQQya
|
2d8f57f3c9
|
fix(devicePlayer): 修复设备视频播放页 RTCS 地址显示错误的问题
|
2022-11-30 16:29:30 +08:00 |
|
648540858
|
6c9d6f0054
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
|
2022-11-29 13:16:20 +08:00 |
|
648540858
|
f89491ada3
|
修复单端口模式下ssrc的释放 #667
|
2022-11-25 14:38:46 +08:00 |
|
648540858
|
d7623b5ca8
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/bean/RequestSendItemMsg.java
|
2022-11-25 10:57:53 +08:00 |
|
648540858
|
fa2ccb4ec8
|
修复协议端口配置不全导致前端播放页面无法弹出的问题
|
2022-11-25 10:50:16 +08:00 |
|
648540858
|
12fa3b4c8d
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2022-11-23 09:57:17 +08:00 |
|
648540858
|
8ea6e192d9
|
优化拉流代理表单以及逻辑
|
2022-11-22 17:17:35 +08:00 |
|
648540858
|
1469971102
|
支持配置设备上线时自动更新查询通道，修复通道刷新进度展示
|
2022-11-22 15:02:25 +08:00 |
|
648540858
|
1983b8b0a7
|
国标级联->选择通道支持移除目前下所有以及全部添加到目录下
|
2022-11-22 12:55:29 +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 |
|
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
|
694076dc8c
|
优化国标级联发流并发能力
|
2022-11-16 09:39:27 +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 |
|
648540858
|
d040254430
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-11-08 20:04:23 +08:00 |
|
648540858
|
f4ee7271e7
|
Merge pull request #661 from xiaoQQya/wvp-28181-2.0
修复分屏监控与视频播放页在 HTTPS 环境下无法播放的问题
|
2022-11-08 20:03:01 +08:00 |
|
648540858
|
4c8e2beb4d
|
优化hook处理速度
|
2022-11-08 19:58:36 +08:00 |
|
xiaoQQya
|
aae7c80fd5
|
fix(live): 修复分屏监控 HTTPS 环境下无法播放的问题
|
2022-11-05 12:50:26 +08:00 |
|
xiaoQQya
|
189b6044b4
|
fix(devicePlayer): 修复设备视频播放页 HTTPS 环境下 WebRTC 无法播放的问题
|
2022-11-05 11:46:39 +08:00 |
|
xiaoQQya
|
3e71e0bdf1
|
perf(rtcPlayer): 修改控制台 log 级别
|
2022-11-05 11:35:01 +08:00 |
唐嗣成
|
0815b8e130
|
my
|
2022-11-04 17:35:43 +08:00 |
|
648540858
|
aed45e0f0d
|
优化多网卡
|
2022-10-28 16:40:12 +08:00 |
|
648540858
|
0f0ece2401
|
设备编辑增加收流IP
|
2022-10-25 10:17:59 +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
|
b6bcb5f2f4
|
隐藏liveplayer
|
2022-10-19 10:28:51 +08:00 |
|
648540858
|
b64d701f37
|
隐藏liveplayer
|
2022-10-19 10:07:47 +08:00 |
|
648540858
|
c5b16e058d
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# sql/mysql.sql
|
2022-10-19 10:04:04 +08:00 |
XiaoQiTong
|
b0d0d30781
|
修改云端录像选择节点流媒体path不修改的bug
device表增加的mediaServerId字段丢失，重新添加
|
2022-10-18 20:18:51 +08:00 |
|
648540858
|
55b53caef1
|
支持手动添加，为设备设置单独的密码
|
2022-10-18 17:35:44 +08:00 |
|
648540858
|
688e222dcc
|
优化按需拉流配置，拉流代理支持按需拉流
|
2022-10-18 17:35:32 +08:00 |
|
648540858
|
3c52a16e5f
|
支持手动添加，为设备设置单独的密码
|
2022-10-18 17:02:05 +08:00 |
|
648540858
|
82fd369ce5
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2022-10-17 16:56:13 +08:00 |
|
648540858
|
7918f03734
|
优化按需拉流配置，拉流代理支持按需拉流
|
2022-10-17 16:38:28 +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 |
|
648540858
|
4f2191dc9f
|
增加liveplayer播放器
|
2022-10-17 10:30:44 +08:00 |
|
XiaoQiTong
|
dabee4ed7d
|
增加指定流媒体收流功能
|
2022-10-15 20:57:24 +08:00 |
|
648540858
|
06bbe3fe01
|
添加第二种语音对讲实现
|
2022-09-29 16:27:59 +08:00 |
|
648540858
|
d7a1b94f90
|
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/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/message/response/cmd/BroadcastResponseMessageHandler.java
|
2022-09-24 21:04:58 +08:00 |
|
648540858
|
710600db6f
|
优化sip消息，去除自动dialog创建
|
2022-09-21 18:18:37 +08:00 |
|
648540858
|
1ee56d50d8
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-09-16 18:04:13 +08:00 |
|
648540858
|
692f716788
|
优化点播时RtpServer为正常关闭的问题
|
2022-09-16 18:02:56 +08:00 |
|
648540858
|
ab74d1cff9
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
|
2022-09-14 20:51:21 +08:00 |
wenyanjun
|
12571e0db1
|
修复下载录像失败问题
|
2022-09-14 14:32:22 +08:00 |
|
648540858
|
221f99c764
|
优化sip消息
|
2022-09-09 17:06:19 +08:00 |
|
648540858
|
2f76fa98bb
|
Merge branch '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/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2022-09-08 09:46:35 +08:00 |
jiang
|
3884e9a56a
|
1.根据redis消息更新推流列表时同时更新在线状态
2.推流列表的模板增加在线状态
|
2022-09-07 15:56:48 +08:00 |
|
648540858
|
e7bdcc1f8d
|
修复选择通道时默认节点显示错误的问题
|
2022-09-06 16:31:28 +08:00 |
|
648540858
|
d5e8aa62a1
|
添加对海康平台录像回放的兼容，修复录像信息发送失败, 级联平台支持开启rtcp保活
|
2022-09-05 17:10:21 +08:00 |
|
648540858
|
aa6bce35c7
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# 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/service/impl/MediaServiceImpl.java
|
2022-09-05 09:44:24 +08:00 |
|
648540858
|
cfe9c762d6
|
修复前端播放
|
2022-09-05 09:40:14 +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
|
2de4c322f6
|
去除对redis key过期事件的使用；重构国标级联的注册保活
|
2022-08-31 11:29:13 +08:00 |
|
648540858
|
9f680a2e9e
|
修复bug以及日志按照，错误/sip/数据库 分割
|
2022-08-26 18:03:09 +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
|
f24b6fa13f
|
优化国标录像的异常判断
|
2022-08-23 11:00:46 +08:00 |