forked from ard/ruoyi-api
parent: 8a87e4 | patch | commitdiff
aijinhui
2023-10-24 8a8a13eb80498e9b905b47b8dc4d52cd8fdb8497
refs
author aijinhui <aijinhui>
Tuesday, October 24, 2023 16:36 +0800
committer aijinhui <aijinhui>
Tuesday, October 24, 2023 16:36 +0800
commit8a8a13eb80498e9b905b47b8dc4d52cd8fdb8497
tree 18d4657200733270e34c7ae96fb3b757b45293d8 tree | zip | gz
parent 8a87e4226aa802d6a0e3566c66824fedf68e77da view | diff
3ed3f6c299eabbda1c161408732d71ecb60b8959 view | diff 
Merge remote-tracking branch 'origin/master'
13 files modified
355 ■■■■■ changed files
ard-work/src/main/java/com/ruoyi/cmd/startup.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/service/ICameraSdkService.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/AsyncLogin.java 9 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java 20 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java 96 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java 137 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java 11 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java 1 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java 48 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/service/impl/VtduServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/forest/MediaClient.java 6 ●●●●● diff | view | raw | blame | history
server/mediamtx/mediamtx.yml 16 ●●●●● diff | view | raw | blame | history