'uid获取方式更改'

@@ -52,51 +52,35 @@ class OptController extends AbstractAction
      */
      */
     public function collectArticleAction()
     public function collectArticleAction()
     {
     {
-        $result = array('code' => 200, 'message' => '成功!', 'data' => '');
-        $jumpUrl = '';
-        $isNoLogin = false;
+        $result = array('code' => 400, 'message' => '您未登录，无法收藏或者取消收藏。请先登录!', 'data' => '');
 
 
         do {
         do {
             /* 判断是不是AJAX请求 */
             /* 判断是不是AJAX请求 */
             if (!$this->isAjax()) {
             if (!$this->isAjax()) {
-                $result = array('code' => 400, 'message' => '不是Ajax请求!', 'data' => '');
                 break;
                 break;
             }
             }
 
 
             /* 判断参数是否有效 */
             /* 判断参数是否有效 */
             $id = $this->post('id');
             $id = $this->post('id');
             if (!is_numeric($id)) {
             if (!is_numeric($id)) {
-                $result = array('code' => 400, 'message' => '没有ID!', 'data' => '');
                 break;
                 break;
             }
             }
 
 
             /* 判断用户是否登录 */
             /* 判断用户是否登录 */
             $uid = $this->get('uid');
             $uid = $this->get('uid');
-            $isNoLogin = empty($uid) || !is_numeric($uid);
-
-            /* 如果有 yh_channel 是 app */
-            if ($yhChannel = $this->post('yh_channel')) {
-
-                /* 如果没有登录，拼接 App 登录规则 */
-                if ($isNoLogin) {
-                    $playUrl = Helpers::url('/author/index', '', 'guang');
-                    $playUrlEncode = strtr($playUrl, array('/' => '\\/'));
-                    $jumpUrl = $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app","id":"' . $id . '",""yh_channel":"' . $yhChannel . '",""uid":"' . $uid . '"}},"requesturl":{"url":"","param":{}},"priority":"N"}}&uid=' . $uid;
-                    $result = array('code' => 200, 'message' => '未登录', 'data' => array('jumpUrl' => $jumpUrl, 'jump' => true));
-                    break;
-                } else {
-
-                    /* 执行点赞或取消操作 */
-                    $opt = $this->post('opt', 'ok');
-                    $data = OptData::collectArticle($uid, $id, $opt);
-                    if (!$data) {
-                        $result = array('code' => 400, 'message' => '操作失败', 'data' => '');
-                        break;
-                    }
-                }
-            } else { /* 非 app 不需要点赞*/
-                $result = array('code' => 400, 'message' => '不是App!', 'data' => '');
+            if (empty($uid) || !is_numeric($uid)) {
+                break;
+            }
+
+            /* 执行点赞或取消操作 */
+            $opt = $this->post('opt', 'ok');
+            $data = OptData::collectArticle($uid, $id, $opt);
+            if (!$data) {
+                $result = array('code' => 400, 'message' => '操作失败', 'data' => '');
+                break;
             }
             }
+
+            $result = array('code' => 200, 'message' => '成功', 'data' => '');
         } while (false);
         } while (false);
 
 
         $this->echoJson($result);
         $this->echoJson($result);