do fixes bug to refs YW-1331 logged redirect to home page

@@ -16,26 +16,29 @@ use Plugin\Cache;
 
 
 class Yohobuy
 class Yohobuy
 {
 {
-
     /* 正式环境 */
     /* 正式环境 */
+
     // const API_URL = 'http://api2.open.yohobuy.com/';
     // const API_URL = 'http://api2.open.yohobuy.com/';
     // const API_URL2 = 'http://api.open.yohobuy.com/';
     // const API_URL2 = 'http://api.open.yohobuy.com/';
     // const SERVICE_URL = 'http://service.api.yohobuy.com/';
     // const SERVICE_URL = 'http://service.api.yohobuy.com/';
     // const YOHOBUY_URL = 'http://www.yohobuy.com/';
     // const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
 
     /* 测试环境 */
     /* 测试环境 */
-    const API_URL = 'http://test2.open.yohobuy.com/';
-    const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
+    const API_URL = 'http://devapi.yoho.cn:58078/';
+    const SERVICE_URL = 'http://devservice.yoho.cn:58077/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    const API_URL_MYCENTER = 'http://192.168.102.205:8081/api-gateway-web/'; // 我的个人中心接口URL
+    const YOHOBUY_ORDER = 'http://192.168.102.205:8084/order/';        //我的订单
+    const API_URL_MYCENTER = 'http://192.168.102.205:8081/users/'; // 我的个人中心接口URL
     const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
     const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
-    const API_URL_PRODUCTDETAIL = 'http://192.168.102.209:18080/yoho-product/'; // 商品详情页
+    const API_URL_PRODUCTDETAIL = 'http://192.168.102.205:8083/product/'; // 商品详情页
+    const API_URL_LOGISTICS = 'http://192.168.102.205:8080/gateway'; //查看物流接口URL
 
 
     /**
     /**
      * 私钥列表
      * 私钥列表
      * 
      * 
      * @var array 
      * @var array 
      */
      */
+
     private static $privateKeyList = array(
     private static $privateKeyList = array(
         'android' => 'fd4ad5fcfa0de589ef238c0e7331b585',
         'android' => 'fd4ad5fcfa0de589ef238c0e7331b585',
         'iphone' => 'a85bb0674e08986c6b115d5e3a4884fa',
         'iphone' => 'a85bb0674e08986c6b115d5e3a4884fa',
@@ -62,6 +65,25 @@ class Yohobuy
     }
     }
 
 
     /**
     /**
+     * 取得当前的IP地址
+     *
+     * @param bool $int 返回int类型的ip地址，默认是
+     * @return mixed 当前的IP地址
+     */
+    public static function ip($int = true)
+    {
+        if (isset($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP']) {
+            $onlineip = $_SERVER['HTTP_CLIENT_IP'];
+        } elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR']) {
+            $onlineip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+        } else {
+            $onlineip = $_SERVER['REMOTE_ADDR'];
+        }
+
+        return $int ? ip2long($onlineip) : $onlineip;
+    }
+
+    /**
      * 取得公共的参数
      * 取得公共的参数
      * 
      * 
      * @return array
      * @return array
@@ -103,7 +125,7 @@ class Yohobuy
 
 
     /**
     /**
      * get方式调用接口
      * get方式调用接口
-     * 
+     *
      * @param string $url 接口URL
      * @param string $url 接口URL
      * @param array $data 参数列表
      * @param array $data 参数列表
      * @parma mixed $cache 控制是否启用接口数据的缓存(时间单位为秒). 如3600表示缓存1小时, false表示不缓存
      * @parma mixed $cache 控制是否启用接口数据的缓存(时间单位为秒). 如3600表示缓存1小时, false表示不缓存
@@ -393,7 +415,7 @@ class Yohobuy
      * @param array $cookie
      * @param array $cookie
      * @return mixed
      * @return mixed
      */
      */
-    public static function jsonPost($url, $data = array(), $returnJson = false, $timeout = 3, $cookie = array())
+    public static function jsonPost($url, $data = array(), $returnJson = false, $timeout = 30, $cookie = array())
     {
     {
         $ch = curl_init($url);
         $ch = curl_init($url);
 
 

@@ -34,7 +34,7 @@ class HomeController extends AbstractAction
         
         
         $action = $this->getRequest()->getActionName();
         $action = $this->getRequest()->getActionName();
         if (!$uid && $action !== 'index') {
         if (!$uid && $action !== 'index') {
-            $this->go(Helpers::url('/signin.html'));
+            $this->go(Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', '/')) ) );
         }
         }
 
 
         parent::init();
         parent::init();