Commit Graph

106 Commits

Author SHA1 Message Date
zxb
01622884a9 Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordEndEventListener.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
2024-01-23 15:56:57 +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
zxb
89c9d66e40 兼容不规范的 历史录像时间解析 2024-01-03 11:00:23 +08:00
zxb
6ee9f00bcd Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0 2023-12-27 11:23:55 +08:00
648540858
7c07ae9421 修复文档页面不可用BUG,支持设置认证消息头来方便调用其他接口 2023-12-26 15:03:00 +08:00
zxb
cc896bb83d Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/resources/application-dev.yml
2023-12-18 22:45:18 +08:00
xiaoQQya
8d7d751d44 perf(pom.xml): 移除重复依赖,升级部分已知有漏洞的依赖版本 2023-11-06 16:11:31 +08:00
zxb
5bbb8d2410 pom 调整 2023-10-12 15:54:22 +08:00
zxb
cb94420806 补充配置 及 测试 2023-10-12 15:39:02 +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
648540858
a82b831b8b 优化设备状态保持,自动记录心跳间隔,三次心跳失败则设备离线,不在使用设备有效期字段作为唯一判断标准,提高容错能力和稳定性。 2023-01-04 10:39:40 +08:00
648540858
2466a24860 去除发送流端口范围 2022-11-10 16:48:17 +08:00
WuPeng
ab909feedf 升级Fastjson到Fastjson2 2022-11-05 20:49:56 +08:00
648540858
243edbd143 为User-Agent添加必要的版本信息 2022-09-09 23:19:19 +08:00
648540858
6a5ab117f5 修复推流列表状态过滤 2022-09-08 09:21:11 +08:00
648540858
f1c7d612ca
Merge pull request #590 from ixingqiao/wvp-28181-2.0
1.解决轮询内存增长过快问题
2022-09-08 09:19:57 +08:00
648540858
8b6449ce3a 升级版本号 2022-08-29 09:55:09 +08:00
xingqiao
d66aab2e83 剔除lettuce 解决轮播场景下的redis读写超时问题 2022-08-26 11:53:11 +08:00
648540858
1a9e49d9ff 依赖包版本升级 2022-08-19 17:11:51 +08:00
648540858
82ab6b1760 去除jedis,方便支持redis集群 2022-08-10 18:14:33 +08:00
mrjackwang
a59095db0c
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-07-29 15:16:39 +08:00
庄梦蝶殇
fff3d64f85 fix 优化pom依赖,去除几个重复客户端。并改了几个 equals判断不精准的bug 2022-07-27 18:31:33 +08:00
wangyimeng
5e724cc062 Merge branch 'wvp-28181-2.0' of https://github.com/mrjackwang/wvp-GB28181-pro into wvp-28181-2.0 2022-07-06 15:33:43 +08:00
648540858
be9533dead 增加版本号 2022-06-14 15:10:52 +08:00
648540858
acac24f0db okhttp-digest的Maven仓库调整 #506 2022-06-03 17:07:19 +08:00
648540858
dc6769664e 兼容不规范的时间格式iso8601格式;升级fastjson版本 2022-05-26 12:10:46 +08:00
648540858
d571e44040 去除过时注释 2022-05-13 15:45:02 +08:00
648540858
36170df3f4 修复打包优化pom 2022-05-07 15:13:56 +08:00
wangyimeng
c8831bc58f 更新同步wvp 2022-05-06 11:56:29 +08:00
648540858
5dc08a45f8 增加redis通知方式向设备/平台发送报警消息功能 2022-04-24 16:33:59 +08:00
648540858
d36920c699 添加自动拉起未推流设备的控制开关 2022-04-18 10:52:38 +08:00
dengming
a948b38dd6 优化pom配置,解决编译Failed to perform fetch问题 2022-03-10 17:40:45 +08:00
dengming
d474bf929e 删除多余依赖包com.google.guava:30.0-jre,项目引用了版本31 2022-03-10 15:24:50 +08:00
648540858
b10a65483d 去除lombok,readme更新 2022-03-04 10:30:55 +08:00
648540858
1ea95d2b87 Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 2022-03-01 17:48:21 +08:00
648540858
7400ace65d 规范数据库,解决bug 2022-02-25 20:33:02 +08:00