Commit Graph

113 Commits

Author SHA1 Message Date
lin
87afbe3f89 临时提交 2025-10-17 15:19:21 +08:00
lin
ac92237e08 临时提交 2025-10-16 15:20:15 +08:00
lin
d2ffc867e6 临时提交 2025-10-15 18:59:12 +08:00
lin
83bba5d380 临时提交 2025-10-15 18:25:42 +08:00
lin
b135014aed 临时提交 2025-10-15 16:20:37 +08:00
lin
7ebc23210a 临时提交 2025-10-14 15:57:24 +08:00
lin
f724451058 临时提交 2025-10-13 15:35:12 +08:00
lin
29099cbaa4 临时提交 2025-10-11 21:37:41 +08:00
lin
b13207db92 临时提交 2025-10-10 17:08:32 +08:00
lin
a3c4f02e3f 支持多边形查询 2025-10-10 00:12:09 +08:00
lin
ca04df1fec 临时提交 2025-10-09 20:25:43 +08:00
lin
bdf7ae5771 临时提交 2025-10-09 15:55:13 +08:00
lin
f9276cf1a5 临时提交 2025-10-08 23:34:46 +08:00
648540858
d4da1dc91c 支持点播、停止点播和云台控制 2025-10-07 10:56:18 +08:00
lin
61c64589b2 临时提交 2025-09-30 23:17:40 +08:00
lin
4aeca7f5dd 定义第三方接口信息 2025-09-30 20:31:48 +08:00
lin
eff1773101 定义第三方接口信息 2025-09-29 16:15:32 +08:00
lin
85d47af644 定义第三方接口信息 2025-09-28 16:19:00 +08:00
lin
4280a1d08e 移除自定义的是否支持云台属性 2025-09-26 17:31:37 +08:00
lin
481609ef72 修复录制计划开启录像失败的BUG 2025-04-09 16:48:50 +08:00
lin
676e2d7ea9 message消息适配新的回调模式 2025-02-18 17:04:13 +08:00
lin
ea12e3465f 修复语音对讲后停止点播失败的BUG 2025-02-11 16:06:18 +08:00
648540858
5c2b4f386b 优化播放页面的预置位控制 2024-11-08 17:40:05 +08:00
648540858
3b2a28fd00 移除旧的数据库操作类 2024-09-24 15:59:47 +08:00
648540858
80912d8a2c 临时提交 2024-09-14 17:50:05 +08:00
648540858
b7e96de36a 临时提交 2024-09-07 00:04:36 +08:00
648540858
da441a67f8 临时提交 2024-09-06 17:56:24 +08:00
648540858
fa47f619ba 临时提交 2024-09-03 18:00:35 +08:00
panlinlin
0177831e86 临时提交 2024-08-11 23:20:42 +08:00
648540858
6bd0cdd37b 临时提交 2024-07-23 18:00:47 +08:00
648540858
b843958ed7 临时提交 2024-07-10 14:43:22 +08:00
648540858
046e7802f3 临时提交 2024-07-09 17:55:51 +08:00
648540858
b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858
adf040ec4b 优化日志以及属性设置代码 2024-07-03 17:09:49 +08:00
648540858
57a230afb3 Merge branch 'refs/heads/2.7.1'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
2024-06-25 09:45:34 +08:00
648540858
f5abf8df4c 修改排序 2024-06-19 16:00:26 +08:00
648540858
107caf1171 调整前端使用转码后的流 2024-06-14 17:24:57 +08:00
648540858
da2662ab27 国标28181-支持自动识别网卡监听,可以不再配置SIP.IP 2024-06-13 18:10:01 +08:00
648540858
33b75be71a 支持abl hook 2024-04-01 18:21:38 +08:00
648540858
b90dc789b4 优化媒体节点服务的代码结构 2024-03-21 23:39:32 +08:00
648540858
c581974027 使用GetMapping替换RequestMapping 2024-02-29 18:15:55 +08:00
648540858
6120e6bd7b 添加金仓数据库x86驱动,优化兼容接口通道列表查询。修复多个通道同时推送 2024-01-04 17:26:47 +08:00
648540858
c1bc45fe8f 修复点播接口状态判断错误 2023-11-06 15:13:58 +08:00
648540858
e5cba6022f Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
2023-08-01 10:28:41 +08:00
648540858
a3d871022c 修复空指针异常 2023-07-21 15:13:20 +08:00
648540858
bac9aca311 合并分支新内容 2023-07-20 17:56:04 +08:00
648540858
13811b0c78 Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
#	sql/初始化.sql
#	src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
#	src/main/resources/all-application.yml
2023-07-20 17:51:16 +08:00
648540858
a39ac45bcc 扩展兼容接口,支持HTTPS接口 2023-07-20 17:18:11 +08:00
朱俊杰
4f2cd41134 修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突 2023-07-17 10:54:34 +08:00
648540858
ef5018de2d 修复合并错误 2023-07-13 14:57:30 +08:00