aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-26 15:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,017 Commits 27 Branches 1 Tag 210 MiB
277f2db137
Commit Graph

77 Commits

Author SHA1 Message Date
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