Merge branch 'staging' into 'master'

增加黑名单配置

See merge request !159

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

@@ -64,7 +64,7 @@ public class Set3proxyTask {
             bw.write("fakeresolve\n");
             bw.write("config /root/3proxy.cfg\n");
             bw.write("monitor /root/3proxy.cfg\n");
-            bw.write("deny * * *facebook*,*google.*,*youtube*,*twitter*\n");
+            bw.write("deny * * $/root/blacklist.cfg\n");
 
             for (IpResource ipResource : ipResources) {
                 if (StringUtils.isNotBlank(ipResource.getAddr()))