648540858
|
8f7e8efc98
|
合并主线
|
2022-08-23 11:48:31 +08:00 |
|
648540858
|
020f9ea8a0
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
|
2022-08-23 11:01:53 +08:00 |
|
648540858
|
f24b6fa13f
|
优化国标录像的异常判断
|
2022-08-23 11:00:46 +08:00 |
|
648540858
|
ecf4fbb684
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
# web_src/src/components/Login.vue
|
2022-08-22 16:53:16 +08:00 |
|
648540858
|
042b28b2d6
|
支持全局异常和统一返回结果
|
2022-08-22 16:17:28 +08:00 |
|
648540858
|
5461b8ebf2
|
支持全局异常和统一返回结果，未完待续
|
2022-08-22 16:17:28 +08:00 |
|
648540858
|
116d979d87
|
合并主线
|
2022-08-09 16:58:31 +08:00 |
|
648540858
|
8b0ff3767b
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-08-09 14:41:21 +08:00 |
zouyaoji
|
3b5a37c270
|
前端显示媒体服务器配置时报错修复
|
2022-08-06 11:27:02 +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 |
jiang
|
d09d8f11f0
|
修改‘修改pushkey’窗口的标题提示文案
|
2022-08-04 17:01:31 +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
|
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
|
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
|
e29d94c83f
|
增加推流添加功能，修复级联目录推送
|
2022-07-22 16:02:14 +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
|
03864ae46f
|
修复用户查询sql错误
|
2022-07-19 11:13:46 +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
|
4451994959
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
|
648540858
|
cfed860667
|
合并主线
|
2022-07-12 16:54:58 +08:00 |
|
648540858
|
66e6756909
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-07-12 16:28:51 +08:00 |
|
648540858
|
74d97734ba
|
修复获取推流播放地址接口
|
2022-07-11 17:34:22 +08:00 |
|
648540858
|
afbec28906
|
增加推流鉴权。保护服务安全
|
2022-07-11 16:21:01 +08:00 |
wangyimeng
|
5e724cc062
|
Merge branch 'wvp-28181-2.0' of https://github.com/mrjackwang/wvp-GB28181-pro into wvp-28181-2.0
|
2022-07-06 15:33:43 +08:00 |
|
648540858
|
d7c293c867
|
界面优化
|
2022-07-06 10:18:56 +08:00 |
|
648540858
|
8aa0bdf539
|
数据库优化
|
2022-07-06 09:44:37 +08:00 |
|
648540858
|
10cb58391a
|
修复轨迹的储存与查询展示
|
2022-07-04 01:08:26 +08:00 |
|
648540858
|
5364db2982
|
优化对讲逻辑
|
2022-07-03 22:27:04 +08:00 |
|
648540858
|
7609d7836c
|
优化对讲逻辑
|
2022-07-03 16:23:31 +08:00 |
|
648540858
|
e78c402a24
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# sql/mysql.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-07-03 10:32:33 +08:00 |
|
648540858
|
f5fcc79a2c
|
优化国标树型展示
|
2022-07-03 07:40:54 +08:00 |
|
648540858
|
72c1b36d6d
|
优化对讲逻辑
|
2022-07-03 00:44:36 +08:00 |
|
648540858
|
b6c97528ae
|
添加界面停止逻辑
|
2022-07-01 18:36:35 +08:00 |
|
648540858
|
07956b48df
|
添加界面优化接口
|
2022-07-01 18:26:35 +08:00 |
|
648540858
|
1d1f174852
|
合并主线
|
2022-06-27 14:40:07 +08:00 |
|
648540858
|
26739237e2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# web_src/src/components/dialog/deviceEdit.vue
# web_src/src/components/dialog/devicePlayer.vue
|
2022-06-27 10:16:21 +08:00 |
|
648540858
|
038d360dd4
|
Merge remote-tracking branch 'origin/rtc' into commercial
# Conflicts:
# web_src/src/components/dialog/devicePlayer.vue
|
2022-06-27 09:38:59 +08:00 |
|
648540858
|
c2faa8c3ce
|
显示效果优化
|
2022-06-15 16:04:36 +08:00 |