648540858 66ab09396c Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java # src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java		2023-04-04 09:18:33 +08:00
..
bean	Merge branch 'wvp-28181-2.0' into main-dev	2023-04-04 09:18:33 +08:00
gb28181	合并开源主线	2023-04-04 09:09:07 +08:00
log	修复可空时间参数的校验 #784	2023-03-22 15:21:22 +08:00
record	优化跨域配置，支持同域的前后端分离部署	2023-03-05 09:53:26 +08:00
server	支持不同域的前后端分离部署	2023-03-15 19:05:56 +08:00
streamProxy	优化跨域配置，支持同域的前后端分离部署	2023-03-05 09:53:26 +08:00
streamPush	优化异常处理以及级联设备状态查询	2023-03-17 13:22:05 +08:00
user	合并开源主线	2023-04-04 09:09:07 +08:00