Merge branch 'develop'

app/Repositories/BeanRepository.php

@@ -56,7 +56,7 @@ class BeanRepository
                 foreach ($excellent_residents as $k=>$v){
                     if(!isset($author_data[$v['content_author_id']])) continue;
                     $excellent_residents[$k]['follow_status'] = $author_data[$v['content_author_id']]['follow_status'];
-                    $excellent_residents[$k]['username'] = subtext($author_data[$v['content_author_id']]['username'], 5);
+                    $excellent_residents[$k]['username'] = $author_data[$v['content_author_id']]['username'];
                     $excellent_residents[$k]['avatar'] = $author_data[$v['content_author_id']]['avatar'];
                 }
             }
@@ -84,9 +84,7 @@ class BeanRepository
                     foreach ($new_arr as $k => $v) {
                         if (!isset($user_data[$v['uid']])) continue;
                         $new_arr[$k]['follow_status'] = $user_data[$v['uid']]['follow_status'];
-                        $username = subtext($user_data[$v['uid']]['username'], 10);
-
-                        $new_arr[$k]['username'] = $username;
+                        $new_arr[$k]['username'] = $user_data[$v['uid']]['username'];
                         $new_arr[$k]['avatar'] = $user_data[$v['uid']]['avatar'];
                     }
                 }
@@ -109,9 +107,7 @@ class BeanRepository
                         if(!isset($user_data[$v['superior_uid']])) continue;
                         $registered_most[$k]['count'] = intval($v['count']);
                         $registered_most[$k]['follow_status'] = $user_data[$v['superior_uid']]['follow_status'];
-                        $username = subtext($user_data[$v['superior_uid']]['username'], 10);
-
-                        $registered_most[$k]['username'] = $username;
+                        $registered_most[$k]['username'] = $user_data[$v['superior_uid']]['username'];
                         $registered_most[$k]['avatar'] = $user_data[$v['superior_uid']]['avatar'];
                     }
                 }
@@ -134,9 +130,7 @@ class BeanRepository
                         if(!isset($user_data[$v['content_author_id']])) continue;
                         $all_best_author[$k]['count'] = intval($v['count']);
                         $all_best_author[$k]['follow_status'] = $user_data[$v['content_author_id']]['follow_status'];
-                        $username = subtext($user_data[$v['content_author_id']]['username'], 10);
-
-                        $all_best_author[$k]['username'] = $username;
+                        $all_best_author[$k]['username'] = $user_data[$v['content_author_id']]['username'];
                         $all_best_author[$k]['avatar'] = $user_data[$v['content_author_id']]['avatar'];
                     }
                 }

app/Repositories/FeedRepositories.php

@@ -144,7 +144,7 @@ class FeedRepositories
                         Log::debug("测试feed关注状态：uid{$userInfo['uid']}followUid{$value['relate_id']}");
                         $value['relate_data'] = [
                             'uid' => intval($user['uid']),
-                            'username' => subtext($user['username'],10),
+                            'username' => $user['username'],
                             'avatar' => $user['avatar'],
                             'follow_status' => $this->getFollowStatus($userInfo['uid'],$value['relate_id']),
                         ];
@@ -182,7 +182,7 @@ class FeedRepositories
             'type' => $post['type'],
             'created_at' => Carbon::parse($post['created_at'])->diffForHumans(),
             'uid' => $post['uid'],
-            'username' => subtext($post['username'],10),
+            'username' => $post['username'],
             'avatar' => $post['avatar'],
             'topic' => $topic,
             'title' => $post['title'],

app/Transformers/FeedTransformer.php

