Commit Graph

449 Commits

Author SHA1 Message Date
lin
39568777cb 临时提交 2025-11-08 07:02:48 +08:00
lin
dab5643541 支持标准矢量图层的创建和展示 2025-10-30 23:52:01 +08:00
lin
24c7bfb756 临时提交 2025-10-22 10:55:15 +08:00
lin
dd0a760d8a 临时提交 2025-10-16 18:07:36 +08:00
lin
b13207db92 临时提交 2025-10-10 17:08:32 +08:00
lin
bdf7ae5771 临时提交 2025-10-09 15:55:13 +08:00
lin
77594dae3d 支持从第三方同步分组信息 2025-09-27 21:03:20 +08:00
lin
6469aefe22 支持从第三方读取地图配置 2025-09-25 15:27:30 +08:00
lin
842647674a 升级spring boot版本。默认jdk版本升级至21 2025-09-24 10:24:42 +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
a064f27bf8 支持ABL风格地址 2025-09-18 18:53:12 +08:00
lin
fb9ff67701 支持ABL录像回放 2025-09-17 18:19:33 +08:00
lin
27c7969b8f 更新README 2025-09-12 10:35:24 +08:00
lin
f3bd58acfe [1078] FTP使用随机用户和密码 2025-07-29 19:34:33 +08:00
lin
9e880786b3 [1078] 去除ftp配置中的ip配置 从连接中获取 2025-07-29 18:40:03 +08:00
lin
4fb04776f2 [1078] 代码整理 2025-07-28 14:32:38 +08:00
lin
e9eeeeefd7 Merge branch 'master' into 重构/1078 2025-07-28 08:47:30 +08:00
meqbyte
305c8ec8d7 jwt剩余时间计算错误 2025-07-25 15:59:59 +08:00
lin
cefc87ad47 [1078] 完善抓图 2025-07-11 21:41:50 +08:00
lin
8c3e9320fa [1078] 增加抓图 2025-07-11 20:15:45 +08:00
lin
b7a2b6816b [1078] 完善录像下载 2025-07-10 18:48:25 +08:00
lin
48eff320fd [1078] 适配abl的播放1078 2025-07-09 12:32:31 +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
648540858
196ecad3a3 Merge pull request #1889 from q792602257/boot3
升级至SpringBoot3
2025-06-13 09:28:20 +08:00
Jerry Yan
1b35fbd0e0 支持关闭返回Date Header,进而实现关闭对摄像头的校时功能
Fixes #1700
2025-06-12 16:05:06 +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
e6228df7a1 knife4j文档,描述使用相对地址,可以直接点击打开对应页面 2025-06-11 11:49:53 +08:00
Jerry Yan
14c85838f4 springboot3 2025-06-11 10:08:03 +08:00
lin
0c29c90d3b Merge branch 'master' into 重构/1078 2025-05-26 15:07:58 +08:00
648540858
7c7ef34045 Merge branch '2.7.3'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java
2025-05-22 21:09:22 +08:00
lin
b0b5a0f5e0 国标级联调整注册逻辑 2025-05-22 15:17:13 +08:00
lin
bfc063e4f7 修复通过redis唤醒推流 2025-05-19 16:52:12 +08:00
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