文本聊天已完成

app/Http/Controllers/AuthController.php

@@ -39,9 +39,10 @@ class AuthController extends Controller
         $username = request()->input('username');
         $password = request()->input('password');
         $nickName = request()->input('nickname');
+        $avatar = request()->input('avatar');
 
         return jok(
-            $this->service->register($username, $password, $nickName),
+            $this->service->register($username, $password, $nickName, $avatar),
             '注册成功'
         );
     }

app/Http/Controllers/ImController.php

@@ -36,15 +36,25 @@ class ImController extends Controller
     {
         $messageType = request()->post('message_type');
         $data = request()->post('data');
+        $toUserId = request()->post('to_user_id');
+        $chatRoomId = request()->post('chat_room_id');
+        $replayId = request()->post('replay_id', 0);
+
         try {
-            return jok($this->service->sendMessage($data, $messageType));
+            return jok($this->service->sendMessage($data, $toUserId, $chatRoomId, $replayId, $messageType));
+        } catch (\Exception $e) {
+            return jerr($e->getMessage());
+        }
+    }
+
+    public function getMessageByChatRoomId()
+    {
+        $chatRoomId = request()->input('chat_room_id');
+        try {
+            return jok(
+                $this->service->getMessageByChatRoomId($chatRoomId)
+            );
         } catch (\Exception $e) {
-            ds([
-                'message' => $e->getMessage(),
-                'file' => $e->getFile(),
-                'line' => $e->getLine(),
-                'trace' => $e->getTrace(),
-            ]);
             return jerr($e->getMessage());
         }
     }

app/Http/Controllers/UserController.php

@@ -2,9 +2,25 @@
 
 namespace App\Http\Controllers;
 
+use App\Services\GatewayWorker\UserService;
 use Illuminate\Http\Request;
 
 class UserController extends Controller
 {
     //
+    /**
+     * 获取用户列表
+     * @Method GET
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function userList()
+    {
+        try {
+            return jok(
+                (new UserService())->userList()
+            );
+        } catch (\Exception $e) {
+            return jerr($e->getMessage());
+        }
+    }
 }