Merge remote-tracking branch 'origin/beta/wap' into beta/wap

@@ -41,7 +41,7 @@ class HfController extends AbstractAction
      *   patchv         当前补丁的版本号，没有就传空            string	"100"
      *   filecode       md5(md5(文件内容) + "yohopatch2016")    string	"1233321121212332"
      * ]
-     * echo md5(file_get_contents('http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.0/main.js')); 
+     * echo md5(file_get_contents('http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.0/main2.js')); 
      */
     public function v1Action()
     {
@@ -51,9 +51,9 @@ class HfController extends AbstractAction
         $version = $this->post('app_version');
         switch ($version) {
             case '4.0.0': // 版本号
-                $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.0/main.js';
+                $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.0/main2.js';
                 $result['data']['patchv'] = '102';
-                $result['data']['filecode'] = md5('53b86b14490ead50ff78cac30a2494f3' . 'yohopatch2016');
+                $result['data']['filecode'] = md5('dddd71eed2754a53ad843a78587dc1f5' . 'yohopatch2016');
                 $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
                 break;
             default: // 默认

@@ -261,7 +261,7 @@ class IndexController extends AbstractAction
         $result = array();
 
         if ($this->isAjax()) {
-            $shoppingKey = $this->getSession('shoppingKey');
+            $shoppingKey = Helpers::getShoppingKeyByCookie();
             $uid = $this->getUid(true);
 
             $params = array();