648540858
|
05fabc87a2
|
临时提交
|
2024-07-22 18:00:01 +08:00 |
|
648540858
|
ff5ba1698a
|
Merge branch 'refs/heads/master' into dev/master-通道结构重构
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2024-07-22 14:29:54 +08:00 |
|
648540858
|
b7d671e6d9
|
优化录像下载流程
|
2024-07-22 14:21:23 +08:00 |
|
648540858
|
c96c29776d
|
临时提交
|
2024-07-22 14:20:40 +08:00 |
|
648540858
|
2f4d983f9f
|
修复拉流看方式回显
|
2024-07-22 11:07:58 +08:00 |
|
panlinlin
|
0b7d55ed74
|
修复拉流代理相关问题
|
2024-07-20 23:31:38 +08:00 |
|
panlinlin
|
80ac701748
|
临时提交
|
2024-07-20 06:44:53 +08:00 |
|
panlinlin
|
d201be2f88
|
修复设备初次注册无通道
|
2024-07-20 06:35:42 +08:00 |
|
panlinlin
|
1dc0cb0c83
|
临时提交
|
2024-07-19 20:29:10 +08:00 |
|
648540858
|
9f4e66a38b
|
优化拉流代理
|
2024-07-19 17:54:14 +08:00 |
|
648540858
|
78088ba53f
|
临时提交
|
2024-07-18 18:00:45 +08:00 |
|
648540858
|
4e6f7f8385
|
Merge pull request #1533 from wendy512/bugfix
解决国标视频回放判断streamMode时空指针异常问题
|
2024-07-18 14:09:15 +08:00 |
|
648540858
|
f331b0b0d3
|
Merge pull request #1524 from ZhaoYandong00/master
修复在docker中使用，平台信息IP无法显示主机IP的问题
|
2024-07-18 14:08:05 +08:00 |
wendy512
|
7732a1d180
|
解决国标视频回放判断streamMode时空指针异常问题
|
2024-07-18 13:40:47 +08:00 |
|
648540858
|
e46ad4e66a
|
临时提交
|
2024-07-17 17:56:26 +08:00 |
|
648540858
|
15f44b0d23
|
修改拉流代理表单
|
2024-07-16 18:01:16 +08:00 |
|
648540858
|
8c95485504
|
修复推流信息播放
|
2024-07-16 17:44:27 +08:00 |
|
648540858
|
d7abe7fb75
|
适配推流列表信息
|
2024-07-16 17:33:18 +08:00 |
|
648540858
|
90d298f7a7
|
临时提交
|
2024-07-15 17:59:41 +08:00 |
|
648540858
|
1dcb912910
|
调整推流导入的数据格式
|
2024-07-15 17:52:27 +08:00 |
|
648540858
|
d9c0d0637c
|
增加通道编辑以及通道重置功能
|
2024-07-15 17:39:47 +08:00 |
|
648540858
|
9d37e96f06
|
修复空指针异常
|
2024-07-15 16:30:21 +08:00 |
|
648540858
|
92c6a10083
|
临时提交
|
2024-07-15 15:42:15 +08:00 |
|
648540858
|
4467684370
|
临时提交
|
2024-07-12 18:00:02 +08:00 |
|
648540858
|
cb403689b4
|
添加通道编号构建页面
|
2024-07-12 17:52:05 +08:00 |
|
panlinlin
|
0853d7e842
|
临时提交
|
2024-07-11 23:52:34 +08:00 |
|
648540858
|
6619c5c53d
|
临时提交
|
2024-07-11 18:25:16 +08:00 |
|
panlinlin
|
84dcd4d8b8
|
临时提交
|
2024-07-10 23:25:54 +08:00 |
|
648540858
|
bec52f687e
|
临时提交
|
2024-07-10 17:53:15 +08:00 |
|
648540858
|
a084fac7cd
|
优化通道数据显示
|
2024-07-10 17:33:04 +08:00 |
|
648540858
|
6ecf8af6ca
|
优化通道数据异常时的入库逻辑
|
2024-07-10 15:58:26 +08:00 |
|
648540858
|
b843958ed7
|
临时提交
|
2024-07-10 14:43:22 +08:00 |
|
648540858
|
bb609b7e09
|
临时提交
|
2024-07-10 10:51:35 +08:00 |
|
panlinlin
|
e73fb64283
|
临时提交
|
2024-07-10 00:12:45 +08:00 |
|
panlinlin
|
aa9397ca21
|
临时提交
|
2024-07-10 00:07:01 +08:00 |
|
648540858
|
61b811e701
|
临时提交
|
2024-07-09 18:00:44 +08:00 |
|
648540858
|
046e7802f3
|
临时提交
|
2024-07-09 17:55:51 +08:00 |
|
648540858
|
2235caca36
|
临时提交
|
2024-07-08 18:00:44 +08:00 |
|
648540858
|
4912ce16ec
|
临时提交
|
2024-07-08 17:44:35 +08:00 |
ZhaoYandong00
|
d1af677fff
|
修复在docker中使用，平台信息IP无法显示主机IP的问题
配置sip,showip用来显示主机IP
|
2024-07-08 16:34:29 +08:00 |
|
648540858
|
7b7512f84d
|
临时提交
|
2024-07-08 15:10:02 +08:00 |
|
648540858
|
fe921b860a
|
Merge branch 'refs/heads/master' into dev/master-通道结构重构
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/resources/application.yml
|
2024-07-08 14:09:48 +08:00 |
|
648540858
|
cf5ca3afb9
|
修复设备断网导致超时的空指针异常
|
2024-07-08 11:40:37 +08:00 |
|
panlinlin
|
052bbf16c3
|
临时提交
|
2024-07-07 07:28:54 +08:00 |
|
648540858
|
52aa4e6e85
|
实现GbChannelServiceImpl
|
2024-07-05 17:22:21 +08:00 |
|
648540858
|
1cb1b0bd36
|
临时提交
|
2024-07-04 18:00:41 +08:00 |
|
648540858
|
7936194718
|
调整数据库字段
|
2024-07-04 16:55:42 +08:00 |
|
648540858
|
0b0344bb6d
|
添加重构数据库模板
|
2024-07-03 17:49:09 +08:00 |
|
648540858
|
b98cfd1fed
|
使用Slf4j注解打印日志
|
2024-07-03 17:24:35 +08:00 |
|
648540858
|
adf040ec4b
|
优化日志以及属性设置代码
|
2024-07-03 17:09:49 +08:00 |