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
|
01bc6c857e
|
Merge pull request #908 from cnless/wvp-28181-2.0
fix:修复ResponseBody未关闭以及点播超时报错AsyncRequestTimeoutException
|
2023-07-01 23:04:39 +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
|
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
|
a7bf29a4cb
|
恢复默认值
|
2023-06-20 14:17:44 +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 |
|
‘sxh’
|
15df08964b
|
新增设备主子码流选择，默认为不开启
|
2023-06-15 11:00:29 +08:00 |
|
648540858
|
319cdd2151
|
优化移动位置的时间
|
2023-06-14 20:39:10 +08:00 |
|
648540858
|
138216c395
|
Merge pull request #876 from criver31/wvp-28181-2.0
移动设备实时位置兼容ISO8601格式
|
2023-06-14 20:14:31 +08:00 |
|
648540858
|
5b8ffd5b61
|
修复前端空指针异常 #831
|
2023-06-14 18:14:40 +08:00 |
|
648540858
|
f4960b2618
|
修复移动位置获取接口超时 #857
|
2023-06-14 17:04:41 +08:00 |
|
648540858
|
f3388dd53a
|
修复级联录像查询sql错误
|
2023-06-14 16:26:29 +08:00 |
|
648540858
|
e68eb850a9
|
去除多余日志
|
2023-06-13 23:11:56 +08:00 |
|
648540858
|
c4d7dd9651
|
Merge branch '2.6.8' into wvp-28181-2.0
|
2023-06-13 23:11:00 +08:00 |
|
648540858
|
8f5bbfa5c2
|
修复zlm上线时过期任务设置错误
|
2023-06-13 23:06:35 +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
|
03f3598681
|
修复stream-on-demand配置失效的BUG
|
2023-06-08 22:46:07 +08:00 |
|
648540858
|
20a47729fc
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
|
2023-06-08 10:41:36 +08:00 |
|
648540858
|
095b12ebbd
|
优化ffmpeg拉流代理
|
2023-06-08 10:40:16 +08:00 |
|
648540858
|
ca715e0234
|
优化via的branch生成规则
|
2023-06-07 21:45:15 +08:00 |
|
648540858
|
0c14970ab8
|
增加收到notify增加或移除通道时发送redis消息
|
2023-06-07 21:11:39 +08:00 |
|
648540858
|
534be3f580
|
支持redis消息强制关闭流
|
2023-06-07 20:58:35 +08:00 |
|
648540858
|
e272fa26e1
|
合并分支
|
2023-06-07 20:27:57 +08:00 |
|
648540858
|
b7f2a6b25b
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
|
2023-06-07 20:21:10 +08:00 |
|
648540858
|
97b04c4dba
|
修复录像下载，优化拉流代理接口
|
2023-06-07 20:15:08 +08:00 |
|
648540858
|
db3240d918
|
优化截图获取接口
|
2023-06-05 11:10:15 +08:00 |
|
648540858
|
2ef4111297
|
修复拉流代理的ffmpeg代理方式
|
2023-06-05 10:28:11 +08:00 |
|
648540858
|
b7d85a270e
|
修复添加目录SQL错误 #881
|
2023-06-05 09:39:59 +08:00 |
|
648540858
|
8d6de72429
|
优化日志
|
2023-06-02 16:40:19 +08:00 |
|
648540858
|
74431b1e98
|
优化点播流程中ssrc的释放
|
2023-06-02 15:46:07 +08:00 |
|
648540858
|
dbdb9ca06d
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-06-01 15:58:33 +08:00 |
yanggs
|
51c19c397d
|
修复 启用代理失败： ->缺少必要参数:"src_url","dst_url","timeout_ms"
|
2023-06-01 13:30:48 +08:00 |
fine
|
c2ef001546
|
Update MobilePositionResponseMessageHandler.java
|
2023-05-31 09:35:08 +08:00 |
|
648540858
|
ffb21248cb
|
去除多余配置
|
2023-05-30 11:20:22 +08:00 |
|
648540858
|
314423bd01
|
修复级联点播的空指针异常 #864
|
2023-05-30 11:00:11 +08:00 |
|
648540858
|
9ff1613d3b
|
修复web端管理节点负载不显示国标收流 #871
|
2023-05-30 10:54:09 +08:00 |
|
648540858
|
50240b4e39
|
移除手动配置mybatis下划线转驼峰
|
2023-05-30 10:32:08 +08:00 |
|
648540858
|
5a152791c0
|
添加获取截图接口
|
2023-05-29 23:28:06 +08:00 |
|
648540858
|
57192a49d1
|
修复引入的错误Order
|
2023-05-29 20:18:42 +08:00 |
|
648540858
|
a91fe69f76
|
添加文档
|
2023-05-29 09:40:36 +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 |
|
shanyuanzz
|
6d52e1539f
|
优化zoom低倍速下的变倍速率
优化zoom低倍速下的变倍速率
|
2023-05-28 13:48:55 +08:00 |
|
shanyuanzz
|
31c2f52e48
|
Update SIPCommander.java
Add by 白米粥
1.修正云台控制的zoom的speedbug。
解决当zoom时speed为1-FH时速度变化为1-FH，而10H~FFH以上时是以首位速度进行变化，变化速率过于不一致。
修改后1-FH的速度均以1的速率进行缩放变倍。
|
2023-05-28 13:39:16 +08:00 |
|
648540858
|
babc0f79cb
|
去除多余注释
|
2023-05-23 14:35:40 +08:00 |
|
648540858
|
807d0524a6
|
修复推流鉴权
|
2023-05-23 10:34:00 +08:00 |
|
648540858
|
061749548c
|
修复字段名错误
|
2023-05-22 11:23:48 +08:00 |
|
648540858
|
9e790eb0ff
|
本地集成人大金仓连接jar
|
2023-05-16 17:17:24 +08:00 |
|
648540858
|
be9bf60e81
|
兼容人大金仓对online作为保留字段的要求
|
2023-05-16 15:13:38 +08:00 |
Kairlec
|
ca103731c7
|
fix response `content-type` is not set if access without access token
|
2023-05-15 16:26:37 +08:00 |
|
648540858
|
23b8667b7f
|
优化部分sql实现
|
2023-05-15 16:08:31 +08:00 |
|
648540858
|
5d40080468
|
优化部分sql实现
|
2023-05-15 15:29:39 +08:00 |
|
648540858
|
d849352441
|
重构以适配postgresql
|
2023-05-12 10:37:03 +08:00 |
xubinbin
|
b726dc9753
|
"@schedule"是Spring框架提供的一种定时任务执行机制，默认情况下它是单线程执行，项目中多次使用fixedRate按指定频率执行任务(不管前面任务是否已经完成)，在同时执行多个定时任务时可能会出现阻塞和性能问题，为了解决这种单线程瓶颈问题，将定时任务的执行机制改为支持多线程
|
2023-05-10 15:38:22 +08:00 |
|
648540858
|
a2da81f79a
|
支持级联国标录像下载
|
2023-05-09 17:31:58 +08:00 |
|
648540858
|
affbd89fdb
|
修复hook订阅移除失败的问题
|
2023-05-08 17:55:07 +08:00 |
|
648540858
|
c429a34e53
|
修复国标视频点播三种级联并发点播和录像下载的问题
|
2023-05-08 17:18:08 +08:00 |
|
648540858
|
490c55381f
|
修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题
|
2023-05-06 17:59:12 +08:00 |
|
648540858
|
e2f9ee8f7b
|
修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题
|
2023-05-06 17:40:57 +08:00 |
|
648540858
|
9ccce01692
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-05-04 17:03:32 +08:00 |
|
648540858
|
381c3bdc20
|
修复国标点播下级平台，ssrc更新的时单端口错误更新rtpserver的问题
|
2023-05-04 16:04:44 +08:00 |
|
648540858
|
2bc2842224
|
优化国标点播下级平台，ssrc更新的时因为旧的端口释放慢导致点播失败的问题，使用新的接口直接更新ssrc
|
2023-05-04 15:36:04 +08:00 |
|
648540858
|
3fe47021b9
|
优化国标规范，参考国标文档中-点播外域设备媒体流SSRC处理方式，上级点播时自定义ssrc，不适用上级携带的ssrc，也避免上级兼容性差，不携带ssrc的问题，可通过配置关闭此特性
|
2023-05-04 14:21:58 +08:00 |