Merge branch 'dev-zrj' into 'staging'

proxyport

See merge request !36

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

@@ -40,8 +40,8 @@ public class IpResource implements Serializable {
     //专线数据
     private String proxyUsername;
     private String proxyPassword;
-    private String proxyprotocol;
-    private List<String> proxyport;
+    private String proxyProtocol;
+    private List<String> proxyPort;
 
     private String shopId;
     private String shopName;
@@ -287,20 +287,19 @@ public class IpResource implements Serializable {
         this.specialLine = specialLine;
     }
 
-    public List<String> getProxyport() {
-        return proxyport;
+    public List<String> getProxyPort() {
+        return proxyPort;
     }
 
-    public void setProxyport(List<String> proxyport) {
-        this.proxyport = proxyport;
+    public void setProxyPort(List<String> proxyPort) {
+        this.proxyPort = proxyPort;
     }
 
-    public String getProxyprotocol() {
-        return proxyprotocol;
+    public String getProxyProtocol() {
+        return proxyProtocol;
     }
 
-    public void setProxyprotocol(String proxyprotocol) {
-        this.proxyprotocol = proxyprotocol;
+    public void setProxyProtocol(String proxyProtocol) {
+        this.proxyProtocol = proxyProtocol;
     }
-
 }

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

@@ -28,8 +28,8 @@ public class IpResourceDto {
     //专线数据
     private String proxyUsername;
     private String proxyPassword;
-    private String proxyprotocol;
-    private List<String> proxyport;
+    private String proxyProtocol;
+    private List<String> proxyPort;
 
     public IpResourceDto(){
     }
@@ -49,8 +49,8 @@ public class IpResourceDto {
         this.protocol = ipResource.getProtocol();
         this.proxyUsername = ipResource.getProxyUsername();
         this.proxyPassword = ipResource.getProxyPassword();
-        this.proxyport = ipResource.getProxyport();
-        this.proxyprotocol = ipResource.getProxyprotocol();
+        this.proxyPort = ipResource.getProxyPort();
+        this.proxyProtocol = ipResource.getProxyProtocol();
         this.specialLine = ipResource.isSpecialLine();
         this.bindShop = shopDto;
         if (useHistory)
@@ -195,19 +195,19 @@ public class IpResourceDto {
         this.specialLine = specialLine;
     }
 
-    public List<String> getProxyport() {
-        return proxyport;
+    public String getProxyProtocol() {
+        return proxyProtocol;
     }
 
-    public void setProxyport(List<String> proxyport) {
-        this.proxyport = proxyport;
+    public void setProxyProtocol(String proxyProtocol) {
+        this.proxyProtocol = proxyProtocol;
     }
 
-    public String getProxyprotocol() {
-        return proxyprotocol;
+    public List<String> getProxyPort() {
+        return proxyPort;
     }
 
-    public void setProxyprotocol(String proxyprotocol) {
-        this.proxyprotocol = proxyprotocol;
+    public void setProxyPort(List<String> proxyPort) {
+        this.proxyPort = proxyPort;
     }
 }

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java

@@ -150,6 +150,11 @@ public class IpResourceServiceImpl implements IpResourceService {
         return retStr;
     }
 
+//    public static void main(String[] args) {
+//        String password = genRandom(3, 12);
+//        System.out.println(password);
+//    }
+
     private IpChargeRequestDto buildIpChargeRequestDto(IpResourceRequestDto request, int chargeType, int payMethod) {
         IpChargeRequestDto ipChargeRequestDto = new IpChargeRequestDto();
         ipChargeRequestDto.setAmount(request.getAmount());