Commit Graph

439 Commits

Author SHA1 Message Date
648540858
fed353c645 优化分组管理 2023-11-09 18:05:30 +08:00
648540858
6fb820e49c 修复分组更新BUG 2023-11-08 18:30:41 +08:00
648540858
887f20524f 优化分组管理 2023-11-03 17:20:00 +08:00
648540858
e5ac02ff17 增加接口 2023-11-01 09:25:49 +08:00
648540858
a73508a24c 增加新的静态文件放过 2023-10-27 10:45:35 +08:00
648540858
89fd69b5ab 优化国标通道同步到资源库 2023-10-08 18:09:46 +08:00
648540858
cb41fc9f84 Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-10-08 15:42:08 +08:00
648540858
205f1f1f60 优化国标级联心跳失败再次注册的逻辑 2023-10-08 15:41:24 +08:00
648540858
9fa4bf6f77 Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-10-08 11:04:30 +08:00
648540858
c084d6c98a 优化国标级联心跳失败判断逻辑 2023-10-07 18:00:08 +08:00
648540858
29352cc9cd 优化自动同步国标通道到通用通道,分组信息以及行政区划自动同步 2023-10-06 23:39:38 +08:00
648540858
6255e6f89f 支持自动同步国标通道到通用通道,分组信息以及行政区划自动同步 2023-10-04 00:59:16 +08:00
648540858
8f7673a083 Merge branch 'wvp-28181-2.0' into database-structure-optimization
# Conflicts:
#	sql/2.6.9更新.sql
2023-10-01 23:59:04 +08:00
648540858
130dc5d82d 优化拉流代理逻辑,修复ffmpeg拉流代理鉴权 2023-09-30 06:09:16 +08:00
648540858
e2f0533510 添加字段控制是否自动同步国标通道 2023-09-26 15:39:52 +08:00
648540858
483d5e04a7 优化拉流代理 2023-09-25 18:51:02 +08:00
648540858
527dd66c0d 添加字段控制是否自动同步国标通道 2023-09-25 18:20:05 +08:00
648540858
94ec880fe8 Merge branch 'wvp-28181-2.0' into database-structure-optimization
# Conflicts:
#	sql/2.6.9更新.sql
2023-09-22 17:46:58 +08:00
648540858
b9a33f03d6 国标级联支持添加通道后主动推动到上级 2023-09-22 17:46:31 +08:00
648540858
37915522d7 Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-09-22 09:43:59 +08:00
648540858
a34db2ee8b 增加根据国标编号添加国标级联通道的接口 2023-09-21 21:34:02 +08:00
648540858
be527a4bd1 增加国标通道同步到资源管理 2023-09-19 17:55:13 +08:00
648540858
da15dc908d Merge branch 'wvp-28181-2.0' into database-structure-optimization
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
2023-09-15 09:36:38 +08:00
648540858
2d423d9668 Merge branch 'xinchuang' into wvp-28181-2.0 2023-09-15 09:35:14 +08:00
648540858
1d8dd248a5 接口优化 2023-09-15 09:34:29 +08:00
648540858
d05bce8f7f 修复对接金仓数据库中的问题 2023-09-12 15:32:17 +08:00
648540858
33debb002a Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-09-06 16:37:59 +08:00
648540858
d02078397e 修复修改流传输模式 2023-09-06 16:37:41 +08:00
648540858
c56a842194 Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-09-06 16:18:33 +08:00
648540858
212218c7c4
Merge pull request #1057 from lunasaw/dev-wvp-0906
fix set password
2023-09-06 10:32:24 +08:00
davidche
18aff4b546
修复 #1058 2023-09-06 10:30:20 +08:00
648540858
33d4107d0c 修复启动时如果上机平台不可连接的导致的持续报错 2023-09-06 10:21:42 +08:00
chenzhangyue
1d0c9c6a31 fix set password 2023-09-06 09:49:50 +08:00
chenzhangyue
bf8fbf4927 bugfix:这里应该不存在key才初始化一次 2023-09-01 17:22:53 +08:00
chenzhangyue
d38ccc257c 页面表单更新修复,这里update应该为查出来的DO,不是前端的DO,采用更安全的redis策略,更新DB删除缓存,查询设备的时候补充缓存 2023-08-31 17:36:57 +08:00
648540858
32ec1cb912 增加通用通道接口 2023-08-31 09:45:51 +08:00
648540858
a730fc904b 添加从国标通道同步的方法 2023-08-30 15:05:52 +08:00
648540858
43fe078723 添加通道管理 2023-08-25 15:49:56 +08:00
648540858
0701791902 添加资源管理 2023-08-24 16:15:58 +08:00
648540858
dbe5b8f5a8 添加公用国标通道与sql 2023-08-21 17:54:15 +08:00
648540858
91e49745e4 修复心跳异常,支持通道列表,推流列表,拉流代理列表直接查看对应的云端录像,兼容大于INT的ssrc的格式化 2023-08-16 01:55:50 +08:00
chenzhangyue
dd2ae65786 修复代理访问跨域问题,和ScheduledFuture取消任务时指令重排异常,不结束正在运行的任务。防止 Command interrupted 2023-08-10 20:00:43 +08:00
648540858
470625e077 支持全局固定流地址 2023-08-07 17:00:01 +08:00
648540858
fa13b22819 invite消息缓存字符间隔改为使用:代替_,避免scan查询失败 2023-08-04 17:53:12 +08:00
648540858
4a34097b68 录像下载不使用固定地址 2023-08-04 16:41:29 +08:00
648540858
988dc36fa5 重构点播,回放,下载时ssrc不一致以及TCP主动播放的逻辑 2023-08-04 15:47:56 +08:00
648540858
ba884fa9ef 默认关闭ssrc check 2023-08-03 16:08:22 +08:00
648540858
a01086fe1c 修复tcp主动录像回放时ssrc不一致时点播失败的问题 2023-08-03 15:50:15 +08:00
648540858
6797f77259 优化点播超时的处理,修复tcp主动点播时ssrc不一致时点播失败的问题 2023-08-03 15:36:59 +08:00
648540858
095a3e1384 移除无用代码 2023-07-31 12:26:42 +08:00