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
..
alarm	修复可空时间参数的校验 #784	2023-03-22 15:21:22 +08:00
device	优化截图获取接口	2023-06-05 11:10:15 +08:00
gbStream	优化跨域配置，支持同域的前后端分离部署	2023-03-05 09:53:26 +08:00
media	优化跨域配置，支持同域的前后端分离部署	2023-03-05 09:53:26 +08:00
MobilePosition	修复移动位置获取接口超时 #857	2023-06-14 17:04:41 +08:00
platform	优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范	2023-06-19 18:42:36 +08:00
play	优化截图获取接口	2023-06-05 11:10:15 +08:00
playback	修复国标视频点播三种级联并发点播和录像下载的问题	2023-05-08 17:18:08 +08:00
ptz	优化跨域配置，支持同域的前后端分离部署	2023-03-05 09:53:26 +08:00
record	修复国标视频点播三种级联并发点播和录像下载的问题	2023-05-08 17:18:08 +08:00
SseController	优化跨域配置，支持同域的前后端分离部署	2023-03-05 09:53:26 +08:00