648540858
|
3bae4ce63e
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
|
2025-01-17 10:53:08 +08:00 |
|
648540858
|
e139676151
|
修复因数据库路径定义长度短导致记录无法添加的BUG
|
2025-01-11 22:32:57 +08:00 |
|
648540858
|
884fcb827f
|
[集群-自动切换过国标级联] 添加数据库脚本
|
2025-01-02 14:29:13 +08:00 |
|
648540858
|
adfd28d9d7
|
[RPC] 云端录像数据库调整
|
2024-12-31 15:56:55 +08:00 |
|
648540858
|
c629685cd1
|
[RPC 拉流代理] 修复停止是误报信息
|
2024-12-31 11:39:09 +08:00 |
|
648540858
|
26ee38aebe
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java
# src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxyParam.java
|
2024-12-31 10:33:12 +08:00 |
|
648540858
|
8f7016878d
|
[拉流代理] 增加单独的字段管理每次拉流需要的节点
|
2024-12-31 10:17:49 +08:00 |
|
648540858
|
7e89b5f97f
|
临时提交
|
2024-12-31 09:31:58 +08:00 |
|
648540858
|
a4af7eb9a1
|
Merge branch 'master' into dev/数据库统合
|
2024-12-27 17:14:48 +08:00 |
|
南宫茜
|
73be39127b
|
修复数据库内容
|
2024-12-27 16:30:44 +08:00 |
|
648540858
|
e05d988755
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
|
2024-12-27 10:57:42 +08:00 |
|
648540858
|
3ea236efdd
|
优化更新sql
|
2024-12-27 10:07:22 +08:00 |
|
648540858
|
19453f7ca9
|
临时提交
|
2024-12-23 07:20:48 +08:00 |
|
648540858
|
825daad355
|
调整数据库结构
|
2024-12-22 08:35:36 +08:00 |
|
648540858
|
51f126e571
|
Merge branch 'master' into 重构/1078
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# 数据库/2.7.3/初始化-mysql-2.7.3.sql
# 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
|
2024-12-19 23:19:09 +08:00 |
|
648540858
|
541726a43c
|
调整通用点播RPC调用
|
2024-12-12 09:37:12 +08:00 |
|
648540858
|
ca9b5c2054
|
修改媒体节点表数据结构
|
2024-12-12 09:29:49 +08:00 |
|
648540858
|
8d6a978978
|
[redis下的多wvp] 优化服务间方法调用
|
2024-12-11 18:26:18 +08:00 |
|
648540858
|
f528735119
|
Merge branch 'master' into 重构/1078
|
2024-12-05 11:05:44 +08:00 |
|
648540858
|
cc56ed3355
|
临时提交
|
2024-11-27 22:44:22 +08:00 |
|
648540858
|
57e1934f02
|
Merge branch 'master' into dev/录制计划
|
2024-11-26 20:59:27 +08:00 |
|
648540858
|
6136603b3f
|
移除过时的数据库脚本
|
2024-11-26 11:30:38 +08:00 |
|
648540858
|
0cacdb5928
|
增加数据库结构以及接口
|
2024-11-20 22:33:21 +08:00 |
|
648540858
|
2dcbee74b0
|
新增添加录制计划接口
|
2024-11-20 18:37:39 +08:00 |
|
648540858
|
ea2751e29b
|
添加录制计划的页面与通道查询接口
|
2024-11-19 16:42:11 +08:00 |
|
648540858
|
a4ca333abb
|
合并主线
|
2024-11-10 22:09:13 +08:00 |
|
648540858
|
e5fd66ef96
|
Merge branch 'master' into 重构/1078
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2024-11-10 15:29:53 +08:00 |
|
648540858
|
0bbac37135
|
修复建表语句不同步
|
2024-10-29 17:35:45 +08:00 |
|
648540858
|
98b4566c6c
|
移除操作日志记录到数据库功能
|
2024-10-29 16:56:14 +08:00 |
|
648540858
|
fee8d2f8cd
|
优化Catalog查询内存占用高的问题
|
2024-10-26 23:15:18 +08:00 |
|
648540858
|
53f2f36f37
|
修复国标设备/设备列表中业务分组的子节点查看
|
2024-10-22 17:21:08 +08:00 |
|
648540858
|
36409eb34c
|
修复默认新建设备未设置节点策略的BUG
|
2024-10-21 09:27:36 +08:00 |
|
648540858
|
277f2db137
|
Merge branch 'master' into 重构/1078
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
# src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
# src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
# src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/TcpServer.java
# src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
# src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
# src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/utils/CivilCodeUtil.java
# src/main/resources/application.yml
# web_src/src/layout/UiHeader.vue
# web_src/src/router/index.js
|
2024-10-18 13:55:23 +08:00 |
|
648540858
|
60b61d7c30
|
修复273版本sql文件名称
|
2024-10-13 20:38:12 +08:00 |
|
648540858
|
37a3f56ffd
|
调整配置以及数据库目录
|
2024-10-12 09:11:21 +08:00 |
|
648540858
|
3e0170b164
|
调整配置以及数据库目录
|
2024-10-11 15:28:19 +08:00 |
|
648540858
|
225a444f9b
|
去除非当前版本使用的字段
|
2024-10-07 15:19:00 +08:00 |
|
648540858
|
145785e881
|
去除非当前版本使用的字段
|
2024-10-07 15:07:29 +08:00 |
|
648540858
|
c2fbfe342e
|
修改错别字
|
2024-10-06 16:01:28 +08:00 |
|
648540858
|
59a52705cf
|
临时提交
|
2024-09-25 14:32:09 +08:00 |
|
648540858
|
550b90b157
|
Merge branch 'master' into dev/master-通道结构重构
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
|
2024-09-18 09:10:12 +08:00 |
|
648540858
|
800d6c926a
|
修复数据库语法兼容以及redis接收推流信息导入
|
2024-09-14 15:19:07 +08:00 |
|
648540858
|
56230b84ec
|
完善数据库脚本
|
2024-09-13 15:49:46 +08:00 |
|
648540858
|
8dc27d1353
|
国标级联通道共享支持自定义通道编号和名称
|
2024-08-29 16:47:46 +08:00 |
|
648540858
|
dd794d4868
|
临时提交
|
2024-08-27 17:56:49 +08:00 |
|
648540858
|
d2654660cb
|
临时提交
|
2024-08-23 17:50:29 +08:00 |
|
648540858
|
ae0235c0f8
|
临时提交
|
2024-08-22 18:07:42 +08:00 |
|
648540858
|
0722aa3aeb
|
临时提交
|
2024-08-22 18:05:57 +08:00 |
|
648540858
|
a18fba8495
|
临时提交
|
2024-08-21 17:40:01 +08:00 |
|
648540858
|
abed3ecbec
|
临时提交
|
2024-08-15 17:45:24 +08:00 |
|
panlinlin
|
76a0d248ef
|
临时提交
|
2024-08-10 23:27:21 +08:00 |
|
648540858
|
16708e385b
|
支持多WVP的推流播放
|
2024-08-09 16:27:08 +08:00 |
|
panlinlin
|
3e220a2c1e
|
临时提交
|
2024-08-07 23:45:29 +08:00 |
|
648540858
|
fbc7343546
|
调整数据库名称
|
2024-08-07 14:20:48 +08:00 |
|
648540858
|
55c534ac90
|
临时提交
|
2024-08-02 14:46:20 +08:00 |
|
648540858
|
f7c98301ac
|
临时提交
|
2024-08-01 15:29:51 +08:00 |
|
648540858
|
112cb2dfd8
|
临时提交
|
2024-07-29 17:44:34 +08:00 |
|
648540858
|
05fabc87a2
|
临时提交
|
2024-07-22 18:00:01 +08:00 |
|
648540858
|
9f4e66a38b
|
优化拉流代理
|
2024-07-19 17:54:14 +08:00 |
|
648540858
|
e46ad4e66a
|
临时提交
|
2024-07-17 17:56:26 +08:00 |
|
648540858
|
d7abe7fb75
|
适配推流列表信息
|
2024-07-16 17:33:18 +08:00 |
|
648540858
|
6619c5c53d
|
临时提交
|
2024-07-11 18:25:16 +08:00 |
|
648540858
|
bb609b7e09
|
临时提交
|
2024-07-10 10:51:35 +08:00 |
|
648540858
|
4912ce16ec
|
临时提交
|
2024-07-08 17:44:35 +08:00 |
|
648540858
|
52aa4e6e85
|
实现GbChannelServiceImpl
|
2024-07-05 17:22:21 +08:00 |
|
648540858
|
7936194718
|
调整数据库字段
|
2024-07-04 16:55:42 +08:00 |
|
648540858
|
0b0344bb6d
|
添加重构数据库模板
|
2024-07-03 17:49:09 +08:00 |
|
panlinlin
|
358799a391
|
1078-添加接入国标通道页面以及属性
|
2024-06-18 05:55:42 +08:00 |
|
panlinlin
|
4ba04661ab
|
1078-添加接入国标通道表
|
2024-06-16 09:14:35 +08:00 |
|
panlinlin
|
7ffe773175
|
1078-调整数据库建表语句
|
2024-06-08 21:17:37 +08:00 |
|
648540858
|
595d9be283
|
1078-优化点播以及通道表结构
|
2024-06-08 00:46:08 +08:00 |
|
648540858
|
913d358a11
|
1078-部标通道添加音频控制
|
2024-06-07 00:20:52 +08:00 |
|
648540858
|
5d5d654410
|
1078-添加部标通道页面
|
2024-06-07 00:10:36 +08:00 |
|
648540858
|
f7d811a299
|
1078-调整业务信息
|
2024-06-06 07:26:20 +08:00 |
|
648540858
|
5c826ef449
|
1078-添加通道信息
|
2024-06-06 00:23:16 +08:00 |
|
648540858
|
37b79633f0
|
Merge branch 'refs/heads/master' into 1078
|
2024-05-28 18:40:44 +08:00 |
|
648540858
|
5a70a4742d
|
修正数据库sql文件
|
2024-05-28 10:39:26 +08:00 |
|
648540858
|
2c89fae49a
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
# src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
# src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.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/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
|
2024-05-23 17:32:15 +08:00 |
|
648540858
|
2daa59d78c
|
支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题
|
2024-05-23 17:10:45 +08:00 |
|
648540858
|
49101a37e0
|
兼容zlm-pro转码
|
2024-05-17 16:32:01 +08:00 |
|
648540858
|
db4ba4035f
|
Merge branch 'refs/heads/master' into 1078
|
2024-05-12 06:53:53 +08:00 |
|
648540858
|
622d72b3f0
|
解决刷新通道异常
|
2024-05-08 12:16:18 +08:00 |
|
648540858
|
d41d6b34af
|
Merge branch 'refs/heads/2.7.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.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/ByeRequestProcessor.java
# 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/ZLMMediaListManager.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
# src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
# src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
# src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
|
2024-04-23 20:59:20 +08:00 |
|
648540858
|
bd0fafde81
|
修复目录订阅发送订阅未携带经纬度的问题
|
2024-04-15 15:51:10 +08:00 |
|
648540858
|
3cd3e97cd7
|
合并分支270
|
2024-04-12 16:06:21 +08:00 |
|
648540858
|
78f4e41536
|
Merge branch '2.7.0'
|
2024-04-12 16:05:48 +08:00 |
|
648540858
|
819ec97d66
|
移除全量脚本多余字段
|
2024-04-12 16:05:29 +08:00 |
|
648540858
|
05c83cf6ef
|
Merge branch 'master' into 1078
|
2024-04-11 09:39:04 +08:00 |
|
648540858
|
0f4b5eed7d
|
优化apikey列表样式
|
2024-04-10 23:09:28 +08:00 |
|
leesam
|
16b7e4a7ef
|
Merge branch 'refs/heads/master' into develop-add-api-key
|
2024-04-10 20:49:44 +08:00 |
|
648540858
|
54b878d2e1
|
优化代码，升级版本号为2.7.1
|
2024-04-09 22:43:45 +08:00 |
|
648540858
|
b1b6fae22c
|
Merge branch 'master' into dev/zlm
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
|
2024-04-09 10:35:11 +08:00 |
|
ancienter
|
25ff2fc4ef
|
Merge branch '648540858:master' into develop-add-api-key
|
2024-04-09 09:52:23 +08:00 |
|
648540858
|
ae239c8848
|
Merge branch 'master' into 1078
|
2024-04-08 18:15:06 +08:00 |
|
648540858
|
48351c875e
|
国标级联支持制定200OK中sdp的IP
|
2024-04-08 18:13:15 +08:00 |
|
648540858
|
8b90fade9e
|
支持使用abl接收国标流
|
2024-04-02 00:05:09 +08:00 |
|
648540858
|
181bf76862
|
优化节点在线状态
|
2024-03-20 18:54:39 +08:00 |
|
leesam
|
76208975bf
|
[add]支持其他平台通过ApiKey调用系统相关接口
|
2024-03-19 16:53:01 +08:00 |
|
648540858
|
1768565ce0
|
优化媒体节点服务的代码结构
|
2024-03-18 23:42:18 +08:00 |
|
648540858
|
23a72e94e6
|
1078-优化列表展示效果
|
2024-03-14 18:04:28 +08:00 |
|