forked from uav/ard-uav-server
parent: 77ae8c | patch | commitdiff
zhaowenyu
2026-04-01 b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89
refs
author zhaowenyu <35589726@qq.com>
Wednesday, April 1, 2026 12:17 +0800
committer zhaowenyu <35589726@qq.com>
Wednesday, April 1, 2026 12:17 +0800
commitb8b5a3895e741d5348ecdd39ad2e5cbd443f8e89
tree 2c2ee4a30942344cd1b0e06d68f01078c6a3d01d tree | zip | gz
parent 77ae8c8bf34aaafa58a230d65db5e0f9f2e23c74 view | diff
96221d01026f92d5c4186d72db41114d3394c418 view | diff 
Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	ard-admin/src/main/resources/application-daqing.yml
#	ard-admin/src/main/resources/application-prod.yml
1 files added
11 files modified
193 ■■■■■ changed files
ard-admin/src/main/resources/application-daqing.yml 13 ●●●●● diff | view | raw | blame | history
ard-admin/src/main/resources/application-dev.yml 54 ●●●●● diff | view | raw | blame | history
ard-admin/src/main/resources/application-prod.yml 13 ●●●●● diff | view | raw | blame | history
ard-admin/src/main/resources/application.yml 4 ●●●●● diff | view | raw | blame | history
ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdPointCloudServiceImpl.java 7 ●●●●● diff | view | raw | blame | history
ard-inspection/src/main/java/com/ard/inspection/service/impl/BigFileUploadServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java 12 ●●●●● diff | view | raw | blame | history
ard-route/src/main/java/com/ard/route/util/InitializationUtils.java 12 ●●●●● diff | view | raw | blame | history
ard-vtdu/src/main/java/com/ard/vtdu/config/MediamtxSixHeConfig.java 23 ●●●●● diff | view | raw | blame | history
ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java 20 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavStreamManager.java 21 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java 4 ●●●●● diff | view | raw | blame | history