commit

simulation-resource-scheduler-agent/src/main/java/com/css/simulation/resource/scheduler/agent/adapter/controller/TaskController.java

@@ -1,44 +1,44 @@
-package com.css.simulation.resource.scheduler.agent.adapter.controller;
-
-import com.css.simulation.resource.scheduler.agent.app.service.TaskAppService;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/task")
-public class TaskController {
-
-  @Resource
-  private TaskAppService taskAppService;
-
-  // -------------------------------- Comment --------------------------------
-
-  /**
-   * 保存任务文件 yaml
-   */
-  @PostMapping(value = "/save", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-  public void taskState(@RequestPart("file") MultipartFile file) {
-    taskAppService.saveDockerComposeYamlOfTask(file);
-  }
-
-  /**
-   * 使用 Docker Compose 启动任务 yaml 文件
-   */
-  @GetMapping("/up")
-  public void upDockerComposeYamlOfOneTaskOfProject(@RequestParam("projectId") String projectId) {
-    taskAppService.upDockerComposeYamlOfOneTaskOfProject(projectId);
-  }
-
-  /**
-   * 使用 Docker Compose 停止任务 yaml 文件
-   */
-  @GetMapping("/down")
-  public void downDockerComposeYamlOfOneTaskOfProject(@RequestParam("yamlName") String yamlName) {
-    taskAppService.downDockerComposeYamlOfOneTaskOfProject(yamlName);
-  }
-
-
-}
+//package com.css.simulation.resource.scheduler.agent.adapter.controller;
+//
+//import com.css.simulation.resource.scheduler.agent.app.service.TaskAppService;
+//import org.springframework.http.MediaType;
+//import org.springframework.web.bind.annotation.*;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import javax.annotation.Resource;
+//
+//@RestController·
+//@RequestMapping("/task")
+//public class TaskController {
+//
+//  @Resource
+//  private TaskAppService taskAppService;
+//
+//  // -------------------------------- Comment --------------------------------
+//
+//  /**
+//   * 保存任务文件 yaml
+//   */
+//  @PostMapping(value = "/save", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+//  public void taskState(@RequestPart("file") MultipartFile file) {
+//    taskAppService.saveDockerComposeYamlOfTask(file);
+//  }
+//
+//  /**
+//   * 使用 Docker Compose 启动任务 yaml 文件
+//   */
+//  @GetMapping("/up")
+//  public void upDockerComposeYamlOfOneTaskOfProject(@RequestParam("projectId") String projectId) {
+//    taskAppService.upDockerComposeYamlOfOneTaskOfProject(projectId);
+//  }
+//
+//  /**
+//   * 使用 Docker Compose 停止任务 yaml 文件
+//   */
+//  @GetMapping("/down")
+//  public void downDockerComposeYamlOfOneTaskOfProject(@RequestParam("yamlName") String yamlName) {
+//    taskAppService.downDockerComposeYamlOfOneTaskOfProject(yamlName);
+//  }
+//
+//
+//}

simulation-resource-scheduler-agent/src/main/java/com/css/simulation/resource/scheduler/agent/app/service/TaskAppService.java

@@ -1,36 +1,36 @@
-package com.css.simulation.resource.scheduler.agent.app.service;
-
-import api.common.util.FileUtil;
-import api.common.util.OsUtil;
-import lombok.SneakyThrows;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-
-@Service
-public class TaskAppService {
-
-  private static final String rootPath = "/opt/data/";
-  private static final String upCommandOfDockerCompose = "docker-compose -f filename up -d";
-  private static final String downCommandOfDockerCompose = "docker-compose -f docker-compose.yml down";
-
-  public void saveDockerComposeYamlOfTask(MultipartFile file) {
-    //1 解析文件名获取项目ID
-    final String fileName = file.getName();
-    final String projectId = SchedulerUtil.getProjectIdFromYamlName(fileName);
-    //2 保存文件
-    FileUtil.writeMultipartFileToLocalFile(file, rootPath + projectId + File.separator + fileName);
-  }
-
-  @SneakyThrows
-  public void upDockerComposeYamlOfOneTaskOfProject(String projectId) {
-    final File file = FileUtil.getRandomFileOfDirectory(rootPath + projectId);
-    OsUtil.exec(upCommandOfDockerCompose.replace("filename", file.getAbsolutePath()));
-  }
-
-  @SneakyThrows
-  public void downDockerComposeYamlOfOneTaskOfProject(String yamlName) {
-    OsUtil.exec(downCommandOfDockerCompose.replace("filename", rootPath + yamlName));
-  }
-}
+//package com.css.simulation.resource.scheduler.agent.app.service;
+//
+//import api.common.util.FileUtil;
+//import api.common.util.OsUtil;
+//import lombok.SneakyThrows;
+//import org.springframework.stereotype.Service;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import java.io.File;
+//
+//@Service
+//public class TaskAppService {
+//
+//  private static final String rootPath = "/opt/data/";
+//  private static final String upCommandOfDockerCompose = "docker-compose -f filename up -d";
+//  private static final String downCommandOfDockerCompose = "docker-compose -f docker-compose.yml down";
+//
+//  public void saveDockerComposeYamlOfTask(MultipartFile file) {
+//    //1 解析文件名获取项目ID
+//    final String fileName = file.getName();
+//    final String projectId = SchedulerUtil.getProjectIdFromYamlName(fileName);
+//    //2 保存文件
+//    FileUtil.writeMultipartFileToLocalFile(file, rootPath + projectId + File.separator + fileName);
+//  }
+//
+//  @SneakyThrows
+//  public void upDockerComposeYamlOfOneTaskOfProject(String projectId) {
+//    final File file = FileUtil.getRandomFileOfDirectory(rootPath + projectId);
+//    OsUtil.exec(upCommandOfDockerCompose.replace("filename", file.getAbsolutePath()));
+//  }
+//
+//  @SneakyThrows
+//  public void downDockerComposeYamlOfOneTaskOfProject(String yamlName) {
+//    OsUtil.exec(downCommandOfDockerCompose.replace("filename", rootPath + yamlName));
+//  }
+//}