648540858 8b0ff3767b Merge branch 'wvp-28181-2.0' ...

# Conflicts:
#	sql/update.sql
#	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/media/zlm/ZLMRTPServerFactory.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/PlayServiceImpl.java

2022-08-09 14:41:21 +08:00

..

bean

Merge branch 'wvp-28181-2.0'

2022-08-09 14:41:21 +08:00

gb28181

Merge branch 'wvp-28181-2.0'

2022-08-09 14:41:21 +08:00

log

兼容不规范的时间格式iso8601格式；升级fastjson版本

2022-05-26 12:10:46 +08:00

record

更换云端录像的代理方式

2021-07-19 17:54:01 +08:00

server

优化hook订阅机制

2022-07-28 16:18:41 +08:00

streamProxy

数据库优化

2022-07-06 09:44:37 +08:00

streamPush

bug修复

2022-07-26 11:43:56 +08:00

user

1.修复新增用户没有pushkey的问题

2022-07-19 18:13:19 +08:00