Commit Graph

386 Commits

Author SHA1 Message Date
648540858
45b3d9322c 增加云端录像手动删除 2025-04-14 22:54:30 +08:00
lin
aa1e497d76 临时提交 2025-04-10 17:11:31 +08:00
lin
481609ef72 修复录制计划开启录像失败的BUG 2025-04-09 16:48:50 +08:00
lin
ec74488b4a 修复国标级联注册失败 2025-03-20 09:21:01 +08:00
648540858
c5eca3ca0e 修复sip消息订阅事件移除失败的BUG 2025-02-12 22:55:51 +08:00
lin
b6c3f42a1f Merge branch 'refs/heads/master' into dev/数据库统合2
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
#	src/main/resources/配置详情.yml
2025-02-11 19:30:20 +08:00
lin
547432e194 优化jwk.json读取 2025-02-07 17:48:06 +08:00
648540858
39de934f89 Merge pull request #1762 from BeatTime/bugfix/读取jwk.json异常
fix: 修复jwk.json无法读取的问题,同时增加jwkFile配置项
2025-02-05 16:46:08 +08:00
liyexin
2f53a4d01e fix: 修复jwk.json无法读取的问题,同时增加jwkFile配置项 2025-01-23 16:05:12 +08:00
648540858
4e66e2bc6d [集群] 增加通道刷新状态消息 2025-01-21 17:04:51 +08:00
guo
36004d471c fix: 在SpringBoot 2.4及以上版本处理跨域时,遇到错误提示:当allowCredentials为true时,allowedOrigins不能包含特殊值"*" 2025-01-08 16:31:35 +08:00
648540858
91b0ba4d5e [集群-自动切换过国标级联] 启动时自动注册上级只注册本平台的上级 2025-01-02 16:30:02 +08:00
648540858
d022eb72d6 [集群-自动切换过国标级联] 添加检测wvp奔溃与重新注册 2025-01-02 16:16:50 +08:00
648540858
884fcb827f [集群-自动切换过国标级联] 添加数据库脚本 2025-01-02 14:29:13 +08:00
648540858
3331a7d931 增加集群模式下自动切换过国标级联的执行服务 2024-12-31 17:07:19 +08:00
648540858
b78e6dfd70 Merge branch 'master' into dev/数据库统合 2024-12-16 17:55:46 +08:00
648540858
b37b9f3b03 支持配置管理页面登录超时时间 2024-12-16 16:14:28 +08:00
648540858
3769e70094 移除错误方法 2024-12-13 15:09:50 +08:00
648540858
59f1ab4e77 Merge remote-tracking branch 'github/dev/数据库统合' into dev/数据库统合2 2024-12-13 15:07:55 +08:00
648540858
3e78af64de 增加RPC录像列表查询 2024-12-13 15:02:06 +08:00
648540858
bd26ffdf00 Merge branch 'master' into dev/数据库统合 2024-12-13 09:39:32 +08:00
648540858
6f28e6b497 优化线程池配置 2024-12-12 23:44:41 +08:00
648540858
304e596440 优化RPC时间定义 2024-12-12 17:00:58 +08:00
648540858
ee590d6597 增加RPC调用停止实时流播放 2024-12-12 16:30:40 +08:00
648540858
4056955c59 修复点播调用判断 2024-12-12 12:44:11 +08:00
648540858
0a06ae9475 优化RPC调用 2024-12-12 12:42:57 +08:00
648540858
8d6a978978 [redis下的多wvp] 优化服务间方法调用 2024-12-11 18:26:18 +08:00
648540858
c0ef6a4524 指定读取行政区划文件编码 2024-12-09 14:27:54 +08:00
648540858
5bbd461d88 修复WebUi长时间不退出登录的BUG 2024-12-05 16:21:50 +08:00
648540858
7a39f8a439 Merge branch 'master' into dev/ws-log 2024-11-04 10:16:20 +08:00
648540858
2c4311b58c 修复运维中心中开启历史日志后再开启实时日志连接失败 2024-11-04 10:15:45 +08:00
chipunderblade
a75d364e40 fix: fix swagger incorrect path 2024-11-04 09:06:54 +08:00
648540858
a6993b35fd 实现日志文件检索和日志文件下载接口 2024-11-03 00:32:39 +08:00
648540858
9789fcd3fa 尝试websocket支持登陆 2024-11-02 12:11:52 +08:00
648540858
71c0de2aa9 初步实现前端展示 2024-11-01 14:51:11 +08:00
648540858
effb705f99 支持服务端日志传入前端 2024-10-31 17:37:34 +08:00
648540858
396961ea20 策略配置文件增加注释与使用Lombok 2024-10-30 15:19:17 +08:00
648540858
98b4566c6c 移除操作日志记录到数据库功能 2024-10-29 16:56:14 +08:00
648540858
d2fc2df77b 优化通道刷新的时接收下级消息的效率 2024-10-22 17:41:42 +08:00
648540858
2492b0d638 修复 SiP消息超时未未回复无法识别的BUG 2024-10-16 17:17:17 +08:00
648540858
59a52705cf 临时提交 2024-09-25 14:32:09 +08:00
648540858
3b2a28fd00 移除旧的数据库操作类 2024-09-24 15:59:47 +08:00
648540858
800d6c926a 修复数据库语法兼容以及redis接收推流信息导入 2024-09-14 15:19:07 +08:00
648540858
0722aa3aeb 临时提交 2024-08-22 18:05:57 +08:00
648540858
88abf36d6f 临时提交 2024-08-18 23:01:02 +08:00
648540858
9247c7e805 完善国标级联点播推流,拉流代理,国标 2024-08-17 22:31:13 +08:00
648540858
abed3ecbec 临时提交 2024-08-15 17:45:24 +08:00
panlinlin
76a0d248ef 临时提交 2024-08-10 23:27:21 +08:00
648540858
3ce973d2ee 临时提交 2024-07-30 17:58:18 +08:00
648540858
5a812e7f08 临时提交 2024-07-24 17:54:19 +08:00