zouyaoji
|
3b5a37c270
|
前端显示媒体服务器配置时报错修复
|
2022-08-06 11:27:02 +08:00 |
|
mrjackwang
|
28df05e261
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-08-06 09:42:28 +08:00 |
|
gushouzheng
|
d21d281b2c
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-08-06 09:00:14 +08:00 |
|
gushouzheng
|
c273a6aa5a
|
更新级联查看直播视频及代理拉流视频bug
|
2022-08-06 08:58:17 +08:00 |
|
648540858
|
3adc81764c
|
优化用户表单
|
2022-08-05 17:27:18 +08:00 |
|
648540858
|
d94ceb4fed
|
去除点播界面双loading
|
2022-08-05 17:20:26 +08:00 |
|
648540858
|
231582eb77
|
推流列表增加经纬度的添加
|
2022-08-05 17:10:53 +08:00 |
|
648540858
|
142efdd915
|
修复单个添加的推流级联国标的问题
|
2022-08-05 09:48:13 +08:00 |
|
jiang
|
d09d8f11f0
|
修改‘修改pushkey’窗口的标题提示文案
|
2022-08-04 17:01:31 +08:00 |
|
648540858
|
3496ca2378
|
Merge pull request #353 from mrjackwang/wvp-28181-2.0
拉流添加国标编码上级级联调取视频404
|
2022-08-02 15:41:07 +08:00 |
|
mrjackwang
|
f93a0d599e
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-08-02 15:32:15 +08:00 |
|
648540858
|
97d4599390
|
修复二级目录添加失败的问题
|
2022-08-02 11:34:56 +08:00 |
|
648540858
|
5e4a673ecc
|
修复视频播放点击音量报错 #557，修复编解码信息获取失败
|
2022-08-01 14:33:51 +08:00 |
|
648540858
|
2a5c12746b
|
修复首页未获取到zlm消息时发送错误消息的bug
|
2022-08-01 09:32:39 +08:00 |
|
mrjackwang
|
a59095db0c
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-29 15:16:39 +08:00 |
|
648540858
|
e05d0aa0a9
|
修复ssrc变化时端口变化的问题
|
2022-07-29 11:57:04 +08:00 |
|
648540858
|
0e38e743ce
|
Merge pull request #556 from linhuaichuan/wvp-28181-2.0
fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug
|
2022-07-28 16:25:00 +08:00 |
|
648540858
|
646c3e41b7
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-28 16:24:51 +08:00 |
|
648540858
|
778969f1eb
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-28 16:21:09 +08:00 |
|
648540858
|
fd091e545b
|
优化hook订阅机制
|
2022-07-28 16:18:41 +08:00 |
|
648540858
|
34f2832bef
|
优化gps信息存入数据库
|
2022-07-28 11:22:51 +08:00 |
|
庄梦蝶殇
|
fff3d64f85
|
fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug
|
2022-07-27 18:31:33 +08:00 |
|
648540858
|
f84eebdb75
|
优化部分hook订阅
|
2022-07-27 16:16:12 +08:00 |
|
648540858
|
d891b89c4b
|
去除多余内容
|
2022-07-27 14:53:19 +08:00 |
|
648540858
|
c7e09589af
|
去除多余内容
|
2022-07-27 14:51:49 +08:00 |
|
648540858
|
bc38f5ef29
|
修复流地址返回错误
|
2022-07-27 14:48:21 +08:00 |
|
648540858
|
76dedb11f8
|
bug修复
|
2022-07-27 11:11:18 +08:00 |
|
648540858
|
b957ab61c7
|
bug修复
|
2022-07-26 11:43:56 +08:00 |
|
648540858
|
c77c1a956c
|
修复推流推流状态提示
|
2022-07-25 11:17:46 +08:00 |
|
648540858
|
91dc4566a2
|
修复级联无通道时更新停止在等待更新的问题
|
2022-07-25 09:44:43 +08:00 |
|
648540858
|
8ee7211ba3
|
更新mysql.sql
|
2022-07-22 16:05:23 +08:00 |
|
648540858
|
e29d94c83f
|
增加推流添加功能，修复级联目录推送
|
2022-07-22 16:02:14 +08:00 |
|
648540858
|
eefe6f4c8d
|
Merge pull request #549 from TristingChen/fix-channel_status
优化----设备下线,通道状态也切换至离线状态
|
2022-07-20 17:54:42 +08:00 |
|
chenjialing
|
f66bf823fa
|
优化----设备下线,通道状态也切换至离线状态
|
2022-07-20 17:02:55 +08:00 |
|
mrjackwang
|
8d87741dea
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-20 13:51:30 +08:00 |
|
jiang
|
a51b411101
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-19 18:13:42 +08:00 |
|
jiang
|
fc0ad32f81
|
1.修复新增用户没有pushkey的问题
2.将重置pushkey改为修改pushkey
|
2022-07-19 18:13:19 +08:00 |
|
648540858
|
9e397ba9f6
|
移除共享所有直播流功能
|
2022-07-19 17:46:16 +08:00 |
|
648540858
|
7f5a18d6b5
|
优化推流列表
|
2022-07-19 16:37:34 +08:00 |
|
648540858
|
4a43d04020
|
修复推流导入模板
|
2022-07-19 15:27:33 +08:00 |
|
648540858
|
28b5cc39d0
|
修复更新推流状态sql错误
|
2022-07-19 14:27:30 +08:00 |
|
648540858
|
03864ae46f
|
修复用户查询sql错误
|
2022-07-19 11:13:46 +08:00 |
|
648540858
|
4765f9b9f2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-19 11:10:50 +08:00 |
|
648540858
|
2b351e1e18
|
为pushKey增加默认值
|
2022-07-18 20:38:47 +08:00 |
|
648540858
|
c48def08cf
|
MediaItem增加callId
|
2022-07-18 20:33:47 +08:00 |
|
jiang
|
1002150b2a
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-18 17:15:33 +08:00 |
|
jiang
|
c6fbd03276
|
增加用户管理功能。管理员可以添加删除用户、修改用户密码、重置pushkey
|
2022-07-18 17:09:35 +08:00 |
|
648540858
|
4d1c6401c2
|
去除无用引用
|
2022-07-17 23:19:59 +08:00 |
|
648540858
|
a509587980
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-17 23:17:55 +08:00 |
|
648540858
|
4451994959
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
|