Commit Graph

107 Commits

Author SHA1 Message Date
panlinlin
03fd4ba4cc 解决串流,解决编辑上级平台却新建了的问题 2021-04-15 17:48:52 +08:00
lawrencehj
9243c8a025 修改用户密码前先验证旧密码,增加安全性 2021-04-15 11:42:05 +08:00
panlinlin
1ff8c1b9c9 支持接口鉴权,支持修改密码, 2021-04-14 16:33:10 +08:00
panlinlin
f0afe02154 使用数据库用户表代替配置文件 2021-04-13 15:08:09 +08:00
panlinlin
14e4eaa553 优化编码信息信息页面 2021-04-13 11:33:26 +08:00
panlinlin
53de34af68 优化编码信息页面 2021-04-13 10:57:10 +08:00
lawrencehj
e6213eaab7 去除多余引用,修正个别错误 2021-04-13 10:13:36 +08:00
lawrencehj
8238608dee 修正播放按钮失效问题 2021-04-13 10:06:36 +08:00
panlinlin
cd93716b67 统一axios写法 2021-04-12 16:04:04 +08:00
panlinlin
ea9a8431fa 添加丢失的文件 2021-04-12 11:51:47 +08:00
panlinlin
bcf8042730 规范api 2021-04-11 22:32:28 +08:00
panlinlin
1c71836d22 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2021-04-11 15:00:52 +08:00
panlinlin
00cc0d1a2c 集成rtc播放器 2021-04-11 14:44:27 +08:00
panlinlin
b6b3aefd01 规范化api, 进行中。。。 2021-04-09 17:59:38 +08:00
panlinlin
912b9cb65e 规范化api, 进行中。。。 2021-04-07 18:35:13 +08:00
panlinlin
b502e2377d 修复添加级联平台是三个布尔字段无效的bug 2021-04-06 18:08:58 +08:00
panlinlin
3168b90520 页面销毁时关闭sseSource 2021-04-06 15:13:23 +08:00
panlinlin
157216a4da 增加推流转发到国标,尚不完善 2021-04-02 19:14:12 +08:00
panlinlin
850a5b2c6b 增加推流转发到国标,尚不完善 2021-04-02 19:04:01 +08:00
panlinlin
a3692072a1 添加拉流代理与国标关联, 支持代理rtsp/rtmp/...,转发到国标 2021-04-01 18:06:21 +08:00
panlinlin
22f58d318f 添加推流列表和拉流代理,下一步与国标关联 2021-03-30 18:46:34 +08:00
lawrencehj
97eea135da 修正更名deviceList.vue后跳转错误 2021-03-26 19:54:29 +08:00
panlinlin
a2eb45de09 添加获取直播流的api 2021-03-26 18:32:36 +08:00
panlinlin
7be7d8f794 重命名设备管理组件 2021-03-25 17:48:20 +08:00
panlinlin
48c0893de3 Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
# Conflicts:
#	README.md
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
#	src/main/resources/wvp.sqlite
#	web_src/.postcssrc.js
#	web_src/src/components/UiHeader.vue
#	web_src/src/main.js
#	web_src/src/router/index.js
2021-02-25 18:10:02 +08:00
lawrencehj
e15842c53c 调整界面布局 2021-02-03 10:54:41 +08:00
Lawrence
40020cc5a9 修复各页面按下回车键都会退回Contral页面的问题 2021-01-28 14:26:48 +08:00
Lawrence
5e7c3ed971 增加移动位置显示功能 2021-01-27 15:24:28 +08:00
Lawrence
5c45808348 修正不支持的method处理错误 2021-01-22 15:36:23 +08:00
Lawrence
cf438d9963 添加浏览器ID,确保SSE可同时推送到不同的前端 2021-01-21 20:58:11 +08:00
Lawrence
74460e7c95 添加浏览器ID,确保SSE可同时推送到不同的前端 2021-01-21 19:57:57 +08:00
Lawrence
a6ed1268e3 添加报警响应、发布和SSE推送功能 2021-01-20 23:31:00 +08:00
Lawrence
1488b50c1d 增加报警信息推送请求和页面通知发布 2021-01-20 20:41:24 +08:00
Lawrence
867e937805 增加前端Notify支持 2021-01-20 20:27:25 +08:00
Lawrence
02108af2f4 修正级联通道选择编辑关联错误 2021-01-20 20:25:44 +08:00
Lawrence
fa5f0082df 修正修改过上级平台信息后再次创建上级平台按钮不会变为'立即创建'的问题 2021-01-14 23:46:09 +08:00
Lawrence
2147e5e094 修正初次打开通道选择列表每页数量不对的问题 2021-01-14 23:41:54 +08:00
panlinlin
d0afd9b914 完成向上级联->通道推送
修复选择通道是查询的bug
2021-01-14 14:49:38 +08:00
panlinlin
9fdc010af7 Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 2021-01-13 18:11:45 +08:00
panlinlin
47047b91ab 回滚修复登陆的bug时不必修改的代码 2021-01-13 18:10:26 +08:00
panlinlin
7c13ec0c42 Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 2021-01-13 17:56:01 +08:00
panlinlin
38799fca56 修复登陆的bug 2021-01-13 17:49:19 +08:00
panlinlin
de56ff7c72 完成向上级联->选择通道-编辑页面密码不隐藏 2021-01-13 17:27:04 +08:00
panlinlin
f92b5ce097 完成向上级联->选择通道-003 2021-01-13 17:08:26 +08:00
panlinlin
7688a68fc2 Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 2021-01-12 10:48:01 +08:00
panlinlin
28de358c67 关闭播放窗口停止回放
回滚回放代码
2021-01-12 10:46:41 +08:00
panlinlin
a590f694f6 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2021-01-12 09:36:55 +08:00
Lawrence
39912aa9a2 修正页码计算错误 2021-01-11 21:03:23 +08:00
Lawrence
a532bd2aa9 平台向上级联,重新启用时自动重设Expires值 2021-01-11 20:54:29 +08:00
Lawrence
0a9d5a9bf5 格式调整 2021-01-11 20:44:24 +08:00