Merge branch 'refs/heads/2.7.0'

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.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/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
This commit is contained in:
648540858
2024-04-23 20:59:20 +08:00
45 changed files with 2374 additions and 1528 deletions

View File

@@ -4,5 +4,15 @@ alter table wvp_device_channel
alter table wvp_device
drop switch_primary_sub_stream;
# 第一个补丁包
alter table wvp_platform
add send_stream_ip character varying(50);
add send_stream_ip character varying(50);
alter table wvp_device
change on_line on_line bool default false;
alter table wvp_device
change id id serial primary key;
alter table wvp_device
change ssrc_check ssrc_check bool default false;

View File

@@ -4,5 +4,15 @@ alter table wvp_device_channel
alter table wvp_device
drop switch_primary_sub_stream;
# 第一个补丁包
alter table wvp_platform
add send_stream_ip character varying(50);
add send_stream_ip character varying(50);
alter table wvp_device
change on_line on_line bool default false;
alter table wvp_device
change id id serial primary key;
alter table wvp_device
change ssrc_check ssrc_check bool default false;