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 |
|
648540858
|
79c8447298
|
支持使用多数据源
|
2024-01-22 00:29:09 +08:00 |
|
648540858
|
a2cac5ca12
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# pom.xml
|
2024-01-04 18:34:46 +08:00 |
|
648540858
|
6120e6bd7b
|
添加金仓数据库x86驱动，优化兼容接口通道列表查询。修复多个通道同时推送
|
2024-01-04 17:26:47 +08:00 |
|
648540858
|
e7e407eb57
|
增加版本号
|
2024-01-03 16:00:03 +08:00 |
|
648540858
|
7c07ae9421
|
修复文档页面不可用BUG，支持设置认证消息头来方便调用其他接口
|
2023-12-26 15:03:00 +08:00 |
|
xiaoQQya
|
8d7d751d44
|
perf(pom.xml): 移除重复依赖，升级部分已知有漏洞的依赖版本
|
2023-11-06 16:11:31 +08:00 |
|
648540858
|
4c28f380aa
|
优化byte数组转换
|
2023-10-07 14:52:46 +08:00 |
|
648540858
|
8d6de72429
|
优化日志
|
2023-06-02 16:40:19 +08:00 |
|
648540858
|
9e790eb0ff
|
本地集成人大金仓连接jar
|
2023-05-16 17:17:24 +08:00 |
|
648540858
|
d849352441
|
重构以适配postgresql
|
2023-05-12 10:37:03 +08:00 |
|
648540858
|
6c969a63dd
|
去除druid数据库连接池，使用spring支持的hikari
|
2023-03-29 09:44:45 +08:00 |
|
648540858
|
91bfbc36f1
|
优化设备注册，支持到期续订，优化国标级联到期续订。
|
2023-03-28 14:09:41 +08:00 |
|
648540858
|
95688e400b
|
初步实现登录返回token
|
2023-03-13 09:45:00 +08:00 |
|
648540858
|
6484f52e46
|
同时支持打包为Jar和War
|
2023-02-07 20:59:33 +08:00 |
|
648540858
|
e46bf8a8bd
|
支持同时打war包和jar包
|
2023-02-06 17:34:47 +08:00 |
|
648540858
|
aa3cec0dfc
|
去除数据库自动更新，自动更新会导致wvp在arm架构服务上无法启动
|
2023-02-06 10:46:23 +08:00 |
|
sjt
|
ca1d66cfb8
|
数据库脚本版本管理，便于表结构更新维护
|
2023-01-18 15:27:24 +08:00 |
|