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

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

@@ -149,7 +149,7 @@ public class IpResource implements Serializable {
     /**
      * KCP端口号
      */
-    private int secondaryProxyPort = -1;
+    private String secondaryProxyPort = "";
 
     @Override
     public boolean equals(Object o) {

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

@@ -35,7 +35,7 @@ public class IpResourceDto {
 
     private String specialLineIp;
 
-    private int secondaryProxyPort = -1;
+    private String secondaryProxyPort = "";
 
     public IpResourceDto() {
     }
@@ -269,11 +269,11 @@ public class IpResourceDto {
         this.bindShop = bindShop;
     }
 
-    public int getSecondaryProxyPort() {
+    public String getSecondaryProxyPort() {
         return secondaryProxyPort;
     }
 
-    public void setSecondaryProxyPort(int secondaryProxyPort) {
+    public void setSecondaryProxyPort(String secondaryProxyPort) {
         this.secondaryProxyPort = secondaryProxyPort;
     }
 }