lin
|
420b3889c5
|
[1078] 合并新UI
|
2025-05-16 15:17:35 +08:00 |
|
lin
|
98e6cfcc4c
|
Merge branch 'master' into dev/1078-newUI
|
2025-05-15 10:00:40 +08:00 |
|
lin
|
91d571d8d4
|
增加设置，支持屏蔽频繁注册不段开关tcp连接的设备
|
2025-05-15 09:55:37 +08:00 |
|
648540858
|
3b7ba3eb46
|
Merge branch 'master' into dev/1078-newUI
# Conflicts:
# src/main/resources/application.yml
|
2025-05-10 08:59:45 +08:00 |
|
648540858
|
b9a4cac707
|
修复文档描述跳转错误
|
2025-05-10 07:57:14 +08:00 |
|
lin
|
3c1c68d327
|
调整地址
|
2025-04-28 13:07:04 +08:00 |
|
lin
|
403bee3108
|
切换地址
|
2025-04-27 17:09:57 +08:00 |
|
648540858
|
f86af27b60
|
优化统计信息获取
|
2025-04-27 06:15:05 +08:00 |
|
lin
|
e2678f39e3
|
临时提交
|
2025-04-25 18:04:51 +08:00 |
|
lin
|
4dd5864cf1
|
Merge branch 'master' into dev/前端页面修改
|
2025-04-24 08:43:41 +08:00 |
|
648540858
|
900447ae5c
|
增加文档使用说明
|
2025-04-23 22:18:19 +08:00 |
|
lin
|
4ad9f83ee9
|
登录后用户信息增加服务ID
|
2025-04-23 20:36:28 +08:00 |
|
lin
|
dd32f4b07a
|
增加sip信令超时时间
|
2025-04-22 09:52:31 +08:00 |
|
lin
|
ba58eff4be
|
解决启动时的警告
|
2025-04-21 15:08:38 +08:00 |
|
lin
|
3b4a6018cb
|
修复云端录像seek问题
|
2025-04-16 18:07:04 +08:00 |
|
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
|
20135726eb
|
Merge branch 'master' into 重构/1078
|
2025-03-24 15:19:07 +08:00 |
|
lin
|
ec74488b4a
|
修复国标级联注册失败
|
2025-03-20 09:21:01 +08:00 |
|
lin
|
0329c8f5d1
|
Merge remote-tracking branch 'origin/master' into 重构/1078
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
# 数据库/2.7.3/初始化-mysql-2.7.3.sql
# 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
|
2025-03-18 15:30:35 +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
|
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
|
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
|
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
|
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 |
|