标准化测试

api-common/src/main/java/api/common/util/HttpUtil.java

@@ -219,6 +219,18 @@ public class HttpUtil {
         }
     }
 
+    /**
+     * 默认请求头的 get 请求下载文件
+     *
+     * @param url 请求地址
+     * @return 文件流
+     * @throws IOException 异常
+     */
+    public static InputStream getInputStream(String url) throws IOException {
+        CloseableHttpClient closeableHttpClient = getCloseableHttpClient();
+        RequestConfig requestConfig = getRequestConfig();
+        return getInputStream(closeableHttpClient, requestConfig, url, null);
+    }
 
     /**
      * 默认请求头的 get 请求下载文件

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/acl/algorithm/AlgorithmPlatform.java

@@ -5,8 +5,6 @@ import api.common.util.JsonUtil;
 import api.common.util.ObjectUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.SneakyThrows;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
@@ -21,10 +19,6 @@ public class AlgorithmPlatform {
     OauthParameter oauthParameter;
     @Resource
     StringRedisTemplate stringRedisTemplate;
-    @Resource
-    CloseableHttpClient closeableHttpClient;
-    @Resource
-    RequestConfig requestConfig;
 
     /**
      * 获取算法文件临时下载地址
@@ -38,7 +32,7 @@ public class AlgorithmPlatform {
         String algorithmAddressUrl = oauthParameter.getAlgorithmListUri()
                 + "?access_token=" + token
                 + "&id=" + algorithmId;
-        return HttpUtil.get(closeableHttpClient, requestConfig, algorithmAddressUrl);
+        return HttpUtil.get(algorithmAddressUrl);
     }
 
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/ProjectService.java

@@ -14,18 +14,16 @@ import com.css.simulation.resource.scheduler.infrastructure.configuration.git.Gi
 import com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes.KubernetesConfiguration;
 import com.css.simulation.resource.scheduler.infrastructure.configuration.minio.MinioConfiguration;
 import com.css.simulation.resource.scheduler.infrastructure.entity.*;
-import com.css.simulation.resource.scheduler.infrastructure.persistence.mysql.mapper.*;
-import com.css.simulation.resource.scheduler.infrastructure.persistence.redis.CustomRedisClient;
-import com.css.simulation.resource.scheduler.infrastructure.persistence.kafka.KafkaUtil;
 import com.css.simulation.resource.scheduler.infrastructure.persistence.git.GitUtil;
+import com.css.simulation.resource.scheduler.infrastructure.persistence.kafka.KafkaUtil;
 import com.css.simulation.resource.scheduler.infrastructure.persistence.minio.MinioUtil;
+import com.css.simulation.resource.scheduler.infrastructure.persistence.mysql.mapper.*;
+import com.css.simulation.resource.scheduler.infrastructure.persistence.redis.CustomRedisClient;
 import com.css.simulation.resource.scheduler.infrastructure.persistence.redis.RedisUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.minio.MinioClient;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.kafka.clients.admin.Admin;
 import org.apache.kafka.clients.producer.RecordMetadata;
 import org.springframework.beans.factory.annotation.Value;
@@ -98,10 +96,6 @@ public class ProjectService {
     @Resource
     private ProjectDomainService projectDomainService;
     @Resource
-    private CloseableHttpClient closeableHttpClient;
-    @Resource
-    private RequestConfig requestConfig;
-    @Resource
     private IndexTemplateMapper indexTemplateMapper;
     @Resource
     private SceneMapper sceneMapper;
@@ -759,14 +753,14 @@ public class ProjectService {
             if (!projectDomainService.isImported(dockerImageWithoutVersion)) {
                 //1 获取 token
                 String tokenUrl = customConfiguration.getAlgorithmPlatformTokenUri() + "?grant_type=client_credential&appid=" + customConfiguration.getAlgorithmPlatformAppid() + "&secret=" + customConfiguration.getAlgorithmPlatformSecret();
-                String tokenJson = HttpUtil.get(closeableHttpClient, requestConfig, tokenUrl);
+                String tokenJson = HttpUtil.get(tokenUrl);
                 String token = new ObjectMapper().readTree(tokenJson).path("data").path("access_token").asText();
                 //2 获取 下载地址
                 String downloadUrl = customConfiguration.getAlgorithmPlatformAlgorithmAddrUri() + "?access_token=" + token + "&id=" + algorithmId;
                 //3 下载算法包
-                String downloadUrlJson = HttpUtil.get(closeableHttpClient, requestConfig, downloadUrl);
+                String downloadUrlJson = HttpUtil.get(downloadUrl);
                 String tempDownloadUrl = new ObjectMapper().readTree(downloadUrlJson).path("data").asText();
-                InputStream inputStream = HttpUtil.getInputStream(closeableHttpClient, requestConfig, tempDownloadUrl);
+                InputStream inputStream = HttpUtil.getInputStream(tempDownloadUrl);
                 FileUtil.writeInputStreamToLocalFile(inputStream, algorithmTarLinuxTempPath);
                 // 本地执行 docker import 算法文件成镜像（可改成用 docker-java 操作仓库）
                 LinuxUtil.execute("docker import " + algorithmTarLinuxTempPath + " " + dockerImage);

simulation-resource-video/src/main/java/com/css/simulation/resource/video/service/VideoService.java

@@ -114,9 +114,9 @@ public class VideoService {
             String videoTargetPathOfMinio = rootDirectoryPathOfMinio + videoName;
             OsUtil.exec("ffmpeg -f image2 -framerate 30 -start_number " + num + " -i " + pictureDirectoryPath + "/screenshot_%05d.tga" + " -c:v libx264 -vf format=yuv420p -crf 20 " + videoTargetPathOfLinux);
             //删除生成的临时文件
-//            String removeAll = "rm -rf " + pictureDirectoryPath;
-//            log.info("删除全部图片==" + removeAll);
-//            OsUtil.exec(removeAll);
+            String removeAll = "rm -rf " + pictureDirectoryPath;
+            log.info("删除全部图片：" + removeAll);
+            OsUtil.exec(removeAll);
             //6 将视频上传到 minio
             MinioUtil.uploadFromFile(minioClient, videoTargetPathOfLinux, minioConfiguration.getBucketName(), videoTargetPathOfMinio);
             log.info("上传成功：" + videoTargetPathOfMinio);