Merge branch 'staging' into 'master'

Staging

See merge request !75

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

@@ -74,10 +74,14 @@ public class Set3proxyTask {
             }
 
             bw.write("\nauth strong\n");
-            for (IpResource ipResource : ipResources) {
+           a: for (IpResource ipResource : ipResources) {
                 if (StringUtils.isNotBlank(ipResource.getAddr())) {
+                    if (ipResource.getPort() == null || ipResource.getPort().size() == 0)
+                        continue a;
+
                     bw.write("allow " + ipResource.getProxyUsername() + "\n");
-                    bw.write("parent 1000 http " + ipResource.getAddr() + " " + ipResource.getPort().get(1) + " fangguanlianbrowser " + ipResource.getPassword() + "\n");
+                    bw.write("parent 1000 http " + ipResource.getAddr() + " " +
+                            (ipResource.getPort().size() > 1?ipResource.getPort().get(1):ipResource.getPort().get(0)) + " fangguanlianbrowser " + ipResource.getPassword() + "\n");
                 }
             }
             bw.write("\nallow none\nproxy -p20004\nsocks -p20005\n");