648540858
|
20f93d52d7
|
临时提交
|
2024-08-17 20:49:07 +08:00 |
|
panlinlin
|
4dd656b29b
|
完善目录推送
|
2024-08-17 08:02:39 +08:00 |
|
panlinlin
|
635458d19a
|
临时提交
|
2024-08-17 07:01:40 +08:00 |
|
648540858
|
aeb3cd6a22
|
临时提交
|
2024-08-16 17:59:53 +08:00 |
|
648540858
|
326025ee85
|
完成通道共享
|
2024-08-16 16:23:54 +08:00 |
|
panlinlin
|
976c089b7f
|
临时提交
|
2024-08-15 23:45:00 +08:00 |
|
648540858
|
abed3ecbec
|
临时提交
|
2024-08-15 17:45:24 +08:00 |
|
panlinlin
|
1cbd8d677c
|
临时提交
|
2024-08-15 00:03:53 +08:00 |
|
648540858
|
a1e8a2e6ff
|
临时提交
|
2024-08-14 17:52:46 +08:00 |
|
648540858
|
cce1d1de40
|
重构INVITE消息处理中的上级点播请求
|
2024-08-14 17:19:19 +08:00 |
|
648540858
|
d5621f9489
|
临时提交
|
2024-08-13 18:03:34 +08:00 |
|
648540858
|
ad240ba9a4
|
优化国标级联点播逻辑
|
2024-08-13 17:57:25 +08:00 |
|
648540858
|
213b218efa
|
临时提交
|
2024-08-12 18:00:06 +08:00 |
|
648540858
|
9a4a81a90e
|
临时提交
|
2024-08-12 15:30:01 +08:00 |
|
648540858
|
5ff232150d
|
Merge remote-tracking branch 'origin/dev/master-通道结构重构' into dev/master-通道结构重构
|
2024-08-12 09:55:10 +08:00 |
|
648540858
|
bfa2c1b2e8
|
临时提交
|
2024-08-12 09:54:50 +08:00 |
|
panlinlin
|
0177831e86
|
临时提交
|
2024-08-11 23:20:42 +08:00 |
|
panlinlin
|
76a0d248ef
|
临时提交
|
2024-08-10 23:27:21 +08:00 |
|
648540858
|
d8d9f76d89
|
支持多WVP的推流播放
|
2024-08-09 17:55:39 +08:00 |
|
648540858
|
16708e385b
|
支持多WVP的推流播放
|
2024-08-09 16:27:08 +08:00 |
|
648540858
|
7f8a15f017
|
优化收到目录时的分组信息处理
|
2024-08-09 11:08:40 +08:00 |
|
panlinlin
|
a1671c3c3e
|
临时提交
|
2024-08-08 23:44:03 +08:00 |
|
648540858
|
8ab88c0f02
|
临时提交
|
2024-08-08 22:43:37 +08:00 |
|
648540858
|
9aad6ac719
|
临时提交
|
2024-08-08 17:47:08 +08:00 |
|
panlinlin
|
3e220a2c1e
|
临时提交
|
2024-08-07 23:45:29 +08:00 |
|
648540858
|
fbbb4cb704
|
临时提交
|
2024-08-07 18:01:28 +08:00 |
|
648540858
|
031a29b8a2
|
完善行政区划通道管理
|
2024-08-07 17:15:45 +08:00 |
|
648540858
|
5abf5012eb
|
完善分组通道管理
|
2024-08-07 17:12:39 +08:00 |
|
648540858
|
a3f7753b84
|
Merge branch 'refs/heads/master' into dev/master-通道结构重构
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# web_src/src/components/PushVideoList.vue
|
2024-08-07 11:17:34 +08:00 |
|
648540858
|
a01d4fa74e
|
修复前端文件编译错误
|
2024-08-07 10:49:35 +08:00 |
|
648540858
|
c88681c7ad
|
合并分支
|
2024-08-07 10:41:54 +08:00 |
|
648540858
|
ea396c902c
|
Merge branch 'refs/heads/2.7.2'
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2024-08-07 10:04:59 +08:00 |
|
648540858
|
40674c33a3
|
增加版本号
|
2024-08-07 10:04:10 +08:00 |
|
648540858
|
074cd14535
|
增加版本号
|
2024-08-07 09:44:37 +08:00 |
|
648540858
|
a915897c53
|
兼容arm zlm 无法获取到Params的问题
|
2024-08-07 09:38:48 +08:00 |
|
648540858
|
d97accee4a
|
临时提交
|
2024-08-06 16:55:33 +08:00 |
|
648540858
|
9bbc3c44e0
|
临时提交
|
2024-08-05 18:02:19 +08:00 |
|
648540858
|
ce0f0c4ac8
|
临时提交
|
2024-08-05 17:59:20 +08:00 |
|
panlinlin
|
96bbd19e81
|
临时提交
|
2024-08-05 08:00:16 +08:00 |
|
648540858
|
241e29f705
|
Merge pull request #1557 from ZhaoYandong00/patch-3
修复无法单独选择显示下载上传网络速率问题
|
2024-08-04 20:36:50 +08:00 |
|
648540858
|
a7e984f696
|
Merge pull request #1555 from iwanlebron/iwanlebron-patch-4
修复ZLMServerFactory日志不打印bug
|
2024-08-04 20:36:27 +08:00 |
|
panlinlin
|
18c51919a3
|
临时提交
|
2024-08-02 23:47:44 +08:00 |
|
648540858
|
91b8e7a595
|
临时提交
|
2024-08-02 17:48:32 +08:00 |
|
648540858
|
55c534ac90
|
临时提交
|
2024-08-02 14:46:20 +08:00 |
|
ZhaoYandong00
|
d3d9d3d964
|
修复无法单独选择显示下载上传网络速率问题
修复单独选择一项时，会自动回到全选择的问题
修复单独选择一项时查看指定时间速率提示报错的问题
|
2024-08-01 20:22:13 +08:00 |
|
648540858
|
3f2c9f6451
|
临时提交
|
2024-08-01 17:50:34 +08:00 |
|
648540858
|
f7c98301ac
|
临时提交
|
2024-08-01 15:29:51 +08:00 |
|
Iwan Lebron
|
c7c94ee73d
|
修复 ZLMServerFactory 日志不打印
|
2024-08-01 14:47:43 +08:00 |
|
Iwan Lebron
|
cfcda86164
|
Merge branch '648540858:master' into master
|
2024-08-01 10:15:37 +08:00 |
|
648540858
|
e025e61cd7
|
Merge pull request #1554 from iwanlebron/iwanlebron-patch-3
修复git信息不显示问题
|
2024-08-01 09:59:33 +08:00 |
|