[FIX] Post请求修复，上传图片URL修复

taais-admin/src/main/java/com/taais/web/controller/common/CommonController.java

@@ -26,10 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -104,7 +101,7 @@ public class CommonController {
             // 信息保存在文件管理
             SysOssVo oss = sysOssService.saveResultEntity(file.getOriginalFilename(),suffix, url,fileName);
             SysOssUploadVo uploadVo = new SysOssUploadVo();
-            uploadVo.setUrl(oss.getUrl());
+            uploadVo.setUrl("/profile" + oss.getUrl().split("/profile")[1]);
             uploadVo.setFileName(oss.getOriginalName());
             uploadVo.setOssId(oss.getOssId().toString());
             return CommonResult.success(uploadVo);
@@ -137,7 +134,7 @@ public class CommonController {
             // 信息保存在文件管理
             SysOssVo oss = sysOssService.saveResultEntity(file.getOriginalFilename(),suffix, url,fileName);
             SysOssUploadVo uploadVo = new SysOssUploadVo();
-            uploadVo.setUrl(oss.getUrl());
+            uploadVo.setUrl("/profile" + oss.getUrl().split("/profile")[1]);
             uploadVo.setFileName(oss.getOriginalName());
             uploadVo.setOssId(oss.getOssId().toString());
             return CommonResult.success(uploadVo);

taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/TargetIdentificationSubtaskServiceImpl.java

@@ -4,7 +4,9 @@ import java.lang.reflect.Type;
 import java.util.*;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson2.JSON;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSONArray;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -229,20 +231,11 @@ public class TargetIdentificationSubtaskServiceImpl extends BaseServiceImpl<Targ
         // send http
         System.out.println("todo: " + algorithmRequestDto.toString());
 
-        String httpResult = null;
-        Mono<String> response = null;
-        log.info("http post url:{},body:{}", url, algorithmRequestDto);
-        WebClient webClient = WebClient.builder().build();
-        response = webClient.post()
-            .uri(url)
-            .bodyValue(algorithmRequestDto)
-            .retrieve()
-            .bodyToMono(String.class);
-
-        if (response != null) {
+        String res = HttpUtil.post(url, JSONUtil.toJsonStr(algorithmRequestDto));
+        log.info("res is: {}", res);
+        if (res != null) {
             log.info("version is : {}", detail.getVersion());
             try {
-                httpResult = response.block();
                 detail.setStatus(BizConstant.TASK_STATUS_SUCCEED);
             } catch (Exception e) {
                 log.error("http request error: {}", e.getMessage());

taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/TargetIdentificationTaskServiceImpl.java

@@ -201,11 +201,11 @@ public class TargetIdentificationTaskServiceImpl extends BaseServiceImpl<TargetI
 
         Map<String, String> records = null;
         // 创建训练子任务
-        if(taskDto.getTaskItemList().contains(CreateTargetIdentificationTaskDto.TASK_TYPE_SINGLE_DATA_AND_MORE_ALGORITHM)){
+        if(taskDto.getTaskItemList().contains("1")){
             records = createTrainTask(taskBo.getId(),taskDto);
         }
         // 创建测试子任务
-        if (taskDto.getTaskItemList().contains(CreateTargetIdentificationTaskDto.TASK_TYPE_SINGLE_DATA_AND_MORE_ALGORITHM)){
+        if (taskDto.getTaskItemList().contains("2")){
             createTestTask(taskBo.getId(),taskDto, records);
         }
         return null;
@@ -263,7 +263,8 @@ public class TargetIdentificationTaskServiceImpl extends BaseServiceImpl<TargetI
         return records;
     }
 
-    public static final String PATH_PREFIX = "ObjectDetection_Web/task";
+    public static final String PATH_PREFIX = "/home/ObjectDetection_Web/task";
+    public static final String WORK_DIR = "/home/ObjectDetection_Web";
     /**
      * 移动文件到对应文件夹
      * @param batch
@@ -295,7 +296,7 @@ public class TargetIdentificationTaskServiceImpl extends BaseServiceImpl<TargetI
             List<DataVo> dataVoList = dataService.getDataByBatchNum(batchNum);
             for (DataVo dataVo : dataVoList) {
                 String[] strings = dataVo.getUrl().split("/profile");
-                String relativePath = "ObjectDetection_Web" + strings[strings.length - 1];
+                String relativePath = WORK_DIR + strings[strings.length - 1];
                 File file = new File(relativePath);
                 System.out.println(file.getAbsolutePath());
                 if (file.exists()) {
@@ -310,7 +311,7 @@ public class TargetIdentificationTaskServiceImpl extends BaseServiceImpl<TargetI
                 }
                 if (dataVo.getLabelurl() != null) {
                     strings = dataVo.getLabelurl().split("/profile");
-                    relativePath = "ObjectDetection_Web" + strings[strings.length - 1];
+                    relativePath = WORK_DIR + strings[strings.length - 1];
                     file = new File(relativePath);
                     if (file.exists()) {
                         try {