648540858 ecf4fbb684 Merge branch 'wvp-28181-2.0' ... # Conflicts: # 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 # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java # web_src/src/components/Login.vue		2022-08-22 16:53:16 +08:00
..
auth	使用 java.time.Instant代替 java.util.Date	2022-05-13 22:15:31 +08:00
bean	Merge branch 'wvp-28181-2.0'	2022-08-22 16:53:16 +08:00
event	支持全局异常和统一返回结果，未完待续	2022-08-22 16:17:28 +08:00
session	Merge branch 'wvp-28181-2.0'	2022-08-22 16:53:16 +08:00
task	bug修复	2022-07-26 11:43:56 +08:00
transmit	Merge branch 'wvp-28181-2.0'	2022-08-22 16:53:16 +08:00
utils	支持全局异常和统一返回结果，未完待续	2022-08-22 16:17:28 +08:00
SipLayer.java	优化使用tcp连接时的超时时间	2022-08-11 16:37:55 +08:00