Merge branch 'gq' of http://git.9026.com/roobe/miao

server/app/Http/Controllers/Api/V1/InteractionController.php

@@ -123,9 +123,11 @@ class InteractionController extends Controller
 
         $user = $this->getUser();
         $user_id = $user->id;
+        $user_avatar = $user->avatar;
+        $user_nickname = $user->nickname;
         $interaction_id = $request->id;
         $content = $request->content;
-        $data = compact('user_id','interaction_id','content');
+        $data = compact('user_id','user_avatar','user_nickname','interaction_id','content');
         $ok = CommentInfoModel::create($data);
         if ($ok) {
             return $this->api('');
@@ -180,7 +182,11 @@ class InteractionController extends Controller
 
         $user = $this->getUser();
         $data['to_user_id'] = $user->id;
+        $data['to_user_avatar'] = $user->avatar;
+        $data['to_user_nickname'] = $user->nickname;
         $data['user_id'] =CommentInfoModel::find($request->id)->user_id;
+        $data['user_avatar'] =CommentInfoModel::find($request->id)->user_avatar;
+        $data['user_nickname'] =CommentInfoModel::find($request->id)->user_nickname;
         $data['interaction_id'] = $request->interaction_id;
         $data['content'] = $request->content;
 

server/app/Models/CommentInfoModel.php

@@ -10,6 +10,11 @@ class CommentInfoModel extends Model
     protected $fillable = [
         'interaction_id',
         'user_id',
+        'user_avatar',
+        'user_nickname',
+        'to_user_id',
+        'to_user_avatar',
+        'to_user_nickname',
         'level',
         'content',
         'is_read',