Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,808 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

95 Commits (a45fab423bab8e0ce6f1d2a270dfa19a6130193f)

Author SHA1 Message Date
648540858 b4048fbe80 合并开源主线 2023-04-04 09:09:07 +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 6b1d966255 优化合并对讲broadcast级联模式 2023-03-21 10:27:07 +08:00
648540858 95688e400b 初步实现登录返回token 2023-03-13 09:45:00 +08:00
648540858 f2c6210539 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	doc/_content/introduction/deployment.md
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
 2023-02-10 16:24:27 +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 dea44dcd78 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
 2023-01-13 16:21:17 +08:00
648540858 a82b831b8b 优化设备状态保持，自动记录心跳间隔，三次心跳失败则设备离线，不在使用设备有效期字段作为唯一判断标准，提高容错能力和稳定性。 2023-01-04 10:39:40 +08:00
648540858 f223aad705 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/dialog/devicePlayer.vue
 2022-11-18 18:39:44 +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 06bbe3fe01 添加第二种语音对讲实现 2022-09-29 16:27:59 +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
chenjialing c8b9e590ef 日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式 2022-02-25 09:23:46 +08:00
648540858 a42dda2bd3 规范数据库，添加必要约束，优化通道批量导入功能 2022-02-24 16:55:06 +08:00
朱俊杰 37a84e6691 新增实时监控功能 
左边是设备通道树，右边是分屏预览
 2022-02-10 14:45:33 +08:00
648540858 ea85a620d1 添加服务器信息获取能力。 2022-02-04 21:46:48 +08:00
648540858 89db9991a2 2.0.2版本 去除默认的mediaIP 127.0.0.1,避免误导新用户 2022-01-27 14:25:26 +08:00
648540858 e728233781 使用log4j-over-slf4j取代log4j避免log4j漏洞 2022-01-27 10:09:47 +08:00
朱俊杰 4065703317 添加lombok，分离注册周期事件 
1、添加lombok依赖
2、分离注册周期事件
 2022-01-25 15:42:11 +08:00
648540858 06e22d980e 支持推流通道预导入 2022-01-16 10:40:57 +08:00
648540858 7241e0d2d2 修复兼容接口查询通道列表查询 2021-12-28 09:33:25 +08:00
648540858 b6fa459bc3 修复推流列表大数据量时批量删除的错误，修复推流列表分页查询错误 2021-12-10 18:38:58 +08:00
648540858 241804f5f8 优化redis存储，alarm默认关闭处理 2021-12-03 16:13:46 +08:00