Merge branch 'develop' into test

@@ -602,7 +602,7 @@ class Helpers
      */
     public static function syncUserSession($uid, $refer = '', $callback = 'call')
     {
-        return 'http://m1.yohobuy.com/Passport/session/index?callback=' . $callback
+        return 'http://mapi.yohobuy.com/Passport/session/index?callback=' . $callback
                 . '&sign=' . md5($uid . 'Js8Yn0!EwPM45-ws') . '&uid=' . $uid . '&go=' . $refer;
     }
 
@@ -618,7 +618,7 @@ class Helpers
      */
     public static function logoutSession($token, $callback = 'call')
     {
-        return 'http://m1.yohobuy.com/Passport/session/logout?callback=' . $callback
+        return 'http://mapi.yohobuy.com/Passport/session/logout?callback=' . $callback
                 . '&sign=' . md5('Js8Yn0!EwPM45-ws') . '&token=' . $token;
     }
 

+
+server
+{
+    listen       80;
+    server_name  m.yohobuy.com *.m.yohobuy.com;
+
+    #access_log /Data/logs/access.buy.test.yoho.cn.log  combined;
+    error_log  /Data/logs/nginx/error.m.yohobuy.com.log warn;
+
+    root  /Data/code/git/yohobuy/yohobuy/m.yohobuy.com/public;
+
+    location ~* \.(ico|woff)$ {
+        expires    7d;
+    }
+
+    location = /crossdomain.xml {
+        expires    7d;
+    }
+
+    location = /appembed {
+        default_type application/json;
+        return 200 '{"code":200,"message":"appembed","data":{"open":"N","url":"http://m.yohobuy.com"}}';
+    }
+
+    location = /reg.html {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /signin.html {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /login.html {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /emailback.html {
+        root  /Data/code/git/yohobuy/yohobuy/assets;
+        expires 7d;
+    }
+    location = /phoneback.html {
+        root  /Data/code/git/yohobuy/yohobuy/assets;
+        expires 7d;
+    }
+    location = /error.html {
+        root  /Data/code/git/yohobuy/yohobuy/assets;
+        expires 7d;
+    }
+    location ^~ /passport {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location = / {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location = /boys {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /girls {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /kids {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /lifestyle {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /girl {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+   
+    location = /boys/bottomBanner {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /girls/bottomBanner {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+ 
+    location = /cate {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /brands {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /sale {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /brands/search {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /product/new {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /hotrank {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location ^~ /product/newsale/ {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /product/opt/ {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /product/recom/ {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /product/pro_ {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /product/intro_ {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /product/detail/ {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location ^~ /guang/ {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /tags/index {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /author/index {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~  /info/index {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~  /plustar {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location ^~ /search {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location ^~ /index/search {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location ^~ /home {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location ^~ /home/message {
+        proxy_redirect off;
+        proxy_pass http://61.155.222.163;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location = /home/orders/detail {
+        proxy_redirect off;
+        proxy_pass http://61.155.222.163;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /home/orders/cancel {
+        proxy_redirect off;
+        proxy_pass http://61.155.222.163;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+    location / {
+        proxy_redirect off;
+        proxy_pass http://61.155.222.163;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+
+}
+
+server
+{
+     listen       80;
+     server_name  cdn.yoho.cn;
+      
+     #access_log /Data/logs/nginx/access.static.m.yohobuy.com.log  combined;
+     #error_log  /Data/logs/nginx/error.static.m.yohobuy.com.log warn;
+      
+     root  /Data/code/git/yohobuy/static/dist;
+
+     location / {
+         log_not_found off;
+         access_log off;
+         expires 30d;
+     }
+
+     location ~* \.(svg|eot|ttf|woff|otf)$ {
+         add_header Access-Control-Allow-Origin *;
+         expires 30d;
+     }
+
+}
+

@@ -137,7 +137,7 @@ class HomeController extends AbstractAction
         if ($this->isAjax()) {
             $uid = $this->getUid(true);
             $page = $this->post('page', 1);
-	        $gender = Helpers::getGenderByCookie();
+            $gender = Helpers::getGenderByCookie();
             $result = UserModel::getFavBrandData($uid, $gender, $page, 10);
         }
 
@@ -636,13 +636,14 @@ class HomeController extends AbstractAction
      * 我的订单页面,获得nav导航条焦点。并且异步请求订单详情列表页（getOrders）
      *
      */
+
     public function ordersAction()
     {
         // 审判跳转登录页
         $this->auditJumpLogin();
 
         $backUrl = Helpers::url('/home');
-        
+
         $this->setTitle('我的订单');
         $this->setNavHeader('我的订单', $backUrl);
 
@@ -773,6 +774,7 @@ class HomeController extends AbstractAction
     /*
      * 我的订单-付款跳转页
      */
+
     public function payAction()
     {
         // 审判跳转登录页
@@ -780,12 +782,12 @@ class HomeController extends AbstractAction
 
         $this->setTitle('支付中心');
         $this->setNavHeader('支付中心');
-        
+
         $orderCode = $this->get('order_code');
         if (empty($orderCode)) {
             $this->error();
         }
-        
+
         $this->_view->display('pay', array(
             'payAppInfo' => array(
                 0 => array(

@@ -131,6 +131,7 @@ class LoginController extends AbstractAction
             /* 调用登录接口进行登录 */
             $data = LoginData::signin($area, $profile, $password);
             if ($data['code'] != 200 || !isset($data['data']['uid'])) {
+                $this->setSession('_TOKEN', Helpers::makeToken($data['data']['uid']));
                 break;
             }