Authored by 周少峰

Merge branch 'master' of git.yoho.cn:fe/YOHOBUYPC

... ... @@ -155,10 +155,10 @@ class Yohobuy
$urlBack = $url;
if (USE_INTER_FACE_SHUNT) {
if (strpos($url, 'api')) {
if (strpos($url, API_URL)) {
$isApi = true;
$url = self::_getUrl($url, $data);
} else if (strpos($url, 'service')) {
} else if (strpos($url, SERVICE_URL)) {
$isService = true;
$url = self::_getUrl($url, $data);
}
... ... @@ -319,10 +319,10 @@ class Yohobuy
$urlBack = $url;
if (USE_INTER_FACE_SHUNT) {
if (strpos($url, 'api')) {
if (strpos($url, API_URL)) {
$isApi = true;
$url = self::_getUrl($url, $data);
} else if (strpos($url, 'service')) {
} else if (strpos($url, SERVICE_URL)) {
$isService = true;
$url = self::_getUrl($url, $data);
}
... ... @@ -761,7 +761,7 @@ class Yohobuy
}
$paseUrl = parse_url($url);
if (strpos($url, 'api')) {
if (strpos($url, API_URL)) {
if (empty($ips['api.yoho.cn'])) {
return false;
... ... @@ -775,7 +775,7 @@ class Yohobuy
$url = 'http://' . $ips['api.yoho.cn'][$num]['ip'] . rtrim($paseUrl['path'], '/') . '/';
} else if (strpos($url, 'service')) {
} else if (strpos($url, SERVICE_URL)) {
if (empty($ips['service.yoho.cn'])) {
return false;
... ...