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
|
fbc7343546
|
调整数据库名称
|
2024-08-07 14:20:48 +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 |
linshunhua
|
402ffa0b1e
|
修复在ORACLE,达梦等数据库下的用户查询BUG
|
2024-08-06 16:52:22 +08:00 |
koisi
|
fe974ddd20
|
Merge pull request #2 from koisi-io/fix3
修复 87c071:合并271分支 的参数遗漏
|
2024-08-05 19:00:00 +08:00 |
|
koisi
|
5772d3f231
|
修复 87c071:合并271分支 的参数遗漏
将推流信息记录至redis，由StreamPushItem变更成OnStreamChangedHookParam时，漏了设置serverId。
|
2024-08-05 18:59:02 +08:00 |
|
648540858
|
9bbc3c44e0
|
临时提交
|
2024-08-05 18:02:19 +08:00 |
|
648540858
|
ce0f0c4ac8
|
临时提交
|
2024-08-05 17:59:20 +08:00 |
|
koisi
|
8985905bbe
|
Merge pull request #1 from koisi-io/fix2
修复6月25日合并271时，变量类型未同步更新的问题
|
2024-08-05 17:06:00 +08:00 |
|
koisi
|
c1a8e62f23
|
修复6月25日合并271时，变量类型未同步更新的问题
处理ZLM推拉流事件的参数由StreamPushItem变更成OnStreamChangedHookParam了，然后有个地方没有同步更新。
|
2024-08-05 17:04:58 +08:00 |
|
koisi
|
86fdf72856
|
修复语法错误导致的前端编译异常
最新的一次合并，ConsoleNet.vue 少了个逗号。
|
2024-08-05 15:40:24 +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 |
|
Iwan Lebron
|
595fd831e4
|
Merge pull request #3 from iwanlebron/iwanlebron-patch-3
修复git信息不显示问题
|
2024-07-31 18:52:17 +08:00 |
|
Iwan Lebron
|
82684373ec
|
修复git信息不显示问题
|
2024-07-31 18:51:56 +08:00 |
|
648540858
|
7ee3cdb801
|
完善行政区划管理
|
2024-07-31 15:07:54 +08:00 |
|
648540858
|
3ce973d2ee
|
临时提交
|
2024-07-30 17:58:18 +08:00 |
|
648540858
|
112cb2dfd8
|
临时提交
|
2024-07-29 17:44:34 +08:00 |
|
panlinlin
|
e285257f24
|
临时提交
|
2024-07-28 07:36:20 +08:00 |
|
648540858
|
8169983f21
|
临时提交
|
2024-07-28 06:19:18 +08:00 |
|
Iwan Lebron
|
7d172ffad2
|
Merge pull request #2 from iwanlebron/iwanlebron-patch-2
修复前端传参错误
|
2024-07-27 11:50:42 +08:00 |
|
Iwan Lebron
|
ac1e604eb4
|
修复前端传参错误
|
2024-07-27 11:50:18 +08:00 |
|
648540858
|
b246fd6a20
|
临时提交
|
2024-07-26 17:53:10 +08:00 |
|
648540858
|
a2b00a4f4e
|
临时提交
|
2024-07-25 18:02:22 +08:00 |
|
648540858
|
5a812e7f08
|
临时提交
|
2024-07-24 17:54:19 +08:00 |