67 Commits

Author	SHA1	Message	Date
liyexin	2f53a4d01e	fix: 修复jwk.json无法读取的问题，同时增加jwkFile配置项	2025-01-23 16:05:12 +08:00
648540858	b37b9f3b03	支持配置管理页面登录超时时间	2024-12-16 16:14:28 +08:00
648540858	396961ea20	策略配置文件增加注释与使用Lombok	2024-10-30 15:19:17 +08:00
648540858	0722aa3aeb	临时提交	2024-08-22 18:05:57 +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	099c65ff40	调整点播默认超时时间为10秒	2024-06-20 19:30:25 +08:00
648540858	da2662ab27	国标28181-支持自动识别网卡监听，可以不再配置SIP.IP	2024-06-13 18:10:01 +08:00
648540858	0ac27b03ff	增加设备上线判断双逻辑，兼容大华注册后不再发送注册的设备	2024-06-12 11:10:10 +08:00
648540858	2daa59d78c	支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题	2024-05-23 17:10:45 +08:00
648540858	8cba63642f	优化notify消息处理	2024-04-22 20:29:36 +08:00
648540858	2e7c9a7341	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.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/media/zlm/AssistRESTfulUtils.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java # src/main/resources/all-application.yml # src/main/resources/application-dev.yml	2024-02-07 20:30:37 +08:00
648540858	bf0efc2739	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-31 18:50:15 +08:00
648540858	105ad25580	默认设备状态变化发送通知	2024-01-31 18:48:27 +08:00
648540858	ebc65b40d3	添加收到invite消息后的日志，减少国标级联推送代理流的等待时间	2024-01-18 14:54:03 +08:00
648540858	5d3f307b44	将录像存储路径迁移至wvp中配置，assist以有在需要视频合成的时候才会用	2023-11-01 14:07:32 +08:00
648540858	88350873ee	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java	2023-09-11 11:21:50 +08:00
AlphaWu	b5ccb1636f	修正Database拼写错误。	2023-08-20 15:50:24 +08:00
648540858	e898c344aa	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # 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/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java	2023-08-07 17:28:02 +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	3de49d1c2a	优化发流逻辑	2023-07-31 16:42:12 +08:00
648540858	4604aaea99	优化语音对讲支持根据设备设置释放收到ACK后开始发流	2023-07-02 13:53:45 +08:00
648540858	5a7a7a12bd	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.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/response/impl/InviteResponseProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java # src/main/resources/all-application.yml # web_src/config/index.js # web_src/src/components/dialog/devicePlayer.vue	2023-06-27 16:46:26 +08:00
648540858	a7bf29a4cb	恢复默认值	2023-06-20 14:17:44 +08:00
648540858	9e28923b8c	Merge branch 'wvp-28181-2.0' into wvp-28181-2.0	2023-06-20 14:15:27 +08:00
648540858	6b3732b8c4	Merge branch '2.6.8' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java # src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java # src/main/resources/all-application.yml # web_src/package-lock.json	2023-06-19 20:19:31 +08:00
648540858	8cf5b65e38	优化国标级联注册机制	2023-06-19 20:09:16 +08:00
648540858	8942ab0112	优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范	2023-06-19 18:42:36 +08:00
‘sxh’	15df08964b	新增设备主子码流选择，默认为不开启	2023-06-15 11:00:29 +08:00
648540858	50240b4e39	移除手动配置mybatis下划线转驼峰	2023-05-30 10:32:08 +08:00
648540858	57192a49d1	修复引入的错误Order	2023-05-29 20:18:42 +08:00
648540858	30ae9e929f	合并主线	2023-05-25 17:28:57 +08:00
648540858	3fe47021b9	优化国标规范，参考国标文档中-点播外域设备媒体流SSRC处理方式，上级点播时自定义ssrc，不适用上级携带的ssrc，也避免上级兼容性差，不携带ssrc的问题，可通过配置关闭此特性	2023-05-04 14:21:58 +08:00
648540858	0f50904992	支持设备/通道状态变化时发送redis通知	2023-04-20 10:26:42 +08:00
648540858	db2ccfedfa	优化notify性能，增加notify超出处理能力时直接回复错误码，不做处理。	2023-04-19 11:09:26 +08:00
648540858	b4048fbe80	合并开源主线	2023-04-04 09:09:07 +08:00
648540858	3b1516afe5	优化录像配置。不再使用zlm默认的http服务器	2023-03-25 18:40:29 +08:00
648540858	782300452c	优化对海康平台的兼容性	2023-03-17 17:08:37 +08:00
648540858	2bf07305aa	Merge branch 'wvp-28181-2.0' into wvp-jwt-token ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/resources/all-application.yml	2023-03-15 22:58:28 +08:00
648540858	5fab97cf7e	支持不同域的前后端分离部署	2023-03-15 19:05:56 +08:00
648540858	943f95ba8c	增加消息通道配置，可以通道redis在wvp上下级之间发送消息	2023-03-14 14:02:33 +08:00
648540858	420dbce900	Merge branch 'main' into 级联 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.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	2023-02-22 18:14:53 +08:00
648540858	019d95cfba	Merge branch 'wvp-28181-2.0' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java	2023-02-22 18:08:25 +08:00
648540858	2d2832dbe9	优化各个配置启动顺序	2023-02-22 18:01:30 +08:00
648540858	ec95a42985	Merge branch 'main' into main2 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/resources/all-application.yml # web_src/src/components/dialog/devicePlayer.vue	2023-02-10 15:54:42 +08:00
648540858	aa3cec0dfc	去除数据库自动更新，自动更新会导致wvp在arm架构服务上无法启动	2023-02-06 10:46:23 +08:00
648540858	166272ad11	增加数据库自动更新开关	2023-02-01 15:54:03 +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	fd3a4ef472	修复国标录像回放以及录像下载	2023-01-06 11:43:27 +08:00
648540858	6fa5b37b96	Merge branch 'main' into main2 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.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/message/response/cmd/BroadcastResponseMessageHandler.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/resources/all-application.yml	2023-01-05 11:07:06 +08:00
648540858	fc90cd7951	优化tcp主动方式的语音对讲	2022-12-19 14:20:22 +08:00