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 |
|
panlinlin
|
d201be2f88
|
修复设备初次注册无通道
|
2024-07-20 06:35:42 +08:00 |
|
648540858
|
9f4e66a38b
|
优化拉流代理
|
2024-07-19 17:54:14 +08:00 |
|
648540858
|
d7abe7fb75
|
适配推流列表信息
|
2024-07-16 17:33:18 +08:00 |
|
648540858
|
1dcb912910
|
调整推流导入的数据格式
|
2024-07-15 17:52:27 +08:00 |
|
648540858
|
d9c0d0637c
|
增加通道编辑以及通道重置功能
|
2024-07-15 17:39:47 +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 |
|
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
|
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 |
|
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
|
b98cfd1fed
|
使用Slf4j注解打印日志
|
2024-07-03 17:24:35 +08:00 |
|
648540858
|
adf040ec4b
|
优化日志以及属性设置代码
|
2024-07-03 17:09:49 +08:00 |
|
648540858
|
799932f614
|
优化日志以及属性设置代码
|
2024-07-03 16:14:18 +08:00 |
|
648540858
|
10c852c00d
|
优化目录信息内容构建
|
2024-07-02 16:35:03 +08:00 |
|
648540858
|
324fef2908
|
临时提交
|
2024-07-01 17:59:14 +08:00 |
|
648540858
|
d1df17c007
|
适配拉流代理
|
2024-07-01 17:12:43 +08:00 |
|
648540858
|
88c021948f
|
临时提交
|
2024-06-27 18:41:58 +08:00 |
|
648540858
|
b2aa5c839d
|
临时提交
|
2024-06-27 17:51:13 +08:00 |
|
648540858
|
400eef2d2e
|
临时提交
|
2024-06-27 16:02:43 +08:00 |
|
648540858
|
1616a2a731
|
Merge remote-tracking branch 'gitee-c/dev/master-通道结构重构' into dev/master-通道结构重构
|
2024-06-26 18:41:37 +08:00 |
|
648540858
|
f32eb14125
|
临时提交
|
2024-06-26 18:36:32 +08:00 |
|
648540858
|
e4c11bfebe
|
Merge branch 'refs/heads/master' into dev/master-通道结构重构
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
|
2024-06-25 16:46:47 +08:00 |
|
648540858
|
68fce9177f
|
临时提交
|
2024-06-25 16:45:31 +08:00 |
|
648540858
|
87c071fd5e
|
合并271分支
|
2024-06-25 10:24:35 +08:00 |
|
648540858
|
57a230afb3
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2024-06-25 09:45:34 +08:00 |
|
panlinlin
|
397ac956de
|
调整通用通道的位置
|
2024-06-21 16:05:13 +08:00 |
|
648540858
|
306c42b4b7
|
临时提交
|
2024-06-20 22:29:50 +08:00 |
|
648540858
|
246c01b1c8
|
重命名通道信息
|
2024-06-20 20:49:17 +08:00 |
|
648540858
|
40bf2d6642
|
添加通道信息
|
2024-06-20 20:24:15 +08:00 |
|
648540858
|
e0c957a0c5
|
Merge branch 'refs/heads/master' into dev/master-通道结构重构
|
2024-06-20 20:06:01 +08:00 |
|
648540858
|
5e82aa5f39
|
优化拉流代理国标级联点播
|
2024-06-20 20:04:48 +08:00 |
|
648540858
|
5c40608458
|
临时提交
|
2024-06-20 20:04:29 +08:00 |
|
648540858
|
45410d8091
|
优化拉流代理国标级联点播
|
2024-06-20 19:46:48 +08:00 |
|
648540858
|
afe80a7be1
|
调整获取监听信息的逻辑
|
2024-06-18 10:00:32 +08:00 |
|
648540858
|
aa56bb3c26
|
优化docker内ip变化的情况
|
2024-06-14 09:47:19 +08:00 |
|
panlinlin
|
07a8ef9e25
|
SIP只有一个监听时，直接返回
|
2024-06-14 00:03:57 +08:00 |
|