648540858 2e7c9a7341 Merge branch 'wvp-28181-2.0' into main-dev ...

# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	src/main/resources/all-application.yml
#	src/main/resources/application-dev.yml

2024-02-07 20:30:37 +08:00

..

all-application.yml

Merge branch 'wvp-28181-2.0' into main-dev

2024-02-07 20:30:37 +08:00

application-dev.yml

优化跨域配置，默认允许全部跨域

2024-01-31 17:23:47 +08:00

application-docker.yml

Merge branch '2.6.9' into wvp-28181-2.0

2024-01-22 10:37:13 +08:00

application.yml

修复Web页面播放国标录像无声音的问题

2023-09-11 16:17:29 +08:00

banner.txt

为User-Agent添加必要的版本信息

2022-09-09 23:19:19 +08:00

civilCode.csv

优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范

2023-06-19 18:42:36 +08:00

local.jks

优化语音对讲支持根据设备设置释放收到ACK后开始发流

2023-07-02 13:53:45 +08:00

logback-spring.xml

修复非鉴权接口的跨域失败问题

2023-12-15 17:45:47 +08:00