334 Commits

Author	SHA1	Message	Date
panlinlin	03497c55f0	Merge branch 'refs/heads/master' into 1078 ... # Conflicts: # src/main/resources/application.yml	2024-06-27 21:52:59 +08:00
648540858	b2aa5c839d	临时提交	2024-06-27 17:51:13 +08:00
648540858	68fce9177f	临时提交	2024-06-25 16:45:31 +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	f3ea07bdcd	调整转码后的流的输出位置	2024-06-14 17:03:55 +08:00
648540858	da2662ab27	国标28181-支持自动识别网卡监听，可以不再配置SIP.IP	2024-06-13 18:10:01 +08:00
648540858	e0adc7306b	Merge branch 'refs/heads/master' into 1078	2024-06-12 12:49:47 +08:00
648540858	c1b0365b02	增加设备上线判断双逻辑，兼容华为设备（前一条的描述大华是错误的，大华没有这个问题）注册后不再发送注册的设备	2024-06-12 11:16:21 +08:00
648540858	0ac27b03ff	增加设备上线判断双逻辑，兼容大华注册后不再发送注册的设备	2024-06-12 11:10:10 +08:00
648540858	37b79633f0	Merge branch 'refs/heads/master' into 1078	2024-05-28 18:40:44 +08:00
648540858	2c89fae49a	Merge branch 'refs/heads/2.7.1' ... # Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java # src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java # src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java # src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.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/StreamProxyServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java # src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java	2024-05-23 17:32:15 +08:00
648540858	2daa59d78c	支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题	2024-05-23 17:10:45 +08:00
648540858	b57dbeac13	优化通道更新	2024-04-20 18:58:53 +08:00
648540858	3639d2224d	临时提交	2024-04-18 17:22:25 +08:00
648540858	6025eb29fd	添加注释	2024-04-18 16:30:21 +08:00
648540858	55a240bb45	临时提交	2024-04-18 15:52:34 +08:00
648540858	313243195e	修复通道位置的展示	2024-04-17 17:56:36 +08:00
648540858	bf6e09d231	修复多wvp国标级联机制	2024-04-17 12:56:22 +08:00
648540858	05c83cf6ef	Merge branch 'master' into 1078	2024-04-11 09:39:04 +08:00
648540858	6acc395ad2	Merge branch 'master' into 1078	2024-04-02 18:33:53 +08:00
leesam	23beb4fde0	Merge branch 'master' into develop-add-api-key	2024-04-01 09:19:46 +08:00
leesam	24b4f02a70	[bugfix]读取jwk的Bug修复	2024-03-20 11:05:57 +08:00
leesam	76208975bf	[add]支持其他平台通过ApiKey调用系统相关接口	2024-03-19 16:53:01 +08:00
648540858	00fb00a4c3	修复dev配置文件中的logback-spring配置	2024-03-16 21:37:44 +08:00
648540858	79dc7e79d2	Merge branch 'master' into 1078	2024-03-08 16:22:13 +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	fc74ce9de4	Merge branch '2.6.9' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/resources/application-dev.yml	2024-01-31 17:25:32 +08:00
648540858	68fbc8fef1	优化跨域配置，默认允许全部跨域	2024-01-31 17:23:47 +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	9a89cf81b8	添加多数据源配置实例	2024-01-22 00:33:04 +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	67d1ff0d26	Merge branch 'wvp-28181-2.0' into feature/record ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java	2023-12-18 14:23:48 +08:00
648540858	df3f5795e7	修复非鉴权接口的跨域失败问题	2023-12-15 17:45:47 +08:00
648540858	eac72fd06e	优化日志打印样式	2023-12-13 14:37:08 +08:00
xubinbin	5a9621840c	修改控制台输出日志格式，增加显示线程名称，调用类的全类路径以及日子输出行的行号。	2023-12-12 16:37:06 +08:00
648540858	ffc8a530f3	修复定时录像删除	2023-11-24 10:47:33 +08:00
648540858	fc8bb378de	Merge branch 'wvp-28181-2.0' into main-dev	2023-11-21 10:50:02 +08:00
648540858	8422d3a343	添加数据库链接参数	2023-11-21 10:49:29 +08:00
648540858	a01295603a	简化配置	2023-11-03 17:32:37 +08:00
648540858	f36eb7ebeb	添加打包文件	2023-11-02 14:17:20 +08:00
648540858	5d3f307b44	将录像存储路径迁移至wvp中配置，assist以有在需要视频合成的时候才会用	2023-11-01 14:07:32 +08:00
648540858	99506108cd	添加日志	2023-10-26 15:29:04 +08:00
648540858	4df90d9ba4	Merge branch 'wvp-28181-2.0' into main-dev	2023-09-20 09:17:28 +08:00
648540858	a6fb1cdb74	修复Web页面播放国标录像无声音的问题	2023-09-11 16:17:29 +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
chenzhangyue	73f6f044a1	local dev	2023-09-01 17:53:48 +08:00
AlphaWu	b5ccb1636f	修正Database拼写错误。	2023-08-20 15:50:24 +08:00
648540858	fc9ed976cf	合并主线	2023-08-07 18:09:45 +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	6275372455	添加service	2023-07-31 17:34:44 +08:00
648540858	3de49d1c2a	优化发流逻辑	2023-07-31 16:42:12 +08:00
648540858	7d3cbb8253	Merge branch 'wvp-28181-2.0' into main-dev	2023-07-24 09:42:32 +08:00
648540858	13811b0c78	Merge branch '2.6.8' into wvp-28181-2.0 ... # Conflicts: # sql/初始化.sql # src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java # src/main/resources/all-application.yml	2023-07-20 17:51:16 +08:00
648540858	48a1a24769	添加配置	2023-07-20 17:29:36 +08:00
648540858	db6dd3f755	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.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/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.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/service/redisMsg/RedisPushStreamCloseResponseListener.java # src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java	2023-07-19 11:33:58 +08:00
xiaoQQya	153523a32f	perf(config): 补全 all-application.yml 配置文件	2023-07-17 15:51:09 +08:00
648540858	ef5018de2d	修复合并错误	2023-07-13 14:57:30 +08:00
648540858	4604aaea99	优化语音对讲支持根据设备设置释放收到ACK后开始发流	2023-07-02 13:53:45 +08:00
648540858	3571ca272b	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # web_src/config/index.js	2023-07-02 12:42:05 +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
dsk	7749ea3421	新增接口超时时间配置，修复点播超时的情况下报错org.springframework.web.context.request.async.AsyncRequestTimeoutException	2023-06-25 16:16:40 +08:00
648540858	7b24d51db9	优化国标级联的端口保持	2023-06-21 14:03:31 +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’	652489b47e	Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java	2023-06-15 11:10:20 +08:00
‘sxh’	15df08964b	新增设备主子码流选择，默认为不开启	2023-06-15 11:00:29 +08:00
648540858	e68eb850a9	去除多余日志	2023-06-13 23:11:56 +08:00
648540858	b7f2a6b25b	Merge branch '2.6.8' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java	2023-06-07 20:21:10 +08:00
648540858	97b04c4dba	修复录像下载，优化拉流代理接口	2023-06-07 20:15:08 +08:00
648540858	ffb21248cb	去除多余配置	2023-05-30 11:20:22 +08:00
648540858	50240b4e39	移除手动配置mybatis下划线转驼峰	2023-05-30 10:32:08 +08:00
648540858	a91fe69f76	添加文档	2023-05-29 09:40:36 +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
QingObject	97b673d6ad	新增JT1078 Template支持	2023-04-28 10:10:06 +08:00
648540858	94da74901c	优化Sip.ip的注释	2023-04-23 17:33:28 +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	d295f3c512	修复合并后的问题	2023-04-18 14:06:07 +08:00
648540858	e3d7be9d81	Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0	2023-04-08 15:37:22 +08:00
canghai809	e21e419361	开发及Docker配置文件数据源更新	2023-04-04 18:52:13 +08:00
648540858	59ab2adb2e	去除flyway配置	2023-04-04 11:14:08 +08:00
648540858	b4048fbe80	合并开源主线	2023-04-04 09:09:07 +08:00
648540858	2e5d94181a	支持修改页面展示的sip ip	2023-03-31 08:56:54 +08:00
648540858	6c969a63dd	去除druid数据库连接池，使用spring支持的hikari	2023-03-29 09:44:45 +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	2d2832dbe9	优化各个配置启动顺序	2023-02-22 18:01:30 +08:00
648540858	db8971302a	完善支持语音级联	2023-02-22 15:53:33 +08:00
648540858	5cae58c691	Merge branch 'wvp-28181-2.0' into main2	2023-02-14 10:04:48 +08:00
648540858	d79eec25b0	优化日志打印，去除数据库打印，优化控制台打印效果	2023-02-13 18:19:34 +08:00
648540858	197f80581b	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/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java	2023-02-10 16:25:33 +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	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