Merge remote-tracking branch 'origin/staging' into staging

src/main/java/com/edgec/browserbackend/account/domain/AccountDto.java

@@ -42,6 +42,8 @@ public class AccountDto {
 
     private List<String> whiteList = new ArrayList<>();
 
+    private List<String> userWhiteList = new ArrayList<>();
+
     private ShopSummary shopSummary;
 
     private IpSummary ipSummary;
@@ -69,6 +71,7 @@ public class AccountDto {
         this.setToken(account.getToken());
         this.setPermission(account.getPermission());
         this.setWhiteList(account.getWhiteList());
+        this.setUserWhiteList(account.getWhiteList());
         this.setQueryIpUrlList(account.getQueryIpUrlList());
         if (account.getPromotion() != null) {
             this.setPromotion(account.getPromotion());
@@ -256,4 +259,12 @@ public class AccountDto {
     public void setPromotionCode(String promotionCode) {
         this.promotionCode = promotionCode;
     }
+
+    public List<String> getUserWhiteList() {
+        return userWhiteList;
+    }
+
+    public void setUserWhiteList(List<String> userWhiteList) {
+        this.userWhiteList = userWhiteList;
+    }
 }

src/main/java/com/edgec/browserbackend/browser/domain/IpResource.java

@@ -146,6 +146,11 @@ public class IpResource implements Serializable {
      */
     private int period;
 
+    /**
+     * KCP端口号
+     */
+    private int secondaryProxyPort = -1;
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

src/main/java/com/edgec/browserbackend/browser/dto/IpResourceDto.java

@@ -35,6 +35,8 @@ public class IpResourceDto {
 
     private String specialLineIp;
 
+    private int secondaryProxyPort = -1;
+
     public IpResourceDto() {
     }
 
@@ -52,6 +54,7 @@ public class IpResourceDto {
         this.password = ipResource.getPassword();
         this.protocol = ipResource.getProtocol();
         this.specialLine = ipResource.isSpecialLine();
+        this.secondaryProxyPort = ipResource.getSecondaryProxyPort();
         if (CollectionUtils.isNotEmpty(shopDtos)) {
             this.bindShops = shopDtos;
             this.bindShop = shopDtos.get(0);
@@ -63,7 +66,6 @@ public class IpResourceDto {
             this.bindHistories = ipResource.getBindHistory();
         else
             this.bindHistories = new ArrayList<>();
-
     }
 
     public IpResourceDto(IpResource ipResource, List<ShopDto> shopDtos, boolean useHistory, SpecialLine specialLine1) {
@@ -84,6 +86,7 @@ public class IpResourceDto {
         this.proxyPort = specialLine1.getProxyPort();
         this.proxyProtocol = specialLine1.getProxyProtocol();
         this.specialLine = ipResource.isSpecialLine();
+        this.secondaryProxyPort = ipResource.getSecondaryProxyPort();
         if (CollectionUtils.isNotEmpty(shopDtos)) {
             this.bindShops = shopDtos;
             this.bindShop = shopDtos.get(0);
@@ -265,4 +268,12 @@ public class IpResourceDto {
     public void setBindShop(ShopDto bindShop) {
         this.bindShop = bindShop;
     }
+
+    public int getSecondaryProxyPort() {
+        return secondaryProxyPort;
+    }
+
+    public void setSecondaryProxyPort(int secondaryProxyPort) {
+        this.secondaryProxyPort = secondaryProxyPort;
+    }
 }