Merge branch 'feature/unionpromotion' of git.yoho.cn:fe/YOHOBUYWAP into feature/unionpromotion

@@ -653,7 +653,7 @@ class IndexController extends AbstractAction
                     $testQyhUnion = json_decode($encryObject, true);
                     $testQyhUnion = json_decode($encryObject, true);
 
 
                     if (isset($testQyhUnion['client_id'])) {
                     if (isset($testQyhUnion['client_id'])) {
-                        $unionKey = $testQyhUnion;
+                        $unionKey = $encryObject;
                     } else {
                     } else {
                         $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy');
                         $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy');
                     }
                     }

@@ -13,8 +13,8 @@ defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'testing');
 
 
 define('USE_INTER_FACE_SHUNT', true);//分流开关
 define('USE_INTER_FACE_SHUNT', true);//分流开关
 
 
-define('API_URL', 'http://api-test1.yohops.com:9999/');
-define('SERVICE_URL', 'http://service-test1.yohops.com:9999/');
+define('API_URL', 'http://api-test2.yohops.com:9999/');
+define('SERVICE_URL', 'http://service-test2.yohops.com:9999/');
 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
 define('SERVICE_NOTIFY', 'http://service-test1.yohops.com:9999/');
 define('SERVICE_NOTIFY', 'http://service-test1.yohops.com:9999/');