From 6e570b9262a04b4c4fd633d9ae536d4a3ec83885 Mon Sep 17 00:00:00 2001
From: Lion <chenxin619315@gmail.com>
Date: Wed, 6 Jul 2022 16:55:35 +0800
Subject: [PATCH] rename searchByStr to search and default the region encode to
 utf-8

---
 .../java/src/main/java/org/lionsoul/ip2region/SearchTest.java | 2 +-
 .../src/main/java/org/lionsoul/ip2region/xdb/Searcher.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/binding/java/src/main/java/org/lionsoul/ip2region/SearchTest.java b/binding/java/src/main/java/org/lionsoul/ip2region/SearchTest.java
index 179cb9f..5c70266 100644
--- a/binding/java/src/main/java/org/lionsoul/ip2region/SearchTest.java
+++ b/binding/java/src/main/java/org/lionsoul/ip2region/SearchTest.java
@@ -89,7 +89,7 @@ public class SearchTest {
 
             try {
                 double sTime = System.nanoTime();
-                String region = searcher.searchByStr(line);
+                String region = searcher.search(line);
                 long cost = TimeUnit.NANOSECONDS.toMicros((long) (System.nanoTime() - sTime));
                 System.out.printf("{region: %s, ioCount: %d, took: %d μs}\n", region, searcher.getIOCount(), cost);
             } catch (Exception e) {
diff --git a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java
index 869b288..5aecbc8 100644
--- a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java
+++ b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java
@@ -71,7 +71,7 @@ public class Searcher {
         return ioCount;
     }
 
-    public String searchByStr(String ipStr) throws Exception {
+    public String search(String ipStr) throws Exception {
         long ip = checkIP(ipStr);
         return search(ip);
     }
@@ -135,7 +135,7 @@ public class Searcher {
         // load and return the region data
         final byte[] regionBuff = new byte[dataLen];
         read(dataPtr, regionBuff);
-        return new String(regionBuff);
+        return new String(regionBuff, "utf-8");
     }
 
     protected void read(int offset, byte[] buffer) throws IOException {