648540858 6b3732b8c4 Merge branch '2.6.8' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java # src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java # src/main/resources/all-application.yml # web_src/package-lock.json		2023-06-19 20:19:31 +08:00
..
enums	去除lombok依赖-后续考虑引入	2023-02-09 09:20:46 +08:00
ApiSaveConstant.java	使用阿里代码规范。规范代码写法	2022-05-06 10:12:34 +08:00
CivilCodePo.java	优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范	2023-06-19 18:42:36 +08:00
CommonCallback.java	优化下级平台自定义ssrc的情况，优化国标录像下载流程	2023-04-14 14:59:22 +08:00
GeneralCallback.java	修复录像下载，优化拉流代理接口	2023-06-07 20:15:08 +08:00
InviteInfo.java	修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题	2023-05-06 17:40:57 +08:00
InviteSessionStatus.java	修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题	2023-05-06 17:40:57 +08:00
InviteSessionType.java	修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题	2023-05-06 17:40:57 +08:00
StreamInfo.java	优化点播后截图以及截图的展示	2023-03-22 15:21:22 +08:00
StreamURL.java	优化使用来源ip作为流ip	2022-11-10 09:40:01 +08:00
SystemAllInfo.java	首页改造完成,待添加系统信息	2022-10-24 15:20:35 +08:00
VersionPo.java	升级Fastjson到Fastjson2	2022-11-05 20:49:56 +08:00
VideoManagerConstants.java	支持redis消息强制关闭流	2023-06-07 20:58:35 +08:00