删除 /api/devops/app_types 接口, 使用 /api/devops/env 同时返回 env 和 appType

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/AppConfigController.java

@@ -5,7 +5,6 @@ import cn.reghao.bnt.web.devops.app.model.dto.AppConfigDto;
 import cn.reghao.bnt.web.devops.app.model.dto.AppConfigUpdateDto;
 import cn.reghao.bnt.web.devops.app.model.dto.CopyAppDto;
 import cn.reghao.bnt.web.devops.app.service.AppBuildService;
-import cn.reghao.bnt.web.devops.util.DefaultSetting;
 import cn.reghao.bnt.web.devops.app.db.query.AppBuildQuery;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
 import cn.reghao.bnt.web.devops.app.model.vo.AppConfigVO;
@@ -40,19 +39,15 @@ import java.util.stream.Collectors;
 @RequestMapping("/api/devops/app/config/app")
 public class AppConfigController {
     private int pageSize = 10;
-    private final DefaultSetting defaultSetting;
     private final AppBuildQuery appBuildQuery;
     private final RepoAuthConfigRepository repoAuthConfigRepository;
     private final CompilerConfigRepository compilerConfigRepository;
     private final PackerConfigRepository packerConfigRepository;
     private final AppBuildService appBuildService;
 
-    public AppConfigController(DefaultSetting defaultSetting, AppBuildQuery appBuildQuery,
-                               RepoAuthConfigRepository repoAuthConfigRepository,
+    public AppConfigController(AppBuildQuery appBuildQuery, RepoAuthConfigRepository repoAuthConfigRepository,
                                CompilerConfigRepository compilerConfigRepository,
-                               PackerConfigRepository packerConfigRepository,
-                               AppBuildService appBuildService) {
-        this.defaultSetting = defaultSetting;
+                               PackerConfigRepository packerConfigRepository, AppBuildService appBuildService) {
         this.appBuildQuery = appBuildQuery;
         this.repoAuthConfigRepository = repoAuthConfigRepository;
         this.compilerConfigRepository = compilerConfigRepository;
@@ -65,13 +60,6 @@ public class AppConfigController {
     public String appConfigPage(@RequestParam(value = "env") String env,
                                 @RequestParam(value = "appType") String appType,
                                 @RequestParam(value = "pn") int pageNumber) {
-        if (env == null) {
-            env = defaultSetting.getDefaultEnv();
-        }
-        if (appType == null) {
-            appType = defaultSetting.getDefaultAppType();
-        }
-
         PageRequest pageRequest = PageRequest.of(pageNumber-1, pageSize);
         Page<AppConfigVO> appPage = appBuildQuery.getByEnvAndType(env, appType, pageRequest);
         PageList<AppConfigVO> pageList = getPageList(appPage);

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/AppStatController.java

@@ -2,7 +2,6 @@ package cn.reghao.bnt.web.devops.app.controller;
 
 import cn.reghao.bnt.common.msg.constant.AppStatOps;
 import cn.reghao.bnt.web.devops.app.model.dto.AppNode;
-import cn.reghao.bnt.web.devops.util.DefaultSetting;
 import cn.reghao.bnt.web.devops.app.db.query.AppDeployQuery;
 import cn.reghao.bnt.web.devops.app.model.vo.AppRunning;
 import cn.reghao.bnt.web.devops.app.model.vo.AppRunningNode;
@@ -19,7 +18,6 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,14 +29,11 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/devops/app/stat")
 public class AppStatController {
-    private final DefaultSetting defaultSetting;
     private final AppDeployQuery appDeployQuery;
     private final AppRunService appRunService;
     private int pageSize = 10;
 
-    public AppStatController(DefaultSetting defaultSetting, AppDeployQuery appDeployQuery,
-                             AppRunService appRunService) {
-        this.defaultSetting = defaultSetting;
+    public AppStatController(AppDeployQuery appDeployQuery, AppRunService appRunService) {
         this.appDeployQuery = appDeployQuery;
         this.appRunService = appRunService;
     }
@@ -48,40 +43,9 @@ public class AppStatController {
     public String statusPage1(@RequestParam(value = "pn") int pageNumber,
                               @RequestParam(value = "env") String env,
                               @RequestParam(value = "appType") String type) {
-        List<String> queryList = new ArrayList<>();
-        if (env == null) {
-            env = defaultSetting.getDefaultEnv();
-        } else {
-            queryList.add("env=" + env);
-        }
-
-        if (type == null) {
-            type = defaultSetting.getDefaultAppType();
-        } else {
-            queryList.add("type=" + type);
-        }
-
-        StringBuilder queryParams = new StringBuilder();
-        if (!queryList.isEmpty()) {
-            queryParams.append("?").append(queryList.get(0));
-            for (int i = 1; i < queryList.size(); i++) {
-                queryParams.append("&").append(queryList.get(i));
-            }
-        }
-
         PageRequest pageRequest = PageRequest.of(pageNumber-1, pageSize);
         Page<AppRunning> page = appDeployQuery.getAppRunningByPage(env, type, pageRequest);
         PageList<AppRunning> pageList = getPageList(page);
-
-        List<String> envList = defaultSetting.getEnvList();
-        List<String> appTypes = defaultSetting.getAppTypeList();
-        /*model.addAttribute("env", env);
-        model.addAttribute("type", type);
-        model.addAttribute("envList", envList);
-        model.addAttribute("appTypes", appTypes);
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
-        model.addAttribute("query", queryParams.toString());*/
         return WebResult.success(pageList);
     }
 

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/BuildDeployController.java

@@ -7,7 +7,6 @@ import cn.reghao.bnt.web.devops.app.service.AppBuildService;
 import cn.reghao.bnt.web.devops.app.service.bd.DeployApp;
 import cn.reghao.bnt.web.devops.app.service.bd.GetApp;
 import cn.reghao.bnt.web.devops.app.service.webhook.WebhookService;
-import cn.reghao.bnt.web.devops.util.DefaultSetting;
 import cn.reghao.bnt.web.devops.app.db.query.AppBuildQuery;
 import cn.reghao.bnt.web.devops.app.db.query.AppDeployQuery;
 import cn.reghao.bnt.web.devops.app.model.po.log.BuildConfigSnapshot;
@@ -25,11 +24,9 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -41,7 +38,6 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/devops/app/bd")
 public class BuildDeployController {
-    private final DefaultSetting defaultSetting;
     private final AppBuildQuery appBuildQuery;
     private final AppDeployQuery appDeployQuery;
     private final BuildApp buildApp;
@@ -51,10 +47,9 @@ public class BuildDeployController {
     private final WebhookService webhookService;
     private int pageSize = 10;
 
-    public BuildDeployController(DefaultSetting defaultSetting, AppBuildQuery appBuildQuery,
-                                 AppDeployQuery appDeployQuery, BuildApp buildApp, DeployApp deployApp,
-                                 GetApp getApp, AppBuildService appBuildService, WebhookService webhookService) {
-        this.defaultSetting = defaultSetting;
+    public BuildDeployController(AppBuildQuery appBuildQuery, AppDeployQuery appDeployQuery, BuildApp buildApp,
+                                 DeployApp deployApp, GetApp getApp, AppBuildService appBuildService,
+                                 WebhookService webhookService) {
         this.appBuildQuery = appBuildQuery;
         this.appDeployQuery = appDeployQuery;
         this.buildApp = buildApp;
@@ -69,21 +64,10 @@ public class BuildDeployController {
     public String index(@RequestParam(value = "pn") int pageNumber,
                         @RequestParam(value = "env") String env,
                         @RequestParam(value = "appType") String appType) {
-        List<String> queryList = new ArrayList<>();
-        if (env == null) {
-            env = defaultSetting.getDefaultEnv();
-        }
-        if (appType == null) {
-            appType = defaultSetting.getDefaultAppType();
-        }
-
         Sort sort = Sort.by(Sort.Direction.DESC, "buildTime");
         PageRequest pageRequest = PageRequest.of(pageNumber-1, pageSize, sort);
         Page<AppBuildingVO> page = appBuildQuery.getByPage(env, appType, pageRequest);
         PageList<AppBuildingVO> pageList = getPageList(page);
-
-        List<String> envList = defaultSetting.getEnvList();
-        List<String> appTypes = defaultSetting.getAppTypeList();
         /*model.addAttribute("env", env);
         model.addAttribute("type", type);
         model.addAttribute("envList", envList);

web/src/main/java/cn/reghao/bnt/web/devops/build/controller/BuildDirController.java

@@ -12,7 +12,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -47,22 +49,24 @@ public class BuildDirController {
         return WebResult.result(result);
     }
 
-    @Operation(summary = "环境列表", description = "N")
+    @Operation(summary = "环境和应用类型列表", description = "N")
     @GetMapping(value = "/envs", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getEnvList() {
+        String userEnv = defaultSetting.getDefaultEnv();
         List<SelectOption> envList = defaultSetting.getEnvList().stream()
                 .map(env -> new SelectOption(env, env))
                 .collect(Collectors.toList());
 
-        return WebResult.success(envList);
-    }
-
-    @Operation(summary = "应用类型列表", description = "N")
-    @GetMapping(value = "/app_types", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String getAppTypeList() {
+        String userAppType = defaultSetting.getDefaultAppType();
         List<SelectOption> appTypeList = defaultSetting.getAppTypeList().stream()
                 .map(env -> new SelectOption(env, env))
                 .collect(Collectors.toList());
-        return WebResult.success(appTypeList);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("userEnv", userEnv);
+        map.put("envList", envList);
+        map.put("userAppType", userAppType);
+        map.put("appTypeList", appTypeList);
+        return WebResult.success(map);
     }
 }