Переглянути джерело

更新 DefaultSetting 中的方法名, 并删除无用的方法

reghao 2 роки тому
батько
коміт
b66dfb5247

+ 2 - 2
manager/src/main/java/cn/reghao/devops/manager/app/controller/page/BuildDeployPageController.java

@@ -53,11 +53,11 @@ public class BuildDeployPageController {
                         @RequestParam(value = "type", required = false) String type,
                         @RequestParam(value = "appName", required = false) String appName, Model model) throws Exception {
         if (env == null) {
-            env = DefaultSetting.getAppEnv();
+            env = DefaultSetting.getDefaultAppEnv();
         }
 
         if (type == null) {
-            type = DefaultSetting.getAppType();
+            type = DefaultSetting.getDefaultAppType();
         }
 
         PageRequest pageRequest = PageSort.pageRequest();

+ 2 - 2
manager/src/main/java/cn/reghao/devops/manager/app/controller/page/StatusPageController.java

@@ -44,11 +44,11 @@ public class StatusPageController {
                               @RequestParam(value = "appName", required = false) String appName,
                               Model model) {
         if (env == null) {
-            env = DefaultSetting.getAppEnv();
+            env = DefaultSetting.getDefaultAppEnv();
         }
 
         if (appType == null) {
-            appType = DefaultSetting.getAppType();
+            appType = DefaultSetting.getDefaultAppType();
         }
 
         if (status == null) {

+ 2 - 2
manager/src/main/java/cn/reghao/devops/manager/app/controller/page/config/AppConfigPageController.java

@@ -55,11 +55,11 @@ public class AppConfigPageController {
                                 @RequestParam(value = "appName", required = false) String appName,
                                 Model model) {
         if (env == null) {
-            env = DefaultSetting.getAppEnv();
+            env = DefaultSetting.getDefaultAppEnv();
         }
 
         if (type == null) {
-            type = DefaultSetting.getAppType();
+            type = DefaultSetting.getDefaultAppType();
         }
 
         if (appName != null) {

+ 1 - 1
manager/src/main/java/cn/reghao/devops/manager/machine/controller/page/MachineHostPageController.java

@@ -53,7 +53,7 @@ public class MachineHostPageController {
                            @RequestParam(value = "machineIpv4", required = false) String machineIpv4,
                            Model model) {
         if (env == null) {
-            env = DefaultSetting.getAppEnv();
+            env = DefaultSetting.getDefaultAppEnv();
         }
 
         PageRequest pageRequest = PageSort.pageRequest();

+ 1 - 1
manager/src/main/java/cn/reghao/devops/manager/machine/model/po/MachineHost.java

@@ -38,6 +38,6 @@ public class MachineHost extends BaseEntity {
         } else {
             this.machineIpv4 = "127.0.0.1";
         }
-        this.env = DefaultSetting.getAppEnv();
+        this.env = DefaultSetting.getDefaultAppEnv();
     }
 }

+ 2 - 40
manager/src/main/java/cn/reghao/devops/manager/util/DefaultSetting.java

@@ -3,11 +3,8 @@ package cn.reghao.devops.manager.util;
 import cn.reghao.devops.common.build.model.constant.EnvType;
 import cn.reghao.devops.manager.account.service.UserContext;
 import cn.reghao.devops.manager.app.model.constant.AppType;
-import cn.reghao.devops.manager.app.model.vo.KeyValue;
 import cn.reghao.devops.manager.account.model.constant.RoleType;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -15,7 +12,7 @@ import java.util.Set;
  * @date 2023-12-01 11:29:21
  */
 public class DefaultSetting {
-    public static String getAppEnv() {
+    public static String getDefaultAppEnv() {
         Set<String> roles = UserContext.getUserRoles();
         if (roles.contains(RoleType.ROLE_ADMIN.name())) {
             return EnvType.test.name();
@@ -26,24 +23,7 @@ public class DefaultSetting {
         return EnvType.test.name();
     }
 
-    public static List<KeyValue> getAppEnvs() {
-        List<KeyValue> list = new ArrayList<>();
-        Set<String> roles = UserContext.getUserRoles();
-        if (roles.contains(RoleType.ROLE_ADMIN.name())) {
-            for (EnvType envType : EnvType.values()) {
-                list.add(new KeyValue(envType.name(), envType.name()));
-            }
-        } else if (roles.contains(RoleType.ROLE_BACKEND.name()) || roles.contains(RoleType.ROLE_FRONTEND.name())) {
-            list.add(new KeyValue(EnvType.test.name(), EnvType.test.name()));
-            list.add(new KeyValue(EnvType.uat.name(), EnvType.uat.name()));
-        } else {
-            list.add(new KeyValue(EnvType.test.name(), EnvType.test.name()));
-        }
-
-        return list;
-    }
-
-    public static String getAppType() {
+    public static String getDefaultAppType() {
         String defaultAppType = AppType.maven.getName();
         Set<String> roles = UserContext.getUserRoles();
         if (roles.contains(RoleType.ROLE_ADMIN.name())) {
@@ -56,22 +36,4 @@ public class DefaultSetting {
 
         return defaultAppType;
     }
-
-    public static List<KeyValue> getAppTypes() {
-        List<KeyValue> list = new ArrayList<>();
-        String role = UserContext.getUserRole();
-        if (role.equals(RoleType.ROLE_ADMIN.name())) {
-            for (AppType appType : AppType.values()) {
-                list.add(new KeyValue(appType.name(), appType.name()));
-            }
-        } else if (role.equals(RoleType.ROLE_BACKEND.name())) {
-            list.add(new KeyValue(AppType.dotnetCore.getName(), AppType.dotnetCore.getName()));
-        } else if (role.equals(RoleType.ROLE_FRONTEND.name())) {
-            list.add(new KeyValue(AppType.npm.getName(), AppType.npm.getName()));
-        } else {
-            list.add(new KeyValue(AppType.npm.getName(), AppType.npm.getName()));
-        }
-
-        return list;
-    }
 }