diff --git a/orion-ops-service/pom.xml b/orion-ops-service/pom.xml index 8ad6fdc2..8f357491 100644 --- a/orion-ops-service/pom.xml +++ b/orion-ops-service/pom.xml @@ -172,7 +172,7 @@ com.orion.ops.OrionOpsServiceApplication ZIP - + nothing diff --git a/orion-ops-service/src/main/java/com/orion/ops/controller/ExportController.java b/orion-ops-service/src/main/java/com/orion/ops/controller/ExportController.java new file mode 100644 index 00000000..7fa26c9f --- /dev/null +++ b/orion-ops-service/src/main/java/com/orion/ops/controller/ExportController.java @@ -0,0 +1,18 @@ +package com.orion.ops.controller; + +import com.orion.ops.annotation.RestWrapper; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 导出 api + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2021/8/3 18:43 + */ +@RestController +@RestWrapper +@RequestMapping("/orion/api/export") +public class ExportController { +} diff --git a/orion-ops-service/src/main/java/com/orion/ops/controller/SftpController.java b/orion-ops-service/src/main/java/com/orion/ops/controller/SftpController.java index 2b52699d..3b2fa391 100644 --- a/orion-ops-service/src/main/java/com/orion/ops/controller/SftpController.java +++ b/orion-ops-service/src/main/java/com/orion/ops/controller/SftpController.java @@ -190,7 +190,7 @@ public class SftpController { request.setMachineId(machineId); request.setFileToken(fileToken); request.setLocalPath(localPath); - request.setRemotePath(Files1.getPath(remotePath + "/" + file.getOriginalFilename())); + request.setRemotePath(Files1.getPath(remotePath, file.getOriginalFilename())); request.setSize(file.getSize()); requestFiles.add(request); } diff --git a/orion-ops-service/src/main/java/com/orion/ops/controller/StatisticsController.java b/orion-ops-service/src/main/java/com/orion/ops/controller/StatisticsController.java new file mode 100644 index 00000000..4d10477e --- /dev/null +++ b/orion-ops-service/src/main/java/com/orion/ops/controller/StatisticsController.java @@ -0,0 +1,25 @@ +package com.orion.ops.controller; + +import com.orion.ops.annotation.RestWrapper; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 统计操作 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2021/8/19 15:27 + */ +@RestController +@RestWrapper +@RequestMapping("/orion/api/statistics") +public class StatisticsController { + + // 机器数 + // 任务数 + // 环境数 + // 应用数 + // 应用部署次数 + +} diff --git a/orion-ops-service/src/main/java/com/orion/ops/service/api/ReleaseInfoService.java b/orion-ops-service/src/main/java/com/orion/ops/service/api/ReleaseInfoService.java index f44eef78..8e1c2e59 100644 --- a/orion-ops-service/src/main/java/com/orion/ops/service/api/ReleaseInfoService.java +++ b/orion-ops-service/src/main/java/com/orion/ops/service/api/ReleaseInfoService.java @@ -8,6 +8,7 @@ import com.orion.ops.entity.domain.ReleaseMachineDO; import com.orion.ops.entity.request.ApplicationReleaseBillRequest; import com.orion.ops.entity.vo.ReleaseBillDetailVO; import com.orion.ops.entity.vo.ReleaseBillListVO; +import com.orion.utils.io.Files1; import java.util.List; @@ -136,7 +137,7 @@ public interface ReleaseInfoService { if (path == null) { return null; } - return MachineEnvAttr.DIST_PATH.getValue() + path; + return Files1.getPath(MachineEnvAttr.DIST_PATH.getValue(), path); } } diff --git a/orion-ops-service/src/main/resources/menu/menu-admin.json b/orion-ops-service/src/main/resources/menu/menu-admin.json index c11d7f4d..28ae900d 100644 --- a/orion-ops-service/src/main/resources/menu/menu-admin.json +++ b/orion-ops-service/src/main/resources/menu/menu-admin.json @@ -36,7 +36,7 @@ "children": [ { "name": "批量执行", - "path": "/batch/exec" + "path": "/batch/exec/list" }, { "name": "日志面板", diff --git a/orion-ops-service/src/main/resources/menu/menu-dev.json b/orion-ops-service/src/main/resources/menu/menu-dev.json index 0e310300..e1c22163 100644 --- a/orion-ops-service/src/main/resources/menu/menu-dev.json +++ b/orion-ops-service/src/main/resources/menu/menu-dev.json @@ -32,7 +32,7 @@ "children": [ { "name": "批量执行", - "path": "/batch/exec" + "path": "/batch/exec/list" }, { "name": "日志面板", diff --git a/orion-ops-service/src/main/resources/menu/menu-opt.json b/orion-ops-service/src/main/resources/menu/menu-opt.json index 0e310300..e1c22163 100644 --- a/orion-ops-service/src/main/resources/menu/menu-opt.json +++ b/orion-ops-service/src/main/resources/menu/menu-opt.json @@ -32,7 +32,7 @@ "children": [ { "name": "批量执行", - "path": "/batch/exec" + "path": "/batch/exec/list" }, { "name": "日志面板",