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

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

@@ -8,7 +8,6 @@ import com.edgec.browserbackend.browser.domain.ProxyConfig;
 import com.edgec.browserbackend.browser.repository.IpResourceRepository;
 import com.edgec.browserbackend.browser.repository.ProxyConfigRepository;
 import com.edgec.browserbackend.browser.repository.SpecialLineRepository;
-import net.javacrumbs.shedlock.core.SchedulerLock;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,6 +61,7 @@ public class Set3proxyTask {
             BufferedWriter bw = new BufferedWriter(fileWriter);
             bw.write("daemon\nlog /var/log/3proxy.log D\nrotate 30\n");
             bw.write("maxconn 10000\n");
+            bw.write("fakeresolve\n");
             bw.write("config /root/3proxy.cfg\n");
             bw.write("monitor /root/3proxy.cfg\n");