Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java

@@ -473,12 +473,13 @@ public class NewDatasetServiceImpl implements NewDatasetService {
     public String newCreateVersionFromLabelStudio(LabelDatasetVersionVo labelDatasetVersionVo) throws Exception {
         // 1. 下载数据集文件
         // 获取label-studio数据流
-        Map<String, String> headers = new HashMap<String, String>();
+        Map<String, String> headers = new HashMap<>();
         headers.put("Authorization", "Token " + labelDatasetVersionVo.getToken());
         InputStream inputStream = HttpUtils.getIntputStream(labelloaclUrl + "/api/projects/" + labelDatasetVersionVo.getProjectId() + "/export?exportType=" + labelDatasetVersionVo.getExportType(), headers);
 
         // 2. 打包成zip包
-        String zipFileName = labelDatasetVersionVo.getName()+"_"+labelDatasetVersionVo.getVersion() + ".zip";
+//        String zipFileName = labelDatasetVersionVo.getName() + "_" + labelDatasetVersionVo.getVersion() + ".zip";
+        String zipFileName = labelDatasetVersionVo.getName() + "_" + labelDatasetVersionVo.getVersion();
         MultipartFile[] files = FileUtil.toMultipartFiles(inputStream, zipFileName);
 
         // 3. 上传到minio

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java

@@ -39,6 +39,8 @@ public class K8sClientUtil {
 
     @Value("${jupyter.hostPath}")
     private String hostPath;
+    @Value("${dockerpush.proxyUrl}")
+    private String proxyUrl;
 
     private String http;
     private String token;
@@ -360,11 +362,11 @@ public class K8sClientUtil {
                 .withNewSecurityContext().withNewPrivileged(true).endSecurityContext()
                 .addNewEnv()
                 .withName("HTTP_PROXY")
-                .withValue("http://172.20.32.253:3128")
+                .withValue(proxyUrl)
                 .endEnv()
                 .addNewEnv()
                 .withName("HTTPS_PROXY")
-                .withValue("http://172.20.32.253:3128")
+                .withValue(proxyUrl)
                 .endEnv()
                 .addNewEnv()
                 .withName("NO_PROXY")