Merge remote-tracking branch 'origin/feat/V1.1' into feat/V1.1

src/main/java/com/edgec/browserbackend/browser/task/Set3proxyTask.java

@@ -64,7 +64,8 @@ public class Set3proxyTask {
             bw.write("fakeresolve\n");
             bw.write("config /root/3proxy.cfg\n");
             bw.write("monitor /root/3proxy.cfg\n");
-            bw.write("deny * * $/root/blacklist.cfg\n");
+            //没有找到原来的配置文件，暂时注释掉
+            //bw.write("deny * * $/root/blacklist.cfg\n");
 
             for (IpResource ipResource : ipResources) {
                 if (StringUtils.isNotBlank(ipResource.getAddr()))
@@ -82,10 +83,10 @@ public class Set3proxyTask {
                     bw.write("allow " + ipResource.getProxyUsername() + "\n");
                     if (ipResource.getIpType() != IpType.OWN) {
                         bw.write("parent 1000 http " + ipResource.getAddr() + " " +
-                                (ipResource.getPort().size() > 1 ? ipResource.getPort().get(1) : ipResource.getPort().get(0)) + " wujiesuperbrowser " + ipResource.getPassword() + "\n");
+                                ipResource.getPort().get(0) + " wujiesuperbrowser " + ipResource.getPassword() + "\n");
                     } else {
                         bw.write("parent 1000 http " + ipResource.getAddr() + " " +
-                                (ipResource.getPort().size() > 1 ? ipResource.getPort().get(1) : ipResource.getPort().get(0)) + " " + ipResource.getUsername() + " " + ipResource.getPassword() + "\n");
+                                ipResource.getPort().get(0) + " " + ipResource.getUsername() + " " + ipResource.getPassword() + "\n");
 
                     }
                 }