wanjia9506
/
microservices
forked from Gitlink/microservices
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '【编排环境变量管理】新增获取应用环境变量类型接口' (#952) from otto/microservices:dev_monitoring into dev_monitoring

This commit is contained in:
otto 2025-07-24 14:48:48 +08:00
parent 629822dcb9 29dbc84989
commit f055d0f28e
4 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/controller/MicroManagementController.java
View File

@ -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<K8sApplicationEnv> k8sApplicationEnvList) {
return toAjax(microManagementService.updateApplicationEnv(kind, namespace, applicationName, k8sApplicationEnvList));
}
@ApiOperation(value = "获取应用环境变量类型")
@GetMapping(value = "/application/envTypes")
public GenericsTableDataInfo<ApplicationEnvTypeVo> getEnvTypes() {
return new GenericsTableDataInfo<>(microManagementService.getEnvTypes());
}
}

12
microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/domain/vo/ApplicationEnvTypeVo.java Normal file
View File

@ -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;
}

3
microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/IMicroManagementService.java
View File

@ -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<K8sApplicationEnvOptionalParameter> getEnvOptionalParameters(String namespace);
Boolean updateApplicationEnv(String kind, String namespace, String applicationName, List<K8sApplicationEnv> k8sApplicationEnvList);
List<ApplicationEnvTypeVo> getEnvTypes();
}

12
microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/impl/MicroManagementServiceImpl.java
View File

@ -436,6 +436,18 @@ public class MicroManagementServiceImpl extends CommonService implements IMicroM
return false;
}
@Override
public List<ApplicationEnvTypeVo> getEnvTypes() {
List<ApplicationEnvTypeVo> 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 字段。
*