diff --git a/Application/Sdk/Common/function.php b/Application/Sdk/Common/function.php index 65c183b8..176bb4ef 100644 --- a/Application/Sdk/Common/function.php +++ b/Application/Sdk/Common/function.php @@ -320,7 +320,7 @@ function ip_is_country($ip, $country_id=['US'], $country=['美国']) $res = file_get_contents($url); if (!$res) { // 走淘宝 $res = file_get_contents($url2); - Log::write("taobal:".serialize($res)); + Log::write("taobao:".serialize($res)); if (!empty($res)) { $ipData = json_decode($res,true); if ($ipData['code']==0 && in_array($ipData['data']['country_id'],$country_id)) { @@ -333,9 +333,10 @@ function ip_is_country($ip, $country_id=['US'], $country=['美国']) } } else { - $ipData = json_decode($res,true); - Log::write("taobal:".serialize($res)); - if ($ipData['status']==0 && substr($ipData['location'], 0, strlen($country[0])-1) == $country[0]) { + $res= iconv('GB2312', 'UTF-8', $res); + $ipData = json_decode($res, true); + Log::write("sina:".serialize($res)); + if ($ipData['status']==0 && substr($ipData['data'][0]['location'], 0, strlen($country[0])) == $country[0]) { return true; } }