diff --git a/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/controller/MicroManagementController.java b/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/controller/MicroManagementController.java index bb6ff71df..3fbcdbe02 100644 --- a/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/controller/MicroManagementController.java +++ b/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/controller/MicroManagementController.java @@ -6,6 +6,7 @@ import com.microservices.common.core.web.domain.AjaxResult; import com.microservices.common.core.web.domain.GenericsAjaxResult; import com.microservices.common.core.web.page.GenericsTableDataInfo; import com.microservices.mon.k8s.domain.*; +import com.microservices.mon.k8s.domain.vo.ApplicationEnvTypeVo; import com.microservices.mon.k8s.domain.vo.ApplicationTypeVo; import com.microservices.mon.k8s.service.IK8sDashboardService; import com.microservices.mon.k8s.service.IMicroManagementService; @@ -123,4 +124,9 @@ public class MicroManagementController extends BaseController { @RequestBody List k8sApplicationEnvList) { return toAjax(microManagementService.updateApplicationEnv(kind, namespace, applicationName, k8sApplicationEnvList)); } + @ApiOperation(value = "获取应用环境变量类型") + @GetMapping(value = "/application/envTypes") + public GenericsTableDataInfo getEnvTypes() { + return new GenericsTableDataInfo<>(microManagementService.getEnvTypes()); + } } diff --git a/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/domain/vo/ApplicationEnvTypeVo.java b/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/domain/vo/ApplicationEnvTypeVo.java new file mode 100644 index 000000000..cc7006b4c --- /dev/null +++ b/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/domain/vo/ApplicationEnvTypeVo.java @@ -0,0 +1,12 @@ +package com.microservices.mon.k8s.domain.vo; + +import lombok.Data; + +/** + * @author OTTO + */ +@Data +public class ApplicationEnvTypeVo { + private String key; + private String alias; +} diff --git a/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/IMicroManagementService.java b/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/IMicroManagementService.java index bbad75820..ee64f0bf1 100644 --- a/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/IMicroManagementService.java +++ b/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/IMicroManagementService.java @@ -2,6 +2,7 @@ package com.microservices.mon.k8s.service; import com.alibaba.fastjson2.JSONObject; import com.microservices.mon.k8s.domain.*; +import com.microservices.mon.k8s.domain.vo.ApplicationEnvTypeVo; import com.microservices.mon.k8s.domain.vo.ApplicationTypeVo; import java.util.List; @@ -34,4 +35,6 @@ public interface IMicroManagementService { List getEnvOptionalParameters(String namespace); Boolean updateApplicationEnv(String kind, String namespace, String applicationName, List k8sApplicationEnvList); + + List getEnvTypes(); } diff --git a/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/impl/MicroManagementServiceImpl.java b/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/impl/MicroManagementServiceImpl.java index c15f8731d..209bad464 100644 --- a/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/impl/MicroManagementServiceImpl.java +++ b/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/impl/MicroManagementServiceImpl.java @@ -436,6 +436,18 @@ public class MicroManagementServiceImpl extends CommonService implements IMicroM return false; } + @Override + public List getEnvTypes() { + List applicationEnvTypeVoList = new ArrayList<>(); + for (ApplicationEnvType applicationEnvType : ApplicationEnvType.values()) { + ApplicationEnvTypeVo applicationEnvTypeVo = new ApplicationEnvTypeVo(); + applicationEnvTypeVo.setKey(applicationEnvType.getKey()); + applicationEnvTypeVo.setAlias(applicationEnvType.getAlias()); + applicationEnvTypeVoList.add(applicationEnvTypeVo); + } + return applicationEnvTypeVoList; + } + /** * 根据传入的环境变量列表,生成并更新容器对象的 env 与 envFrom 字段。 *