1、修改文件上传路径

2、修改pod挂载方式为hostpath

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

@@ -10,6 +10,8 @@ public interface GitService {
     //登录方法，返回token
     String login(String username, String password);
 
+    String checkoutToken();
+
     //输入token，项目名，tag，创建新项目,返回项目地址
     Map createProject(GitProjectVo gitProjectVo) throws Exception;
 

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

@@ -165,9 +165,7 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
                 .findFirst()
                 .ifPresent(datasetVersion -> {
                     String url = datasetVersion.getUrl();
-                    String path = bucketName + '/' + url.substring(0, url.lastIndexOf('/'));
-                    response.put("path", path);
-
+                    response.put("path", url);
                 });
 
         response.put("content", datasetVersionList);

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

@@ -61,7 +61,7 @@ public class ImageServiceImpl implements ImageService {
 
     @Resource
     private MinioService minioService;
-    @Value("${harbor.bucketName}")
+    @Value("${minio.dataReleaseBucketName}")
     private String bucketName;
     @Value("${harbor.repository}")
     private String repository;
@@ -362,7 +362,7 @@ public class ImageServiceImpl implements ImageService {
     @Override
     public Map<String, String> uploadImageFiles(MultipartFile file) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String path = loginUser.getUsername() + "/" + file.getOriginalFilename();
+        String path = "images/" + loginUser.getUsername() + "/" + file.getOriginalFilename();
         return minioService.uploadFile(bucketName, path, file);
     }
 

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.platform.service.MinioService;
 import com.ruoyi.platform.utils.FileUtil;
 import com.ruoyi.platform.utils.MinioUtil;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -25,6 +26,9 @@ import java.util.Map;
 @Service("MinioService")
 public class MinioServiceImpl implements MinioService {
 
+    @Value("${jupyter.hostPath}")
+    private String hostPath;
+
     private final MinioUtil minioUtil;
 
     public MinioServiceImpl(MinioUtil minioUtil) {
@@ -62,6 +66,7 @@ public class MinioServiceImpl implements MinioService {
             try (InputStream inputStream = file.getInputStream()){
                 minioUtil.uploadObject(bucketName, objectName, inputStream);
                 result.put("fileName", file.getOriginalFilename());
+                objectName = hostPath + "/" + objectName;
                 result.put("url", objectName); // objectName根据实际情况定义
                 result.put("fileSize", formattedSize);
             } catch (Exception e) {

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

@@ -33,6 +33,10 @@ import java.util.*;
 @Slf4j
 @Component
 public class K8sClientUtil {
+
+    @Value("${jupyter.hostPath}")
+    private String hostPath;
+
     private String http;
     private String token;
     /**
@@ -446,13 +450,24 @@ public class K8sClientUtil {
 
         // 配置卷和卷挂载
         List<V1VolumeMount> volumeMounts = new ArrayList<>();
-        volumeMounts.add(new V1VolumeMount().name("workspace").mountPath(mountPath));
-        volumeMounts.add(new V1VolumeMount().name("minio-pvc").mountPath("/opt/data").subPath(datasetPath).readOnly(true));
-        volumeMounts.add(new V1VolumeMount().name("minio-pvc").mountPath("/opt/model").subPath(modelPath).readOnly(true));
+        volumeMounts.add(new V1VolumeMount().name("workspace").mountPath("/opt/notebooks"));
+        volumeMounts.add(new V1VolumeMount().name("dataset").mountPath("/opt/dataset").readOnly(true));
+        volumeMounts.add(new V1VolumeMount().name("model").mountPath("/opt/model").readOnly(true));
 
         List<V1Volume> volumes = new ArrayList<>();
-        volumes.add(new V1Volume().name("workspace").persistentVolumeClaim(new V1PersistentVolumeClaimVolumeSource().claimName(pvc.getMetadata().getName())));
-        volumes.add(new V1Volume().name("minio-pvc").persistentVolumeClaim(new V1PersistentVolumeClaimVolumeSource().claimName(dataPvcName)));
+        volumes.add(new V1Volume().name("workspace").hostPath(new V1HostPathVolumeSource().path(hostPath + "/notebooks").type("DirectoryOrCreate")));
+        volumes.add(new V1Volume().name("dataset").hostPath(new V1HostPathVolumeSource().path(hostPath + "/dataset").type("DirectoryOrCreate")));
+        volumes.add(new V1Volume().name("model").hostPath(new V1HostPathVolumeSource().path(hostPath + "/model").type("DirectoryOrCreate")));
+
+        // 配置卷和卷挂载
+//        List<V1VolumeMount> volumeMounts = new ArrayList<>();
+//        volumeMounts.add(new V1VolumeMount().name("workspace").mountPath(mountPath));
+//        volumeMounts.add(new V1VolumeMount().name("minio-pvc").mountPath("/opt/data").subPath(datasetPath).readOnly(true));
+//        volumeMounts.add(new V1VolumeMount().name("minio-pvc").mountPath("/opt/model").subPath(modelPath).readOnly(true));
+//
+//        List<V1Volume> volumes = new ArrayList<>();
+//        volumes.add(new V1Volume().name("workspace").persistentVolumeClaim(new V1PersistentVolumeClaimVolumeSource().claimName(pvc.getMetadata().getName())));
+//        volumes.add(new V1Volume().name("minio-pvc").persistentVolumeClaim(new V1PersistentVolumeClaimVolumeSource().claimName(dataPvcName)));
 
 
         //配置资源