forked from uav/ard-uav-server
parent: e8803e34 | patch | commit | show whitespace
zhaowenyu
2025-11-26 cce986fa68ee7b0d5dd09915aa3b5db6ca6f885a 
2025-11-26 zwy 下发航线任务时，将url地址替换成http地址
1 files modified
10 ■■■■■ changed files
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java 10 ●●●●● patch | view | raw | blame | history 
 ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java


@@ -235,7 +235,7 @@


                .outOfControlAction(waylineJob.getOutOfControlAction())


                .rthMode(waylineJob.getRthMode())


                .file(WaylineTaskFileDTO.builder()


                        .url(url.toString().replace("https//192.168.10.103:9001", "http//192.168.10.103:9002"))


                        .url(url.toString().replace("https://192.168.10.103:9001", "http://192.168.10.103:9002"))


//                        .fingerprint(waylineFile.get().getSign())


                        .fingerprint(md5)


                        .build())


@@ -728,13 +728,13 @@


//            url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());


//            url = new URL(ardRouteOpt.getUpPath());




            Map<String, Object> jsonResourceGet = new HashMap<>();


            jsonResourceGet.put("url", url.toString().replace("https//192.168.10.103:9001", "http//192.168.10.103:9002"));


            jsonResourceGet.put("fingerprint", md5);


//            Map<String, Object> jsonResourceGet = new HashMap<>();


//            jsonResourceGet.put("url", url.toString().replace("https//192.168.10.103:9001", "http//192.168.10.103:9002"));


//            jsonResourceGet.put("fingerprint", md5);




            builder.data(RequestsReply.success(WaylineTaskCreateDTO.builder()


                    .file(WaylineTaskFileDTO.builder()


                    .url(url.toString())


                    .url(url.toString().replace("https://192.168.10.103:9001", "http://192.168.10.103:9002"))


                    .fingerprint(md5)


                    .build())


                    .build()));