Commit b88f8366 authored by Max Lv's avatar Max Lv

Refine #1489

parent c3bbd09e
Subproject commit c8ec480cf716be70bc3cae2c4cd7f2733901ab09 Subproject commit 6904e8d435ddfb9424b3ed1995208318434f1ae3
...@@ -238,22 +238,6 @@ object BaseService { ...@@ -238,22 +238,6 @@ object BaseService {
Acl.getFile(if (route == Acl.CUSTOM_RULES) Acl.CUSTOM_RULES_FLATTENED else route) Acl.getFile(if (route == Acl.CUSTOM_RULES) Acl.CUSTOM_RULES_FLATTENED else route)
} }
fun getListFile(): File? {
val aclFile = getAclFile() ?: return null
val listFile = File(aclFile.absolutePath + ".lst")
val list = StringBuilder()
aclFile.bufferedReader().useLines {
for (line in it) {
if (line.startsWith("^(.*\\.)?")) {
list.append(line.substring(8).replace("\\","").replace("$",""))
list.append("\n")
}
}
}
listFile.bufferedWriter().use { it.write(list.toString()) }
return listFile
}
fun createNotification(): ServiceNotification fun createNotification(): ServiceNotification
fun startRunner() { fun startRunner() {
......
...@@ -89,7 +89,7 @@ object LocalDnsService { ...@@ -89,7 +89,7 @@ object LocalDnsService {
.put("PrimaryDNS", localDns) .put("PrimaryDNS", localDns)
.put("AlternativeDNS", remoteDns) .put("AlternativeDNS", remoteDns)
.put("IPNetworkFile", "china_ip_list.txt") .put("IPNetworkFile", "china_ip_list.txt")
.put("DomainFile", getListFile()!!.absolutePath) .put("DomainFile", getAclFile()!!.absolutePath)
Acl.CHINALIST -> config Acl.CHINALIST -> config
.put("PrimaryDNS", localDns) .put("PrimaryDNS", localDns)
.put("AlternativeDNS", remoteDns) .put("AlternativeDNS", remoteDns)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment