Commit Graph

149 Commits

Author SHA1 Message Date
5f18a3e165 feat: 添加Paho MQTT v5客户端依赖
为WVP平台引入MQTT协议支持,用于向边缘端推送AI配置

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-02-04 14:44:13 +08:00
0afb3c42a4 适配Docker部署环境,修复拉流代理播放失败问题
1. Docker环境适配:
   - Dockerfile基础镜像从JDK11升级为eclipse-temurin:21
   - pom.xml编译版本从Java21降为Java17
   - docker-compose开放Redis(6379)、MySQL(3306)、ZLM(6080)端口映射
   - application.yml激活profile改为dev
   - application-dev.yml适配Docker服务连接参数(Redis/MySQL/ZLM)

2. 修复拉流代理播放失败:
   - Nginx添加流媒体后缀代理规则(.flv/.m3u8/.ts等),支持自定义app名的流路径
   - Nginx添加WebRTC API代理规则
   - Nginx添加sub_filter规则,将API返回的流地址端口从80(ZLM容器内部端口)重写为8080(Nginx对外端口)
   - docker-compose向Nginx容器传递WebHttp环境变量

3. ZLMediaKit配置补充onvif和rtc相关配置段

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-02-03 11:10:06 +08:00
lin
40555d917b redis增肌连接池支持,增加设备国标严格限制设置 2026-01-30 06:14:58 +08:00
lin
8c54895c47 去除过期文件,修复接口文档分组 2026-01-13 13:06:22 +08:00
lin
f0f469f419 修改kingbase驱动导入方式 2026-01-13 10:52:15 +08:00
lin
298165b424 修改自动打包配置 2026-01-07 16:55:20 +08:00
lin
8c82c50b0f 修复git信息丢失, #2053 2026-01-07 15:08:07 +08:00
lin
dab5643541 支持标准矢量图层的创建和展示 2025-10-30 23:52:01 +08:00
lin
96dc55352b 隐藏不需要再文档中展示的接口 2025-10-26 20:51:15 +08:00
lin
b13207db92 临时提交 2025-10-10 17:08:32 +08:00
lin
bdf7ae5771 临时提交 2025-10-09 15:55:13 +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
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
f4ba4ef159 knife4j文档更新 2025-06-12 09:50:29 +08:00
Jerry Yan
8848de9d15 支持h2数据库 2025-06-11 12:54:45 +08:00
Jerry Yan
14c85838f4 springboot3 2025-06-11 10:08:03 +08:00
lin
1420fcfcd0 Merge branch 'master' into 重构/1078
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java
#	src/main/resources/application.yml
2025-05-29 17:10:32 +08:00
lin
0c29c90d3b Merge branch 'master' into 重构/1078 2025-05-26 15:07:58 +08:00
lin
a7f9cbd8ef 版本号提升 2025-05-26 09:53:58 +08:00
lin
43916f27d7 Merge branch '2.7.3' 2025-05-19 14:39:01 +08:00
lin
c19fae68a3 升级fastjson版本以解决json序列化BUG 2025-05-19 11:26:58 +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
4dd5864cf1 Merge branch 'master' into dev/前端页面修改 2025-04-24 08:43:41 +08:00
648540858
13b7edb271 去除重复的引入 2025-04-23 22:19:32 +08:00
648540858
add88ec6b8 增加关闭服务接口以及在linux上安装为服务的脚本 2025-04-13 21:38:51 +08:00
648540858
30bb6f60fd 支持打包为直接可执行jar 2025-04-12 21:10:14 +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
5777a8e93c 去除动态数据库切换 2024-12-06 17:11:22 +08:00
648540858
f528735119 Merge branch 'master' into 重构/1078 2024-12-05 11:05:44 +08:00
南宫茜
9ec7dd6941 修复 c510456 变更错误版本 2024-11-20 10:30:14 +08:00
648540858
c510456b3b 升级spring boot版本 2024-11-15 17:02: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
effb705f99 支持服务端日志传入前端 2024-10-31 17:37:34 +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
南宫茜
05be707e92 修复编译时 maven 可能提示“找不到符号”的问题 2024-10-17 17:14:48 +08:00
648540858
38f476c86b 调整配置文件详情名称便于新手理解 2024-10-13 20:54:33 +08:00
648540858
3078162c58 优化文档, 优化notify-catalog大并发处理 2024-10-11 15:24:46 +08:00
648540858
a3f7753b84 Merge branch 'refs/heads/master' into dev/master-通道结构重构
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	web_src/src/components/PushVideoList.vue
2024-08-07 11:17:34 +08:00
648540858
40674c33a3 增加版本号 2024-08-07 10:04:10 +08:00
panlinlin
7847bd6614 临时提交 2024-06-27 23:38:13 +08:00
panlinlin
282e0db96e 1078-调整通道信息 2024-06-21 21:30:15 +08:00
648540858
40bf2d6642 添加通道信息 2024-06-20 20:24:15 +08:00
648540858
89101b2731 1078-增加ftp-server 2024-05-30 18:36:24 +08:00
648540858
d79298c795 提升版本号 2024-05-07 14:18:49 +08:00
leesam
16b7e4a7ef Merge branch 'refs/heads/master' into develop-add-api-key 2024-04-10 20:49:44 +08:00
648540858
54b878d2e1 优化代码,升级版本号为2.7.1 2024-04-09 22:43:45 +08:00
leesam
76208975bf [add]支持其他平台通过ApiKey调用系统相关接口 2024-03-19 16:53:01 +08:00
648540858
da4ac962d0 优化打包过程,配置自动放到jar包旁边并移除jar内部配置文件 2024-03-13 16:37:45 +08:00
648540858
97a87542a6 Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
#	pom.xml
2024-01-22 10:37:13 +08:00