fix: setter may not be called for gateway group and app properties

This commit is contained in:
hongqiaowei
2020-10-27 22:18:17 +08:00
parent ac305b1ae7
commit b0d904123d

View File

@@ -28,6 +28,8 @@ import we.util.JacksonUtils;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* @author hongqiaowei * @author hongqiaowei
@@ -51,7 +53,7 @@ public class ApiConfig {
// @JsonIgnore // @JsonIgnore
public int isDeleted = 0; // tb_api_auth.is_deleted public int isDeleted = 0; // tb_api_auth.is_deleted
public Set<String> gatewayGroups = new HashSet<>(6); public Set<String> gatewayGroups = Stream.of(GatewayGroup.DEFAULT).collect(Collectors.toSet());
public String service; public String service;
@@ -59,7 +61,7 @@ public class ApiConfig {
public String path = String.valueOf(Constants.Symbol.FORWARD_SLASH); public String path = String.valueOf(Constants.Symbol.FORWARD_SLASH);
public Set<String> apps = new HashSet<>(6); public Set<String> apps = Stream.of(App.ALL_APP).collect(Collectors.toSet());
public byte proxyMode = DIRECT_PROXY_MODE; public byte proxyMode = DIRECT_PROXY_MODE;
@@ -72,6 +74,7 @@ public class ApiConfig {
public List<PluginConfig> pluginConfigs; public List<PluginConfig> pluginConfigs;
public void setGatewayGroup(String ggs) { public void setGatewayGroup(String ggs) {
gatewayGroups.remove(GatewayGroup.DEFAULT);
if (StringUtils.isBlank(ggs)) { if (StringUtils.isBlank(ggs)) {
gatewayGroups.add("*"); gatewayGroups.add("*");
} else { } else {
@@ -84,6 +87,7 @@ public class ApiConfig {
} }
public void setApp(String as) { public void setApp(String as) {
apps.remove(App.ALL_APP);
if (StringUtils.isBlank(as)) { if (StringUtils.isBlank(as)) {
apps.add("*"); apps.add("*");
} else { } else {