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
..
all-application.yml	支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题	2024-05-23 17:10:45 +08:00
application-dev.yml	Merge branch 'refs/heads/2.7.1'	2024-05-23 17:32:15 +08:00
application-docker.yml	[add]支持其他平台通过ApiKey调用系统相关接口	2024-03-19 16:53:01 +08:00
application.yml	优化通道更新	2024-04-20 18:58:53 +08:00
banner.txt	为User-Agent添加必要的版本信息	2022-09-09 23:19:19 +08:00
civilCode.csv	优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范	2023-06-19 18:42:36 +08:00
jwk.json	[bugfix]读取jwk的Bug修复	2024-03-20 11:05:57 +08:00
local.jks	优化语音对讲支持根据设备设置释放收到ACK后开始发流	2023-07-02 13:53:45 +08:00
logback-spring.xml	修复非鉴权接口的跨域失败问题	2023-12-15 17:45:47 +08:00