code review by fei.hong : do modify alipay and weixin pay notice url

@@ -414,8 +414,8 @@ class AbstractAction extends Controller_Abstract
      * 设置网站SEO的描述内容
      * 
      * @param string $description  描述内容
-     * @param string $sign 连接的字符串
      * @param bool $showMore 是否显示更多内容
+     * @param string $sign 连接的字符串
      * @return void
      */
     protected function setDescription($description, $showMore = true, $sign = ' ')

@@ -23,11 +23,11 @@ class Yohobuy
 //     const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
-//       const API_URL = 'http://apih5.yoho.cn/';
-//       const API_URL2 = 'http://apih5.yoho.cn/';
-//       const SERVICE_URL = 'http://serviceh5.yoho.cn/';
-//       const YOHOBUY_URL = 'http://www.yohobuy.com/';
-//       const API_OLD = 'http://api2.open.yohobuy.com/';
+       const API_URL = 'http://apih5.yoho.cn/';
+       const API_URL2 = 'http://apih5.yoho.cn/';
+       const SERVICE_URL = 'http://serviceh5.yoho.cn/';
+       const YOHOBUY_URL = 'http://www.yohobuy.com/';
+       const API_OLD = 'http://api2.open.yohobuy.com/';
 
     /* 测试环境 */
 //      const API_URL = 'http://testapi.yoho.cn:28078/';
@@ -36,11 +36,11 @@ class Yohobuy
 //      const API_OLD = 'http://test2.open.yohobuy.com/';
 
     /* 预览环境 */
-     const API_URL = 'http://preapi.yoho.cn/';
-     const API_URL2 = 'http://preapi.yoho.cn/';
-     const SERVICE_URL = 'http://preservice.yoho.cn/';
-     const YOHOBUY_URL = 'http://www.yohobuy.com/';
-     const API_OLD = 'http://api2.open.yohobuy.com/';
+//     const API_URL = 'http://preapi.yoho.cn/';
+//     const API_URL2 = 'http://preapi.yoho.cn/';
+//     const SERVICE_URL = 'http://preservice.yoho.cn/';
+//     const YOHOBUY_URL = 'http://www.yohobuy.com/';
+//     const API_OLD = 'http://api2.open.yohobuy.com/';
 
     /* PC重构地址 */
 //     const API_URL = 'http://test.open.yohobuy.com/';

@@ -65,7 +65,7 @@ class IndexData
         $param['limit'] = $limit;
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::get(Yohobuy::SERVICE_URL . 'operations/api/v5/resource/home', $param);
+        return Yohobuy::get(Yohobuy::SERVICE_URL . 'operations/api/v5/resource/home', $param, false, false, 2);
     }
 
     /**

@@ -32,7 +32,7 @@ class AliwapConfig
      * Enter description here ...
      * @var String
      */
-    var $notify_url = 'http://preservice.yoho.cn/payment/alipaywap_notify';//"http://m.yohobuy.com/shopping/pay/aliwapnotice";
+    var $notify_url = 'http://service.yoho.cn/payment/alipaywap_notify';//"http://m.yohobuy.com/shopping/pay/aliwapnotice";
 
     /**
      * 浏览器的返回

@@ -34,7 +34,7 @@ class WxPayConfig
     const JS_API_CALL_URL = 'http://m.yohobuy.com/shopping/pay/wechatwap';
     //=======【异步通知url设置】===================================
     //异步通知url，商户根据实际开发过程设定
-    const NOTIFY_URL = 'http://preservice.yoho.cn/payment/wechatwap_notify';//'http://pay.yohobuy.com/notify/wechatwap';
+    const NOTIFY_URL = 'http://service.yoho.cn/payment/wechatwap_notify';//'http://pay.yohobuy.com/notify/wechatwap';
     //=======【证书路径设置】=====================================
     /**
      * TODO：设置商户证书路径

@@ -22,8 +22,6 @@ class BoysController extends AbstractAction
             $this->setExpires(300); // 缓存5分钟
         }
 
-        // 设置COOKIE标识用户访问过该页面了
-        // Index\HomeModel::setSwitchToCookie(Index\HomeModel::COOKIE_NAME_BOYS);
         // 设置网站标题
         $this->setTitle('男生首页');
         // 显示侧边栏

@@ -15,9 +15,8 @@ class GirlsController extends AbstractAction
     public function indexAction()
     {
         // 设置浏览器缓存5分钟
-        $this->setExpires(300); // 缓存5分钟
-        // 设置COOKIE标识用户访问过该页面了
-        // Index\HomeModel::setSwitchToCookie(Index\HomeModel::COOKIE_NAME_GIRLS);
+        $this->setExpires(300);
+
         // 设置网站标题
         $this->setTitle('女生首页');
         // 显示侧边栏

@@ -15,9 +15,8 @@ class KidsController extends AbstractAction
     public function indexAction()
     {
         // 设置浏览器缓存5分钟
-        $this->setExpires(300); // 缓存5分钟
-        // 设置COOKIE标识用户访问过该页面了
-        // Index\HomeModel::setSwitchToCookie(Index\HomeModel::COOKIE_NAME_KIDS);
+        $this->setExpires(300); 
+
         // 设置网站标题
         $this->setTitle('潮童首页');
         // 显示侧边栏

@@ -15,9 +15,8 @@ class LifestyleController extends AbstractAction
     public function indexAction()
     {
         // 设置浏览器缓存5分钟
-        $this->setExpires(300); // 缓存5分钟
-        // 设置COOKIE标识用户访问过该页面了
-        // Index\HomeModel::setSwitchToCookie(Index\HomeModel::COOKIE_NAME_LIFESTYLE);
+        $this->setExpires(300);
+
         // 设置网站标题
         $this->setTitle('创意生活首页');
         // 显示侧边栏

@@ -39,7 +39,7 @@ class ClassModel
 
         do {
             $data = ClassData::getClassesData();
-            if (empty($data['data']) || $data['code'] != 200) {
+            if (empty($data['data'])) {
                 break;
             }
 

@@ -221,7 +221,7 @@ class InfoController extends AbstractAction
         $data['guang']['id'] = $id;
 
         // 获取详情内容信息, 异常则跳到错误页面
-        $detail = DetailData::packageFoEzine($id, true);
+        $detail = DetailData::package($id, true);
         if (empty($detail['getArticle'])) {
             $this->_view->display('index', $data);
             return;