lin
|
1bfb51c90e
|
Merge branch 'dev/abl支持' into 重构/1078
# Conflicts:
# src/main/resources/application.yml
|
2025-07-03 15:29:13 +08:00 |
|
lin
|
5bcdf5dfb6
|
[abl] 合并主线
|
2025-07-03 15:28:47 +08:00 |
|
lin
|
bab5534134
|
Merge branch 'master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
# src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java
# src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
# src/main/resources/application.yml
|
2025-07-03 14:58:24 +08:00 |
|
lin
|
537d86ca89
|
[1078] 合并主线
|
2025-07-03 14:54:29 +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 |
|
lin
|
c79b7a9743
|
更新README和文档
|
2025-07-03 06:45:14 +08:00 |
|
lin
|
8d488b33e9
|
调整菜单结构，增加通道列表，支持节点搜索
|
2025-07-02 17:21:20 +08:00 |
|
lin
|
e194c027cb
|
推流列表新增推流地址生成
|
2025-07-01 23:36:10 +08:00 |
|
lin
|
f8e5e8f057
|
优化拉流代理播放机制
|
2025-07-01 17:07:10 +08:00 |
|
lin
|
9e8fbea73b
|
支持zlm pro截图方式
|
2025-06-30 17:16:25 +08:00 |
|
lin
|
0d6ed0a71e
|
更新README
|
2025-06-30 10:24:06 +08:00 |
|
lin
|
54f6ff9f81
|
修复拉流代理转国标级联点播失败的BUG
|
2025-06-27 15:32:02 +08:00 |
|
648540858
|
5f4d78fe8f
|
Merge pull request #1900 from xiaoQQya/master
控制台新增国标收流通道列表查看弹窗
|
2025-06-26 14:09:27 +08:00 |
|
xiaoQQya
|
2b66404a2a
|
fix: 修复国标收流列表播放按钮 loading 不生效问题
|
2025-06-26 13:24:15 +08:00 |
|
xiaoQQya
|
380c42040f
|
fix: 修复国标收流列表关闭再打开时未刷新数据问题
|
2025-06-26 12:53:22 +08:00 |
|
xiaoQQya
|
1c25f2f190
|
feat: 新增国标收流通道列表查看
|
2025-06-26 11:46:14 +08:00 |
|
lin
|
d9b750dc50
|
补充丢失的文件
|
2025-06-26 11:05:39 +08:00 |
|
lin
|
d507d075b1
|
补充丢失的文件
|
2025-06-26 11:05:34 +08:00 |
|
648540858
|
592b1799e7
|
Merge pull request #1897 from xiaoQQya/master
修复登录页背景图加载失败问题
|
2025-06-26 07:05:05 +08:00 |
|
xiaoQQya
|
8c7b8eaeba
|
perf: 登录状态持久化
|
2025-06-25 10:20:48 +08:00 |
|
xiaoQQya
|
6659779d91
|
fix: 修复登录页背景图加载失败问题
|
2025-06-25 10:19:57 +08:00 |
|
lin
|
b2000cba9a
|
更新README
|
2025-06-20 14:23:37 +08:00 |
|
lin
|
b5ca5feeea
|
优化登录页背景图加载速度
|
2025-06-19 15:51:49 +08:00 |
|
lin
|
1c55bc3fd1
|
预置位查询支持多段返回
|
2025-06-19 15:12:47 +08:00 |
|
lin
|
50df430831
|
修复对象解构时括号间距不一致的问题
|
2025-06-17 09:42:41 +08:00 |
|
648540858
|
371511f836
|
Merge pull request #1891 from q792602257/h2
支持h2数据库
|
2025-06-14 20:20:32 +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 |
|
648540858
|
196ecad3a3
|
Merge pull request #1889 from q792602257/boot3
升级至SpringBoot3
|
2025-06-13 09:28:20 +08:00 |
|
648540858
|
d9b7be4814
|
Merge pull request #1887 from q792602257/date_header
支持关闭返回Date Header，进而实现关闭对摄像头的校时功能
|
2025-06-13 09:06:59 +08:00 |
|
Jerry Yan
|
1b35fbd0e0
|
支持关闭返回Date Header，进而实现关闭对摄像头的校时功能
Fixes #1700
|
2025-06-12 16:05:06 +08:00 |
|
lin
|
3a5513a2e6
|
调整前端通用通道api顺序
|
2025-06-12 15:28:20 +08:00 |
|
lin
|
770e5410bf
|
Merge remote-tracking branch 'origin/master'
|
2025-06-12 11:05:06 +08:00 |
|
lin
|
c7dbf77a8d
|
调整前端通道管理名为组织结构
|
2025-06-12 11:04:55 +08:00 |
|
Jerry Yan
|
2657d61c08
|
修复SpringSecurity
|
2025-06-12 09:50:29 +08:00 |
|
Jerry Yan
|
5aaa1c016b
|
即将过期状态判断错误
|
2025-06-12 09:50:29 +08:00 |
|
Jerry Yan
|
a948b78629
|
接口请求修复
|
2025-06-12 09:50:29 +08:00 |
|
Jerry Yan
|
f4ba4ef159
|
knife4j文档更新
|
2025-06-12 09:50:29 +08:00 |
|
648540858
|
ebcbc486b3
|
Merge pull request #1885 from q792602257/795
支持查询时根据channelId查询报警
|
2025-06-12 09:22:42 +08:00 |
|
648540858
|
a1cb616b0b
|
Merge pull request #1883 from q792602257/bugfix
knife4j文档中描述使用相对地址，可以直接点击打开对应页面
|
2025-06-12 09:22:15 +08:00 |
|
lin
|
b1da948513
|
修复录制计划查询方法名
|
2025-06-11 17:25:03 +08:00 |
|
lin
|
f75e228b04
|
更新README
|
2025-06-11 16:46:38 +08:00 |
|
lin
|
c5aee79487
|
更新README
|
2025-06-11 16:44:37 +08:00 |
|
Jerry Yan
|
68806b4202
|
支持查询时根据channelId查询报警
Fixes #795
|
2025-06-11 13:00:27 +08:00 |
|
Jerry Yan
|
8848de9d15
|
支持h2数据库
|
2025-06-11 12:54:45 +08:00 |
|
Jerry Yan
|
e6228df7a1
|
knife4j文档，描述使用相对地址，可以直接点击打开对应页面
|
2025-06-11 11:49:53 +08:00 |
|
Jerry Yan
|
44bd521446
|
spring redis 新配置风格
|
2025-06-11 10:08:03 +08:00 |
|
Jerry Yan
|
14c85838f4
|
springboot3
|
2025-06-11 10:08:03 +08:00 |
|
lin
|
98ea5846fe
|
心跳入库 支持批量入库
|
2025-06-10 09:45:02 +08:00 |
|
lin
|
8acd3fa521
|
修复设备列表查询丢失字段，导致编辑后都是心跳参数
|
2025-06-06 15:24:58 +08:00 |
|
lin
|
bae2b2524b
|
移除过时的web_src
|
2025-06-06 09:59:25 +08:00 |
|