Merge remote-tracking branch 'origin/dev-czh' into dev

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

@@ -43,7 +43,7 @@ public class JupyterServiceImpl implements JupyterService {
     private String masterIp;
     @Value("${k8s.storageClassName}")
     private String storageClassName;
-    @Value("${minio.pvcName}")
+    @Value("${minio.platformPvcName}")
     private String minioPvcName;
 
     private final MinioUtil minioUtil;
@@ -90,12 +90,12 @@ public class JupyterServiceImpl implements JupyterService {
 
         // 提取数据集,模型信息，得到数据集模型的path
         Map<String, Object> dataset = JacksonUtil.parseJSONStr2Map(devEnvironment.getDataset());
-        String datasetPath = "argo-workflow" + "/" + dataset.get("path");
-//        String datasetPath = (String) dataset.get("path");
+//        String datasetPath = "argo-workflow" + "/" + dataset.get("path");
+        String datasetPath = (String) dataset.get("path");
 
         Map<String, Object> model = JacksonUtil.parseJSONStr2Map(devEnvironment.getModel());
-        String modelPath = "argo-workflow" + "/" + model.get("path");
-//        String modelPath = (String) model.get("path");
+//        String modelPath = "argo-workflow" + "/" + model.get("path");
+        String modelPath = (String) model.get("path");
 
         LoginUser loginUser = SecurityUtils.getLoginUser();
         //构造pod名称

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

@@ -439,7 +439,7 @@ public class K8sClientUtil {
         }
         if (v1PodList != null) {
             for (V1Pod pod1 : v1PodList.getItems()) {
-                // PVC 已存在
+                // Pod 已存在
                 if (StringUtils.equals(pod1.getMetadata().getName(), podName)) {
                     V1Service service = createService(namespace, podName + "-svc", port, selector);
                     if (service != null) {