wvp-platform

Files

648540858 039fbf7e24 Merge branch 'talk' into main-dev

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
#	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/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

2023-03-20 14:32:53 +08:00

bean

Merge branch 'wvp-28181-2.0'

2023-02-22 18:08:25 +08:00

gb28181

Merge branch 'talk' into main-dev

2023-03-20 14:32:53 +08:00

log

支持全局异常和统一返回结果，未完待续

2022-08-22 16:17:28 +08:00

record

升级Fastjson到Fastjson2