fix: 覆盖hosts中的值

Signed-off-by: 何国健 <1664931260@qq.com>

Author: solorwong

src/main/java/com/sololn/fastergithub/Starter.java

@@ -5,6 +5,8 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Map;
 
 /**
@@ -18,9 +20,11 @@
 public class Starter implements CommandLineRunner {
     @Override
     public void run(String... args) throws Exception {
-        Map<String, String> stringStringMap = IpUtil.readIpMap("https://myssl.com/api/v1/tools/dns_query?qtype=1&host=", "qmode=-1");
-        HostUtil.toFile(stringStringMap);
-        /*Map<String, String> ips = Inet4Address.getIps();
-        HostUtil.buildContent(ips);*/
+        String url  = "https://myssl.com/api/v1/tools/dns_query?qtype=1&host=";
+        String params = "qmode=-1";
+        Path outPath = Paths.get(System.getProperty("user.dir") ,"hosts");
+        
+        Map<String, String> stringStringMap = IpUtil.readIpMap(url, params);
+        HostUtil.toFile(stringStringMap, outPath);
     }
 }

src/main/java/com/sololn/fastergithub/pojo/HttpResponse.java

@@ -2,7 +2,6 @@
 
 /**
  * @ClassName pojo
- * @Description TODO
  * @Author HeGuojian
  * @Date 2021/9/8 15:53
  * @Version 1.0

src/main/java/com/sololn/fastergithub/pojo/IPPojo.java

@@ -15,18 +15,16 @@
 
 /**
  * @ClassName HostUtil
- * @Description TODO
  * @Author HeGuojian
  * @Date 2021/8/30 17:14
  * @Version 1.0
  **/
 public class HostUtil {
-    private static final  Path outPath ;
-
-    static {
-        outPath = Paths.get(System.getProperty("user.dir") ,"hosts");
+    
+    public static void toFile(Map<String, String> stringStringMap, Path path) throws IOException {
+        write(buildContent(stringStringMap), path);
     }
-    private static List<String> buildContent(Map<String, String> ips) throws IOException {
+    private static List<String> buildContent(Map<String, String> ips) {
         //C:\Windows\System32\drivers\etc
         Path inPath = Paths.get("C:", "Windows", "System32", "drivers", "etc", "hosts");
         List<String> content = new ArrayList<>();
@@ -61,12 +59,17 @@ private static List<String> buildContent(Map<String, String> ips) throws IOExcep
             }
             continue;
         }
-        // todo 读取原github配置，并用新的值去覆盖
+        /*
+        * 用ips的值覆盖hosts的值
+        * */
+        ips.forEach((key, value) -> {
+            contentGithub.put(key, value);
+        });
         List<String> contentStr = new ArrayList<>();
         // 添加 github 的配置
         contentStr.add("#github-faster 配置 #");
         // map 转 string
-        ips.forEach((key, value) -> {
+        contentGithub.forEach((key, value) -> {
             StringBuffer tap = new StringBuffer();
             int num = 30 - value.length();
             while (num > 0){
@@ -82,22 +85,22 @@ private static List<String> buildContent(Map<String, String> ips) throws IOExcep
         return content;
     }
 
-    private static void openFolder() {
+    private static void openFolder(Path path) {
         try {
             String[] cmd = new String[5];
             cmd[0] = "cmd";
             cmd[1] = "/c";
             cmd[2] = "start";
             cmd[3] = " ";
-            cmd[4] = outPath.toString();
+            cmd[4] = path.toString();
             Runtime.getRuntime().exec(cmd);
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
-    public static void write(List<String> content) throws IOException {
-        File outDir = outPath.toFile();
+    public static void write(List<String> content, Path path) throws IOException {
+        File outDir = path.toFile();
         if (!outDir.exists()){
             outDir.mkdirs();
         }
@@ -106,21 +109,18 @@ public static void write(List<String> content) throws IOException {
             hosts.createNewFile();
         }
         Files.write(hosts.toPath(),content);
-    }
-
-    private static void unlockInWin(File file) {
-        String cmd = "C:\\myProgram\\fast-github\\cmd\\hostWritable";
-        try {
-            Process p = Runtime.getRuntime().exec(cmd);
-            p.waitFor();
-        } catch (IOException | InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        openFolder(path);
     }
 
-    public static void toFile(Map<String, String> stringStringMap) throws IOException {
-        List<String> content = buildContent(stringStringMap);
-        write(content);
-        openFolder();
-    }
+    
+   
+    /* private static void unlockInWin(File file) {
+         String cmd = "C:\\myProgram\\fast-github\\cmd\\hostWritable";
+         try {
+             Process p = Runtime.getRuntime().exec(cmd);
+             p.waitFor();
+         } catch (IOException | InterruptedException e) {
+             throw new RuntimeException(e);
+         }
+     }*/
 }

src/main/java/com/sololn/fastergithub/util/HostUtil.java

@@ -11,14 +11,9 @@
 import java.net.URLConnection;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @ClassName getIP
- * @Description TODO
  * @Author HeGuojian
  * @Date 2021/8/30 16:57
  * @Version 1.0
@@ -87,7 +82,7 @@ public static String sendGet(String url) {
 
 
 
-    public static String getIpFromJson(String url){
+    /*public static String getIpFromJson(String url){
       return sendGet(url);
     }
     public static Map<String, String> getIps(){
@@ -127,10 +122,10 @@ public static Map<String, String> getIps(){
         Map<String, String> ips = new HashMap<>();
         for (String s : urls){
             String response = Inet4Address.sendGet(s);
-            /*String ip = Inet4Address.getIpFromStr(response);
+            *//*String ip = Inet4Address.getIpFromStr(response);
             if (null == ip){
                 continue;
-            }*/
+            }*//*
             if ("".equals(response)){
                 continue;
             }
@@ -160,5 +155,5 @@ public static String getIpFromStr (String response){
         }
         return null;
     }
-
+*/
 }