forked from ard/ruoyi-api
parent: 7716cf | patch | commitdiff
aijinhui
2023-09-12 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479
refs
author aijinhui <aijinhui>
Tuesday, September 12, 2023 09:48 +0800
committer aijinhui <aijinhui>
Tuesday, September 12, 2023 09:48 +0800
commit61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479
tree 6cfd36bc48bee32adb932a2dc96c0caada4f85d9 tree | zip | gz
parent 7716cf0a84e88f27e05ab70346f79c4781e5692a view | diff
71dbac60afa54d2642c3471c080686da56579ca0 view | diff 
Merge remote-tracking branch 'origin/master'
16 files modified
495 ■■■■■ changed files
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java 54 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/sdk/LoginResultCallBack.java 12 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java 138 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/controller/MediaController.java 21 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/domain/Conf.java 3 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/domain/Vtdu.java 15 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/service/IMediaService.java 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java 105 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/service/impl/VtduServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/vtdu/VtduMapper.xml 83 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/templates/preview.html 24 ●●●●● diff | view | raw | blame | history
lib/mediamtx/mediamtx.yml 2 ●●●●● diff | view | raw | blame | history
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm 7 ●●●●● diff | view | raw | blame | history
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java 9 ●●●●● diff | view | raw | blame | history