fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by 梁志锋
Commit d9029f289e030c0de5d2b2f5ecb2ad21e9976b1a 2 parents 6bd687b8 0ba1d364

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

Inline Side-by-side
Showing 4 changed files with 4 additions and 4 deletions
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -41,7 +41,7 @@ class HfController extends AbstractAction @@ -41,7 +41,7 @@ class HfController extends AbstractAction
41 * patchv 当前补丁的版本号，没有就传空 string "100" 41 * patchv 当前补丁的版本号，没有就传空 string "100"
42 * filecode md5(md5(文件内容) + "yohopatch2016") string "1233321121212332" 42 * filecode md5(md5(文件内容) + "yohopatch2016") string "1233321121212332"
43 * ] 43 * ]
44 - * echo md5(file_get_contents('http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.0/main.js')); 44 + * echo md5(file_get_contents('http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.0/main2.js'));
45 */ 45 */
46 public function v1Action() 46 public function v1Action()
47 { 47 {
@@ -51,9 +51,9 @@ class HfController extends AbstractAction @@ -51,9 +51,9 @@ class HfController extends AbstractAction
51 $version = $this->post('app_version'); 51 $version = $this->post('app_version');
52 switch ($version) { 52 switch ($version) {
53 case '4.0.0': // 版本号 53 case '4.0.0': // 版本号
54 - $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.0/main.js'; 54 + $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.0/main2.js';
55 $result['data']['patchv'] = '102'; 55 $result['data']['patchv'] = '102';
56 - $result['data']['filecode'] = md5('53b86b14490ead50ff78cac30a2494f3' . 'yohopatch2016'); 56 + $result['data']['filecode'] = md5('dddd71eed2754a53ad843a78587dc1f5' . 'yohopatch2016');
57 $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data'])); 57 $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
58 break; 58 break;
59 default: // 默认 59 default: // 默认
@@ -261,7 +261,7 @@ class IndexController extends AbstractAction @@ -261,7 +261,7 @@ class IndexController extends AbstractAction
261 $result = array(); 261 $result = array();
262 262
263 if ($this->isAjax()) { 263 if ($this->isAjax()) {
264 - $shoppingKey = $this->getSession('shoppingKey'); 264 + $shoppingKey = Helpers::getShoppingKeyByCookie();
265 $uid = $this->getUid(true); 265 $uid = $this->getUid(true);
266 266
267 $params = array(); 267 $params = array();