@@ -36,7 +36,7 @@ class FeedTransformer extends TransformerAbstract {
             'id' => $feed['id'],
             'uid' => $feed['uid'],
             'follow_uid' => $feed['follow_uid'],
-            'follow_username' => subtext($feed['follow_username'], 10),
+            'follow_username' => $feed['follow_username'],
             'follow_avatar' => $feed['follow_avatar'],
            // 'follow_status' => $this->getFollowStatus($feed['uid'],$feed['follow_uid']),
             'type' => $feed['type'],

app/Transformers/Post/CommentTransformer.php

@@ -21,9 +21,9 @@ class CommentTransformer extends TransformerAbstract
         foreach($replies as $val){
             $reply[] = [
                 'uid' => $val->uid,
-                'username' => subtext($val->username, 10),
+                'username' => $val->username,
                 'avatar' => $val->avatar,
-                'reply_username' => subtext($val->reply_username, 10),
+                'reply_username' => $val->reply_username,
                 'content' => $val->is_delete?'该评论已被删除':$val->content,
                 'created_at' => Carbon::parse($val->created_at)->diffForHumans(),
             ];
@@ -31,7 +31,7 @@ class CommentTransformer extends TransformerAbstract
         return [
             'id' => $postComment['id'],
             'uid' => $postComment['uid'],
-            'username' => subtext($postComment['username'], 10),
+            'username' => $postComment['username'],
             'avatar' => $postComment['avatar'],
             'content' => $postComment['is_delete']?'该评论已被删除':$postComment['content'],
             'created_at' => Carbon::parse($postComment['created_at'])->diffForHumans(),

app/Transformers/Post/DetailTransformer.php

@@ -48,7 +48,7 @@ class DetailTransformer extends TransformerAbstract
             'type' => $post['type'],
             'created_at' => Carbon::parse($post['created_at'])->diffForHumans(),
             'uid' => $post['uid'],
-            'username' => subtext($post['username'], 10),
+            'username' => $post['username'],
             'avatar' => $post['avatar'],
             'topic' => $topic,
             'topic_ids' => $post['topic_ids'],

app/Transformers/Post/ListTransformer.php

@@ -24,10 +24,10 @@ class ListTransformer extends TransformerAbstract
             'id' => $post['id'],
             'type' => $post['type'],
             'uid' => $post['uid'],
-            'username' => subtext($post['username'], 10),
+            'username' => $post['username'],
             'avatar' => $post['avatar'],
             'title' => $post['title'],
-            'content' => subtext($post['content'], 20),
+            'content' => subtext($post['content'], 100),
             'img' => $post['img'],
             'praise_count' => $post->data->praise_count,
             'is_like' => PostLike::where('post_id', $post['id'])->where('uid', $this->uid)->exists()?1:0,

app/Transformers/Post/ReplyTransformer.php

@@ -19,8 +19,8 @@ class ReplyTransformer extends TransformerAbstract
         return [
             'id' => $postComment['id'],
             'uid' => $postComment['uid'],
-            'username' => subtext($postComment['username'], 10),
-            'reply_username' => subtext($postComment['reply_username'], 10),
+            'username' => $postComment['username'],
+            'reply_username' => $postComment['reply_username'],
             'avatar' => $postComment['avatar'],
             'content' => $postComment['is_delete']?'该回复已被删除':$postComment['content'],
             'created_at' => Carbon::parse($postComment['created_at'])->diffForHumans(),

app/Transformers/Post/SuggestTransformer.php

@@ -36,7 +36,7 @@ class SuggestTransformer extends TransformerAbstract
         foreach($comments as $item){
             $comment[] = [
                 'id' => $item->id,
-                'username' => subtext($item->username, 10),
+                'username' => $item->username,
                 'content' => $item->is_delete?'该评论已被删除':$item->content,
             ];
         }
@@ -53,7 +53,7 @@ class SuggestTransformer extends TransformerAbstract
             'type' => $post['type'],
             'created_at' => Carbon::parse($post['created_at'])->diffForHumans(),
             'uid' => $post['uid'],
-            'username' => subtext($post['username'], 10),
+            'username' => $post['username'],
             'avatar' => $post['avatar'],
             'topic' => $topic,
             'title' => $post['title'],

app/Transformers/Post/VideoTransformer.php

@@ -39,7 +39,7 @@ class VideoTransformer extends TransformerAbstract
             'id' => $post['id'],
             'type' => $post['type'],
             'uid' => $post['uid'],
-            'username' => subtext($post['username'], 10),
+            'username' => $post['username'],
             'avatar' => $post['avatar'],
             'title' => $post['title'],
             'content' => $post['content'],

app/Transformers/Topic/TopicDetailTransformer.php

@@ -21,7 +21,7 @@ class TopicDetailTransformer extends TransformerAbstract
     {
         return [
             'id' => $topic['id'],
-            'name' => subtext($topic['name'], 5),
+            'name' => $topic['name'],
             'img' => $topic['img'],
             'follow_count' => getNumber($topic->follow->count() + $topic['base_count']),
             'is_follow' => $topic->follow->where('uid', $this->uid)->count()?1:0,

app/Transformers/Topic/TopicListTransformer.php

@@ -17,7 +17,7 @@ class TopicListTransformer extends TransformerAbstract
     {
         return [
             'id' => $topic['id'],
-            'name' => subtext($topic['name'], 5),
+            'name' => $topic['name'],
             'img' => $topic['img'],
             'follow_count' => getNumber($topic->follow->count() + $topic['base_count']),
         ];

app/Transformers/Topic/TopicPostTransformer.php

@@ -38,15 +38,15 @@ class TopicPostTransformer extends TransformerAbstract
             $reply = [];
             foreach($replies as $val){
                 $reply[] = [
-                    'username' => subtext($val->username, 10),
-                    'reply_username' => subtext($val->reply_username, 10),
+                    'username' => $val->username,
+                    'reply_username' => $val->reply_username,
                     'content' => $val->content,
                 ];
             }
             $comment[] = [
                 'id' => $item->id,
-                'username' => subtext($item->username, 10),
-                'content' => subtext($item->content, 10),
+                'username' => $item->username,
+                'content' => $item->content,
                 'reply_count' => $replyCount,
                 'reply' => $reply,
             ];
@@ -55,7 +55,7 @@ class TopicPostTransformer extends TransformerAbstract
         foreach($post->topic() as $key => $val){
             $topic[] = [
                 'id' => $key,
-                'name' => subtext($val, 5)
+                'name' => $val
             ];
         }
         $isFollow = 0;
@@ -68,7 +68,7 @@ class TopicPostTransformer extends TransformerAbstract
             'type' => $post['type'],
             'created_at' => Carbon::parse($post['created_at'])->diffForHumans(),
             'uid' => $post['uid'],
-            'username' => subtext($post['username'], 10),
+            'username' => $post['username'],
             'avatar' => $post['avatar'],
             'topic' => $topic,
             'title' => $post['title'],