chuweiqiang 11 months ago
parent
commit
e6d3ff0c31
2 changed files with 20 additions and 21 deletions
  1. 1 2
      .idea/workspace.xml
  2. 19 19
      application/api/controller/Article.php

+ 1 - 2
.idea/workspace.xml

@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Activity.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -596,7 +595,7 @@
       <workItem from="1713916802858" duration="19129000" />
       <workItem from="1714004926744" duration="26309000" />
       <workItem from="1714091498498" duration="11116000" />
-      <workItem from="1714109915098" duration="57000" />
+      <workItem from="1714109915098" duration="638000" />
     </task>
     <servers />
   </component>

+ 19 - 19
application/api/controller/Article.php

@@ -413,25 +413,25 @@ class Article extends Base
         $level_id = UserLevelRank::getUserVip($this->user_id);
         $detail['user_level']  = $level_id;
 
-        foreach ($detail['item_list'] as &$dv) {
-            if(in_array($this->source_type,[1])) unset($dv['pdf_clear']);
-            if(in_array($this->source_type,[1])) $dv['content'] = openssl_encrypt($dv['content'],'DES-ECB',123456,0);
-            $dv['switch_open'] =  PlatformSwitch::checkSwitch($this->user_id,$dv['id'],8);
-            $dv['comment_num']  = ArticleComment::getArticleCommentNum($dv['id']);
-            $dv['collect_num']  = UserCollect::where(['coll_type'=>3,'coll_id'=>$detail['id'],'children_id'=>$dv['id']])->count();
-            $dv['collect_num']  = numTransform($dv['collect_num']);
-            $dv['transmit_num']  = numTransform($dv['transmit_num']);
-            $dv['is_collect']  = UserCollect::checkCollectByType($this->user_id,3,$detail['id'],$dv['id']);
-            $dv['read_num']  = numTransform($dv['read_num']);
-            $dv['is_recently'] = $dv['id'] == $recently_id ? 1 : 0;
-            $dv['is_like'] = ArticleLike::where(['user_id'=>$this->user_id,'article_id'=>$dv['article_id'],'item_id'=>$dv['id']])->count();
-            $dv['like_num'] = ArticleLike::where(['article_id'=>$dv['article_id'],'item_id'=>$dv['id']])->count();
-            $article_auth = ArticleItem::getArticleAuth($dv['user_id'],APPNAME,APPLOGO);
-            $dv['app_name'] = $article_auth['app_name'];
-            $dv['app_logo'] = $article_auth['app_logo'];
-            $dv['video_jump'] = VideoUrl::checkVip($dv['video_item'],$this->user_id);
-            $dv['datum_jump'] = DatumUrl::checkVip($dv['datum_item'],$this->user_id);
-        }
+//        foreach ($detail['item_list'] as &$dv) {
+//            if(in_array($this->source_type,[1])) unset($dv['pdf_clear']);
+//            if(in_array($this->source_type,[1])) $dv['content'] = openssl_encrypt($dv['content'],'DES-ECB',123456,0);
+//            $dv['switch_open'] =  PlatformSwitch::checkSwitch($this->user_id,$dv['id'],8);
+//            $dv['comment_num']  = ArticleComment::getArticleCommentNum($dv['id']);
+//            $dv['collect_num']  = UserCollect::where(['coll_type'=>3,'coll_id'=>$detail['id'],'children_id'=>$dv['id']])->count();
+//            $dv['collect_num']  = numTransform($dv['collect_num']);
+//            $dv['transmit_num']  = numTransform($dv['transmit_num']);
+//            $dv['is_collect']  = UserCollect::checkCollectByType($this->user_id,3,$detail['id'],$dv['id']);
+//            $dv['read_num']  = numTransform($dv['read_num']);
+//            $dv['is_recently'] = $dv['id'] == $recently_id ? 1 : 0;
+//            $dv['is_like'] = ArticleLike::where(['user_id'=>$this->user_id,'article_id'=>$dv['article_id'],'item_id'=>$dv['id']])->count();
+//            $dv['like_num'] = ArticleLike::where(['article_id'=>$dv['article_id'],'item_id'=>$dv['id']])->count();
+//            $article_auth = ArticleItem::getArticleAuth($dv['user_id'],APPNAME,APPLOGO);
+//            $dv['app_name'] = $article_auth['app_name'];
+//            $dv['app_logo'] = $article_auth['app_logo'];
+//            $dv['video_jump'] = VideoUrl::checkVip($dv['video_item'],$this->user_id);
+//            $dv['datum_jump'] = DatumUrl::checkVip($dv['datum_item'],$this->user_id);
+//        }
         if($this->user_id){
             $General = new General();
             $General->label($detail['label']);