From 089e6cb9c677beffdb114240a73cf9f69607f7bb Mon Sep 17 00:00:00 2001
From: dustoair <107600816+dustoair@users.noreply.github.com>
Date: Fri, 22 Jul 2022 17:26:02 +0800
Subject: [PATCH] modify pkg arch

---
 getIPInfo.go => ip2region/getIPInfo.go | 7 +++----
 ip_test.go                             | 2 +-
 main.go                                | 4 +++-
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename getIPInfo.go => ip2region/getIPInfo.go (82%)

diff --git a/getIPInfo.go b/ip2region/getIPInfo.go
similarity index 82%
rename from getIPInfo.go
rename to ip2region/getIPInfo.go
index 69c5de8..456e352 100644
--- a/getIPInfo.go
+++ b/ip2region/getIPInfo.go
@@ -1,15 +1,14 @@
-package main
+package ip2region
 
 import (
-	"IPRegion/ip2region"
 	"IPRegion/util"
 	"fmt"
 	//"github.com/lionsoul2014/ip2region/binding/golang/ip2region"
 )
 
-func GetIPInfo(address, searchType string) (ipInfo ip2region.IpInfo, err error) {
+func GetIPInfo(address, searchType string) (ipInfo IpInfo, err error) {
 	//https://gitee.com/lionsoul/ip2region/raw/master/data/ip2region.db
-	region, err := ip2region.New("ip2region.db")
+	region, err := New("ip2region.db")
 	defer region.Close()
 	if err != nil {
 		fmt.Println(err)
diff --git a/ip_test.go b/ip_test.go
index 029c089..bdcdb56 100644
--- a/ip_test.go
+++ b/ip_test.go
@@ -11,7 +11,7 @@ import (
 func TestIpInfo(tt *testing.T) {
 	address := "114.114.114.114"
 	var ipInfo ip2region.IpInfo
-	ipInfo, _ = GetIPInfo(address, global.SearchType)
+	ipInfo, _ = ip2region.GetIPInfo(address, global.SearchType)
 	res, _ := json.Marshal(ipInfo)
 	fmt.Println(string(res))
 
diff --git a/main.go b/main.go
index 20c9ebe..71783c2 100644
--- a/main.go
+++ b/main.go
@@ -5,6 +5,7 @@ import (
 	"IPRegion/ip2region"
 	"encoding/json"
 	"fmt"
+	"log"
 	"net/http"
 )
 
@@ -14,10 +15,11 @@ func main() {
 }
 
 func IPHandle(w http.ResponseWriter, req *http.Request) {
+	log.Println("server start!")
 	address := req.FormValue("address")
 	var ipInfo ip2region.IpInfo
 	if address != "" {
-		ipInfo, _ = GetIPInfo(address, global.SearchType)
+		ipInfo, _ = ip2region.GetIPInfo(address, global.SearchType)
 	}
 	res, _ := json.Marshal(ipInfo)
 	fmt.Fprintln(w, string(res))