Merge remote-tracking branch 'origin/develop' into develop

@@ -11,7 +11,7 @@
 
 
 namespace Api;
 namespace Api;
 
 
-use Plugin\Cache;
+use WebPlugin\Cache;
 class Yohobuy
 class Yohobuy
 {
 {
     /* 正式环境 */
     /* 正式环境 */
@@ -22,21 +22,21 @@ class Yohobuy
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
 
     //java API
     //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 SERVICE_NOTIFY = 'http://service.yoho.cn/';
+    // const SERVICE_NOTIFY = 'http://service.yoho.cn/';
 
 
     // 测试环境 */
     // 测试环境 */
-//     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_OLD = 'http://test2.open.yohobuy.com/';
-// //   支付回调地址
-//    const SERVICE_NOTIFY = 'http://testservice.yoho.cn:28077/';
+    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_OLD = 'http://test2.open.yohobuy.com/';
+//   支付回调地址
+   const SERVICE_NOTIFY = 'http://testservice.yoho.cn:28077/';
 
 
     /* 预览环境 */
     /* 预览环境 */
 //     const API_URL = 'http://preapi.yoho.cn/';
 //     const API_URL = 'http://preapi.yoho.cn/';