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 |
|