|
@@ -147,23 +147,25 @@ func getUserAddress(Db *xorm.Engine, uid string, geoIp2db *geoip2.DBReader) (pro |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
utils.FilePutContents("getUserAddress", utils.SerializeStr(userLoginIpList)) |
|
|
|
|
|
record, _ := geoIp2db.City(net.ParseIP(userLoginIpList.NowIp)) |
|
|
|
|
|
if record.Country.Names != nil && record.Subdivisions != nil && record.City.Names != nil { |
|
|
|
|
|
province, err := db.ProvinceGetOneByName(record.Subdivisions[0].Names["zh-CN"]) |
|
|
|
|
|
if err != nil { |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
provinceId = province.Id |
|
|
|
|
|
provinceName = province.Name |
|
|
|
|
|
|
|
|
if userLoginIpList != nil { |
|
|
|
|
|
utils.FilePutContents("getUserAddress", utils.SerializeStr(userLoginIpList)) |
|
|
|
|
|
record, _ := geoIp2db.City(net.ParseIP(userLoginIpList.NowIp)) |
|
|
|
|
|
if record.Country.Names != nil && record.Subdivisions != nil && record.City.Names != nil { |
|
|
|
|
|
province, err := db.ProvinceGetOneByName(record.Subdivisions[0].Names["zh-CN"]) |
|
|
|
|
|
if err != nil { |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
provinceId = province.Id |
|
|
|
|
|
provinceName = province.Name |
|
|
|
|
|
|
|
|
city, err := db.CityGetOneByName(record.City.Names["zh-CN"]) |
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
|
city, err := db.CityGetOneByName(record.City.Names["zh-CN"]) |
|
|
|
|
|
if err != nil { |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
cityId = city.Id |
|
|
|
|
|
cityName = city.Name |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
cityId = city.Id |
|
|
|
|
|
cityName = city.Name |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
} |
|
|
//TODO::没开区域代理的,默认归属到广东 |
|
|
//TODO::没开区域代理的,默认归属到广东 |
|
|
provinceName = "广东省" |
|
|
provinceName = "广东省" |
|
|