lin
|
2a5435c810
|
修改图层展示方式
|
2025-10-31 17:06:11 +08:00 |
|
lin
|
1156880194
|
Merge branch 'master' into dev/springBoot3
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/controller/MediaController.java
# src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Controller.java
|
2025-09-24 08:38:29 +08:00 |
|
lin
|
18be8aff6c
|
abl 支持拉流代理
|
2025-09-08 16:09:01 +08:00 |
|
lin
|
fad9f2954a
|
增加配置，修复添加部标设备异常
|
2025-08-07 17:52:06 +08:00 |
|
lin
|
45509372bd
|
修复过期时间设置异常
|
2025-08-07 17:31:51 +08:00 |
|
lin
|
465e03d15d
|
Merge branch 'master' into 重构/1078
# Conflicts:
# web/src/router/index.js
# web/src/views/common/channelPlayer/chooseChannelForJt.vue
# web/src/views/common/channelPlayer/jtDeviceEdit.vue
# web/src/views/common/channelPlayer/jtDevicePlayer.vue
# web_src/src/layout/UiHeader.vue
# web_src/src/main.js
# web_src/src/router/index.js
|
2025-07-03 09:41:55 +08:00 |
|
Jerry Yan
|
eada4a64dc
|
Merge branch 'boot3' into h2
# Conflicts:
# src/main/resources/application-dev.yml
|
2025-06-13 16:41:32 +08:00 |
|
Jerry Yan
|
1b35fbd0e0
|
支持关闭返回Date Header，进而实现关闭对摄像头的校时功能
Fixes #1700
|
2025-06-12 16:05:06 +08:00 |
|
Jerry Yan
|
8848de9d15
|
支持h2数据库
|
2025-06-11 12:54:45 +08:00 |
|
Jerry Yan
|
44bd521446
|
spring redis 新配置风格
|
2025-06-11 10:08:03 +08:00 |
|
lin
|
f4bbca78e5
|
优化通道变化消息发送以及增加设备状态丢失检测
|
2025-06-03 16:52:42 +08:00 |
|
lin
|
a7f9cbd8ef
|
版本号提升
|
2025-05-26 09:53:58 +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 |
|
lin
|
9abff9f1fb
|
更新README
|
2025-04-28 15:58:02 +08:00 |
|
lin
|
113743a065
|
增加新版本web页面
|
2025-04-28 15:04:06 +08:00 |
|
lin
|
3b4a6018cb
|
修复云端录像seek问题
|
2025-04-16 18:07:04 +08:00 |
|
648540858
|
add88ec6b8
|
增加关闭服务接口以及在linux上安装为服务的脚本
|
2025-04-13 21:38:51 +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 |
|
lin
|
4e244de7d5
|
修复配置说明中数据库配置
|
2025-03-12 17:05:05 +08:00 |
|
lin
|
4b7275d440
|
恢复配置文件一致
|
2025-03-12 14:37:33 +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 |
|
liyexin
|
2f53a4d01e
|
fix: 修复jwk.json无法读取的问题，同时增加jwkFile配置项
|
2025-01-23 16:05:12 +08:00 |
|
648540858
|
5cd509b644
|
修改平台名称
|
2025-01-02 17:19:03 +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
|
3e78af64de
|
增加RPC录像列表查询
|
2024-12-13 15:02:06 +08:00 |
|
648540858
|
72da4cfa3c
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# README.md
|
2024-12-09 15:47:15 +08:00 |
|
648540858
|
5777a8e93c
|
去除动态数据库切换
|
2024-12-06 17:11:22 +08:00 |
|
648540858
|
0cacdb5928
|
增加数据库结构以及接口
|
2024-11-20 22:33:21 +08:00 |
|
648540858
|
6e8c7708b5
|
恢复application.yml默认值
|
2024-11-11 18:07:22 +08:00 |
|
648540858
|
efc62ed3f1
|
优化预置位/自动扫描/巡航设置
|
2024-11-11 18:06:58 +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
|
711fefa168
|
去除不常用的日志文件打印
|
2024-11-03 07:38:42 +08:00 |
|
648540858
|
71c0de2aa9
|
初步实现前端展示
|
2024-11-01 14:51:11 +08:00 |
|
648540858
|
effb705f99
|
支持服务端日志传入前端
|
2024-10-31 17:37:34 +08:00 |
|
648540858
|
6141a8bc45
|
增强心跳消息并发处理
|
2024-10-30 15:19:38 +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
|
2492b0d638
|
修复 SiP消息超时未未回复无法识别的BUG
|
2024-10-16 17:17:17 +08:00 |
|
648540858
|
38f476c86b
|
调整配置文件详情名称便于新手理解
|
2024-10-13 20:54:33 +08:00 |
|
648540858
|
183183568b
|
恢复application配置
|
2024-10-12 09:11:46 +08:00 |
|
648540858
|
37a3f56ffd
|
调整配置以及数据库目录
|
2024-10-12 09:11:21 +08:00 |
|
648540858
|
3e0170b164
|
调整配置以及数据库目录
|
2024-10-11 15:28:19 +08:00 |
|
648540858
|
8ef8773db6
|
调整国标级联时设备信息的获取
|
2024-09-28 14:04:43 +08:00 |
|
648540858
|
800d6c926a
|
修复数据库语法兼容以及redis接收推流信息导入
|
2024-09-14 15:19:07 +08:00 |
|
648540858
|
5a259aaa63
|
临时提交
|
2024-08-24 00:18:54 +08:00 |
|