wesmiler 报恩寺项目提交

app/Services/ArticleService.php

@@ -181,7 +181,7 @@ class ArticleService extends BaseService
                 $item['thumb'] = $item['thumb'] ? get_image_url($item['thumb']) : '';
                 $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
                 $item['publish_at'] = $item['publish_at'] ? $item['publish_at'] : $item['create_at'];
-                $item['content'] = $item['content']? htmlspecialchars_decode($item['content']) : '';
+
             }
             unset($item);
         }
@@ -207,7 +207,6 @@ class ArticleService extends BaseService
             ->first();
         $info = $info? $info->toArray() : [];
         if($info){
-            $info['content'] = $info['content']? htmlspecialchars_decode($info['content']) : '';
             $info['thumb'] = $info['thumb']? get_image_url($info['thumb']) : '';
             $info['publish_at'] = $info['publish_at']? $info['publish_at'] : datetime( $info['create_time'],'Y-m-d H:i:s');
 

app/Services/DynamicService.php

@@ -128,12 +128,14 @@ class DynamicService extends BaseService
                 $item['avatar'] = $item['avatar'] ? get_image_url($item['avatar']) : '';
                 $item['albums'] = $item['albums'] ? json_decode($item['albums'], true) : [];
                 $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
+                $item['content'] = $item['content']? htmlspecialchars_decode($item['content']) : '';
                 if($item['albums']){
                     foreach ($item['albums'] as &$v){
                         $v = $v? get_image_url($v) : '';
                     }
                     unset($v);
                 }
+
                 // 关注数量
                 $item['collect'] = 0;
                 if($item['id']){
@@ -177,6 +179,7 @@ class DynamicService extends BaseService
             $info['thumb'] = $info['thumb']? get_image_url($info['thumb']) : '';
             $info['avatar'] = $info['avatar']? get_image_url($info['avatar']) : '';
             $info['create_time'] = $info['create_time']? datetime( $info['create_time'],'Y-m-d H:i:s') : '';
+            $info['content'] = $info['content']? htmlspecialchars_decode($info['content']) : '';
             $info['albums'] = $info['albums']? json_decode($info['albums']) : [];
             if($info['albums']){
                 foreach ($info['albums'] as &$v){
@@ -185,6 +188,7 @@ class DynamicService extends BaseService
                 unset($v);
             }
 
+
             $info['is_follow'] = 0;
             $info[''] = 0;
             if($info['user_id']){
@@ -260,7 +264,7 @@ class DynamicService extends BaseService
             'user_id'=> $userId,
             'source_id'=> $sourceId,
             'comment_close'=> isset($params['comment_close']) && $params['comment_close']? 1 : 2,
-            'content'=> $content,
+            'content'=> htmlspecialchars($content),
             'albums'=> $albums? json_encode($albums, 256) : '',
             'create_time'=> time(),
             'update_time'=> time(),