update

Author: ilsanbao

city.go

@@ -32,8 +32,7 @@ type CityInfo struct {
 
 	Line string `json:"line"`
 
-	DistrictName string `json:"district_name"`
-	Radius string `json:"radius"`
+	DistrictInfo DistrictInfo `json:"district_info"`
 
 	Route string `json:"route"`
 	ASN string `json:"asn"`
@@ -117,6 +116,9 @@ func (db *City) FindInfo(addr, language string) (*CityInfo, error) {
 	var asnInfoList []ASNInfo
 	var asnInfoType = reflect.TypeOf(asnInfoList)
 
+	var districtInfo DistrictInfo
+	var districtInfoType = reflect.TypeOf(districtInfo)
+
 	info := &CityInfo{}
 
 	for k, v := range data {
@@ -139,6 +141,11 @@ func (db *City) FindInfo(addr, language string) (*CityInfo, error) {
 			if err == nil {
 				sfv.Set(reflect.ValueOf(asnInfoList))
 			}
+		} else if sft == districtInfoType {
+			err = json.Unmarshal([]byte(v), &districtInfo)
+			if err == nil {
+				sfv.Set(reflect.ValueOf(districtInfo))
+			}
 		}
 	}
 

city_test.go

@@ -47,8 +47,7 @@ func TestNewCity(t *testing.T) {
 	} else {
 		t.Log(info.Route)
 		t.Log(info.ASN)
-		t.Log(info.DistrictName)
-		t.Log(info.Radius)
+		t.Log(info.DistrictInfo)
 		t.Log(info.ASNInfo)
 
 		for _, af := range info.ASNInfo {

go.mod

@@ -1 +1,3 @@
 module github.com/ipipdotnet/ipdb-go
+
+go 1.14