Commit b2a47f58 authored by huangjiamin's avatar huangjiamin

用户白名单、KCP端口号

parent d3b6e6d7
...@@ -42,6 +42,8 @@ public class AccountDto { ...@@ -42,6 +42,8 @@ public class AccountDto {
private List<String> whiteList = new ArrayList<>(); private List<String> whiteList = new ArrayList<>();
private List<String> userWhiteList = new ArrayList<>();
private ShopSummary shopSummary; private ShopSummary shopSummary;
private IpSummary ipSummary; private IpSummary ipSummary;
...@@ -69,6 +71,7 @@ public class AccountDto { ...@@ -69,6 +71,7 @@ public class AccountDto {
this.setToken(account.getToken()); this.setToken(account.getToken());
this.setPermission(account.getPermission()); this.setPermission(account.getPermission());
this.setWhiteList(account.getWhiteList()); this.setWhiteList(account.getWhiteList());
this.setUserWhiteList(account.getWhiteList());
this.setQueryIpUrlList(account.getQueryIpUrlList()); this.setQueryIpUrlList(account.getQueryIpUrlList());
if (account.getPromotion() != null) { if (account.getPromotion() != null) {
this.setPromotion(account.getPromotion()); this.setPromotion(account.getPromotion());
...@@ -256,4 +259,12 @@ public class AccountDto { ...@@ -256,4 +259,12 @@ public class AccountDto {
public void setPromotionCode(String promotionCode) { public void setPromotionCode(String promotionCode) {
this.promotionCode = promotionCode; this.promotionCode = promotionCode;
} }
public List<String> getUserWhiteList() {
return userWhiteList;
}
public void setUserWhiteList(List<String> userWhiteList) {
this.userWhiteList = userWhiteList;
}
} }
...@@ -146,6 +146,11 @@ public class IpResource implements Serializable { ...@@ -146,6 +146,11 @@ public class IpResource implements Serializable {
*/ */
private int period; private int period;
/**
* KCP端口号
*/
private int secondaryProxyPort = -1;
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) { if (this == o) {
......
...@@ -35,6 +35,8 @@ public class IpResourceDto { ...@@ -35,6 +35,8 @@ public class IpResourceDto {
private String specialLineIp; private String specialLineIp;
private int secondaryProxyPort = -1;
public IpResourceDto() { public IpResourceDto() {
} }
...@@ -52,6 +54,7 @@ public class IpResourceDto { ...@@ -52,6 +54,7 @@ public class IpResourceDto {
this.password = ipResource.getPassword(); this.password = ipResource.getPassword();
this.protocol = ipResource.getProtocol(); this.protocol = ipResource.getProtocol();
this.specialLine = ipResource.isSpecialLine(); this.specialLine = ipResource.isSpecialLine();
this.secondaryProxyPort = ipResource.getSecondaryProxyPort();
if (CollectionUtils.isNotEmpty(shopDtos)) { if (CollectionUtils.isNotEmpty(shopDtos)) {
this.bindShops = shopDtos; this.bindShops = shopDtos;
this.bindShop = shopDtos.get(0); this.bindShop = shopDtos.get(0);
...@@ -63,7 +66,6 @@ public class IpResourceDto { ...@@ -63,7 +66,6 @@ public class IpResourceDto {
this.bindHistories = ipResource.getBindHistory(); this.bindHistories = ipResource.getBindHistory();
else else
this.bindHistories = new ArrayList<>(); this.bindHistories = new ArrayList<>();
} }
public IpResourceDto(IpResource ipResource, List<ShopDto> shopDtos, boolean useHistory, SpecialLine specialLine1) { public IpResourceDto(IpResource ipResource, List<ShopDto> shopDtos, boolean useHistory, SpecialLine specialLine1) {
...@@ -84,6 +86,7 @@ public class IpResourceDto { ...@@ -84,6 +86,7 @@ public class IpResourceDto {
this.proxyPort = specialLine1.getProxyPort(); this.proxyPort = specialLine1.getProxyPort();
this.proxyProtocol = specialLine1.getProxyProtocol(); this.proxyProtocol = specialLine1.getProxyProtocol();
this.specialLine = ipResource.isSpecialLine(); this.specialLine = ipResource.isSpecialLine();
this.secondaryProxyPort = ipResource.getSecondaryProxyPort();
if (CollectionUtils.isNotEmpty(shopDtos)) { if (CollectionUtils.isNotEmpty(shopDtos)) {
this.bindShops = shopDtos; this.bindShops = shopDtos;
this.bindShop = shopDtos.get(0); this.bindShop = shopDtos.get(0);
...@@ -265,4 +268,12 @@ public class IpResourceDto { ...@@ -265,4 +268,12 @@ public class IpResourceDto {
public void setBindShop(ShopDto bindShop) { public void setBindShop(ShopDto bindShop) {
this.bindShop = bindShop; this.bindShop = bindShop;
} }
public int getSecondaryProxyPort() {
return secondaryProxyPort;
}
public void setSecondaryProxyPort(int secondaryProxyPort) {
this.secondaryProxyPort = secondaryProxyPort;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment