648540858
|
0a3d25fb5b
|
修复非必传参数
|
2023-07-06 15:07:16 +08:00 |
|
648540858
|
deeff5533b
|
添加兼容目录同步兼容性
|
2023-07-05 17:20:20 +08:00 |
|
648540858
|
457c5e3821
|
修复拉流代理无人观看自动停用失败
|
2023-07-04 11:10:17 +08:00 |
|
648540858
|
733a11f265
|
修复单端口点播
|
2023-07-03 17:55:34 +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
|
ba8fffd907
|
增加与第三方对接的接口
|
2023-07-03 16:53:03 +08:00 |
|
648540858
|
e4622d17a6
|
优化字段名称
|
2023-07-03 10:36:02 +08:00 |
|
648540858
|
27b125cf98
|
增加备用字段
|
2023-07-02 12:40:41 +08:00 |
|
648540858
|
64cd48a92b
|
增加备用字段
|
2023-07-02 00:03:21 +08:00 |
|
648540858
|
01bc6c857e
|
Merge pull request #908 from cnless/wvp-28181-2.0
fix:修复ResponseBody未关闭以及点播超时报错AsyncRequestTimeoutException
|
2023-07-01 23:04:39 +08:00 |
|
648540858
|
8237cd25af
|
修复添加拉流代理提交错误
|
2023-07-01 22:50:24 +08:00 |
|
648540858
|
228c57399a
|
修复打开分享页需要登陆的BUG
|
2023-07-01 22:14:53 +08:00 |
|
648540858
|
b64f320805
|
优化发流逻辑
|
2023-07-01 18:10:33 +08:00 |
|
648540858
|
c916433042
|
优化更新通道中父结点的判断
|
2023-06-30 10:34:02 +08:00 |
|
648540858
|
18ad50222f
|
优化更新通道中父结点的判断
|
2023-06-30 10:01:21 +08:00 |
|
648540858
|
2d4bbbea8e
|
优化更新通道的civicode判断
|
2023-06-29 17:10:14 +08:00 |
|
648540858
|
0592fd676f
|
修复使用推流状态作为推流通道状态为false仍然发送通知
|
2023-06-29 11:22:32 +08:00 |
|
648540858
|
7f0be280c3
|
修复未验证通过的表单被应该提交
|
2023-06-29 11:09:41 +08:00 |
|
648540858
|
e8b766172e
|
合并268优化内容
|
2023-06-29 10:37:20 +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
|
1294081a9c
|
优化树形列表通道查询
|
2023-06-29 09:36:13 +08:00 |
|
648540858
|
bfae9780f7
|
增加流关闭时的处理
|
2023-06-28 20:32:48 +08:00 |
|
648540858
|
def56793ba
|
增加上级推流和停止推流的通知
|
2023-06-28 16:52:27 +08:00 |
|
648540858
|
639e0bab11
|
修复树形列表通道查询
|
2023-06-28 15:02:59 +08:00 |
|
648540858
|
a77628e875
|
优化端口预占用，防止占用无法释放
|
2023-06-28 14:50:46 +08:00 |
|
648540858
|
ed035b74d9
|
添加关闭收流发流的接口
|
2023-06-28 10:47:33 +08:00 |
|
648540858
|
6fcff0567e
|
doc去除cdn依赖
|
2023-06-28 09:15:07 +08:00 |
|
648540858
|
c7d1515023
|
增加redis通道
|
2023-06-27 15:34:38 +08:00 |
|
648540858
|
724963324a
|
修复上级点播时如果推流信息中mediaServerID错误的情况
|
2023-06-26 19:06:14 +08:00 |
|
648540858
|
fec69c714c
|
优化国标信令
|
2023-06-25 22:40:26 +08:00 |
|
dsk
|
7749ea3421
|
新增接口超时时间配置，修复点播超时的情况下报错org.springframework.web.context.request.async.AsyncRequestTimeoutException
|
2023-06-25 16:16:40 +08:00 |
|
dsk
|
cec266d3cd
|
修复请求报错404等情况下导致ResponseBody未关闭的问题
|
2023-06-25 16:00:37 +08:00 |
|
648540858
|
f306937616
|
优化自动获取stream ip
|
2023-06-25 13:49:07 +08:00 |
|
648540858
|
155838ce2e
|
优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895
|
2023-06-22 22:35:35 +08:00 |
|
648540858
|
f4e5e03962
|
修复表名错误 #904
|
2023-06-21 15:53:26 +08:00 |
|
648540858
|
7b24d51db9
|
优化国标级联的端口保持
|
2023-06-21 14:03:31 +08:00 |
|
648540858
|
3350b65259
|
添加文档依赖，去除cdn依赖
|
2023-06-20 15:25:56 +08:00 |
|
648540858
|
96d2a27d41
|
添加sql字段
|
2023-06-20 14:25:01 +08:00 |
|
648540858
|
a7bf29a4cb
|
恢复默认值
|
2023-06-20 14:17:44 +08:00 |
|
648540858
|
fa62ab9a01
|
Merge pull request #893 from sxh-netizen/wvp-28181-2.0
新增设备主子码流开关选择，默认为不开启
|
2023-06-20 14:16:46 +08:00 |
|
648540858
|
9e28923b8c
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2023-06-20 14:15:27 +08:00 |
|
648540858
|
b4dadf6c51
|
修复删除的设备无法重新注册的问题
|
2023-06-20 13:02:18 +08:00 |
|
648540858
|
21a96ad20f
|
修复通道刷新
|
2023-06-20 12:51:06 +08:00 |
|
648540858
|
d310204d00
|
去除多余字段
|
2023-06-20 09:57:28 +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
|
8cf5b65e38
|
优化国标级联注册机制
|
2023-06-19 20:09:16 +08:00 |
|
648540858
|
8942ab0112
|
优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范
|
2023-06-19 18:42:36 +08:00 |
|
‘sxh’
|
ccc0a99d68
|
同步主线的代码，保持一致性
|
2023-06-15 11:20:43 +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 |
|