API

@@ -23,16 +23,16 @@ class Yohobuy
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
     //java API
-    //  const API_URL = 'http://api.yoho.yohoops.org/';
-    //  const API_URL2 = 'http://api.yoho.yohoops.org/';
-    //  const SERVICE_URL = 'http://service.yoho.yohoops.org/';
-    //  const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    //  const API_OLD = 'http://api2.open.yohobuy.com/';
+     const API_URL = 'http://api.yoho.yohoops.org/';
+     const API_URL2 = 'http://api.yoho.yohoops.org/';
+     const SERVICE_URL = 'http://service.yoho.yohoops.org/';
+     const YOHOBUY_URL = 'http://www.yohobuy.com/';
+     const API_OLD = 'http://api2.open.yohobuy.com/';
 
     // 测试环境 */
-    const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
-    const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
-    const YOHOBUY_URL = 'http://www.yohobuy.com/';
+    // const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
+    // const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
+    // const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
     /* 预览环境 */
 //     const API_URL = 'http://preapi.yoho.cn/';
@@ -181,11 +181,7 @@ class Yohobuy
         curl_setopt($ch, CURLOPT_HEADER, 0);
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-<<<<<<< HEAD
         if ($useGzip) {
-=======
-        if ($useGzip) {
->>>>>>> master
             curl_setopt($ch, CURLOPT_ENCODING, 'gzip');
         }
         if (!empty($userAgent)) {
@@ -502,11 +498,7 @@ class Yohobuy
         }
         return $_SERVER['HTTP_USER_AGENT'];
     }
-<<<<<<< HEAD
-
-=======
 
->>>>>>> master
     /**
      * 判断是否手机
      * @return bool