From 6f1db0627ce1410b8dbb5caf9cd3c89a98ee8a5d Mon Sep 17 00:00:00 2001
From: yotsubar <78026700+yotsubar@users.noreply.github.com>
Date: Thu, 1 Jul 2021 11:57:47 +0800
Subject: [PATCH] Update DbMaker.java

Use UTF-8 while reading files
---
 maker/java/src/org/lionsoul/ip2region/DbMaker.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/maker/java/src/org/lionsoul/ip2region/DbMaker.java b/maker/java/src/org/lionsoul/ip2region/DbMaker.java
index e1898c9..0c4aaa6 100644
--- a/maker/java/src/org/lionsoul/ip2region/DbMaker.java
+++ b/maker/java/src/org/lionsoul/ip2region/DbMaker.java
@@ -2,7 +2,9 @@ package org.lionsoul.ip2region;
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileReader;
+import java.io.InputStreamReader;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.io.UnsupportedEncodingException;
@@ -127,7 +129,7 @@ public class DbMaker
 		//check and load the gloabl region
 		if ( globalRegionFile != null ) {
 			System.out.println("+-Try to load the global region data ...");
-			BufferedReader greader = new BufferedReader(new FileReader(globalRegionFile));
+			BufferedReader greader = new BufferedReader(new InputStreamReader(new FileInputStream(this.globalRegionFile), "UTF-8"));
 			String gline = null;
 			while ( (gline = greader.readLine()) != null ) {
 				String[] p = gline.split(",");
@@ -142,7 +144,7 @@ public class DbMaker
 		}
 		
 		//alloc the header size
-		BufferedReader reader = new BufferedReader(new FileReader(this.ipSrcFile));
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(this.ipSrcFile), "UTF-8"));
 		RandomAccessFile raf  = new RandomAccessFile(dbFile, "rw");
 		
 		//init the db file
@@ -405,4 +407,4 @@ public class DbMaker
             e.printStackTrace();
         }
 	}
-}
\ No newline at end of file
+}