Merge branch 'hotfix-0.8.1' into dev

xtreme1-io · May 20, 2024 · 371afd0 · 371afd0
2 parents 221ec56 + 87adc1d
commit 371afd0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/backend/src/main/java/ai/basic/x1/adapter/api/job/converter/ModelCocoRequestConverter.java b/backend/src/main/java/ai/basic/x1/adapter/api/job/converter/ModelCocoRequestConverter.java
@@ -27,9 +27,9 @@ public static ImageDetectionReqDTO convert(ModelMessageBO message) {
         var fileNodeBO = fileNodes.get(0);
         String url;
         if (fileNodeBO.getType().equals(FILE)) {
-            url = fileNodeBO.getFile().getInternalUrl();
+            url = fileNodeBO.getFile().getUrl();
         } else {
-            url = fileNodeBO.getFiles().get(0).getFile().getInternalUrl();
+            url = fileNodeBO.getFiles().get(0).getFile().getUrl();
         }
         if (StrUtil.isEmpty(url)) {
             throw new IllegalArgumentException("file url is empty");

diff --git a/...main/java/ai/basic/x1/adapter/api/job/converter/PointCloudDetectionModelReqConverter.java b/...main/java/ai/basic/x1/adapter/api/job/converter/PointCloudDetectionModelReqConverter.java
@@ -52,19 +52,19 @@ private static void traverFile(DataInfoBO.FileNodeBO fileNodeBO, DataInfo dataIn
             if (prePath.startsWith(CAMERA_IMAGE)) {
                 if (CollUtil.isEmpty(dataInfo.getImageUrls())) {
                     List<String> imageUrlList = new ArrayList<>();
-                    imageUrlList.add(fileNodeBO.getFile().getInternalUrl());
+                    imageUrlList.add(fileNodeBO.getFile().getUrl());
                     dataInfo.setImageUrls(imageUrlList);
                 } else {
-                    dataInfo.getImageUrls().add(fileNodeBO.getFile().getInternalUrl());
+                    dataInfo.getImageUrls().add(fileNodeBO.getFile().getUrl());
                 }
             }
             //pcd
             if (prePath.startsWith(LIDAR_POINT_CLOUD)) {
-                dataInfo.setPointCloudUrl(getFileBO(fileNodeBO.getFile()).getInternalUrl());
+                dataInfo.setPointCloudUrl(getFileBO(fileNodeBO.getFile()).getUrl());
             }
             //cameraConfig
             if (prePath.startsWith(CAMERA_CONFIG)) {
-                dataInfo.setCameraConfigUrl(fileNodeBO.getFile().getInternalUrl());
+                dataInfo.setCameraConfigUrl(fileNodeBO.getFile().getUrl());
             }
         }
         if (DIRECTORY.equals(fileNodeBO.getType()) && CollUtil.isNotEmpty(fileNodeBO.getFiles())) {