diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index ec1687e4..672cfd1f 100644 --- a/app/Http/Controllers/AuthController.php +++ b/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), '注册成功' ); } diff --git a/app/Http/Controllers/ImController.php b/app/Http/Controllers/ImController.php index 66d7dd09..72fce832 100644 --- a/app/Http/Controllers/ImController.php +++ b/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()); } } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index b754608e..c5a04998 100644 --- a/app/Http/Controllers/UserController.php +++ b/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()); + } + } } diff --git a/app/Models/MessageModel.php b/app/Models/MessageModel.php new file mode 100644 index 00000000..e5f6e683 --- /dev/null +++ b/app/Models/MessageModel.php @@ -0,0 +1,23 @@ +hasOne(UserModel::class, 'id', 'user_id'); + } + public function toUser() + { + return $this->hasOne(UserModel::class, 'id', 'to_user_id'); + } +} diff --git a/app/Models/im/ChatRoomModel.php b/app/Models/im/ChatRoomModel.php new file mode 100644 index 00000000..41092641 --- /dev/null +++ b/app/Models/im/ChatRoomModel.php @@ -0,0 +1,14 @@ +header('token'); - $this->userId = $token; + $this->userId = (int)$token; $this->userInfo = UserModel::where('id', $token)->first(); } diff --git a/app/Services/GatewayWorker/GatewayClientService.php b/app/Services/GatewayWorker/GatewayClientService.php index 3bcece99..a97406a1 100644 --- a/app/Services/GatewayWorker/GatewayClientService.php +++ b/app/Services/GatewayWorker/GatewayClientService.php @@ -122,4 +122,10 @@ class GatewayClientService Gateway::sendToAll($message); } } + + // 判断uid是否在线 + public function isUidOnline(int $uid): bool + { + return Gateway::isUidOnline($uid); + } } diff --git a/app/Services/GatewayWorker/ImService.php b/app/Services/GatewayWorker/ImService.php index 94a5f4b5..c55fee4d 100644 --- a/app/Services/GatewayWorker/ImService.php +++ b/app/Services/GatewayWorker/ImService.php @@ -3,6 +3,8 @@ namespace App\Services\GatewayWorker; use App\Enum\MessageTypeEnum; +use App\Models\im\ChatRoomUserModel; +use App\Models\MessageModel; use App\Services\Base\BaseService; use GatewayClient\Gateway; @@ -26,7 +28,36 @@ class ImService extends BaseService return ['绑定成功']; } - public function sendMessage($data, $type = MessageTypeEnum::Text->value) + public function getMessageByChatRoomId($chatRoomId) + { + $message = MessageModel::with([ + 'user', + 'toUser' + ])->where('chat_room_id', $chatRoomId)->get(); + + if (empty($message)) { + return []; + } + $result = []; + $message = $message->toArray(); + foreach ($message as $v) { + $result[] = [ + 'userId' => $v['user_id'], + 'l' => $v['user_id'] === $this->userId? 'user' : 'to_user', + 'message_type' => MessageTypeEnum::from($v['type'])->description(), + 'content' => $v['content'], + 'nick_name' => $v['user']['nick_name'], + 'avatar' => $v['user']['avatar'], + 'timestamp' => $v['created_at'], + 'type' => $v['user_id'] === $this->userId? 'sent' : 'received', + 'user' => $v['user'], + 'to_user' => $v['to_user'], + ]; + } + return $result; + } + + public function sendMessage($data, $toUserId, $chatRoomId, $replayId, $type = MessageTypeEnum::Text->value) { // $uids = [1,2,3]; // $uidsC = []; @@ -36,12 +67,22 @@ class ImService extends BaseService // ds($uidsC); $data['message_type'] = MessageTypeEnum::from($type)->description(); $this->gatewayClient->sendToUser( - $this->userId === 1? 2: 1, + $toUserId, $this->userId, $data['avatarColor'], $this->userInfo['nick_name'], - '单聊'. $data['content'], + $data['content'], ); + + MessageModel::create([ + 'user_id' => $this->userId, + 'chat_room_id' => $chatRoomId, + 'to_user_id' => $toUserId, + 'replay_id' => $replayId, + 'type' => $type, + 'content' => $data['content'], + 'created_at' => time(), + ]); // $this->gatewayClient->broadcastMessage( // $this->userId, // $data['avatarColor'], diff --git a/app/Services/GatewayWorker/UserService.php b/app/Services/GatewayWorker/UserService.php index ff04f36f..4890ce91 100644 --- a/app/Services/GatewayWorker/UserService.php +++ b/app/Services/GatewayWorker/UserService.php @@ -2,9 +2,11 @@ namespace App\Services\GatewayWorker; +use App\Models\im\ChatRoomUserModel; use App\Models\UserModel; +use App\Services\Base\BaseService; -class UserService +class UserService extends BaseService { public function login($username, $password) { @@ -23,10 +25,11 @@ class UserService } } - public function register($username, $password, $nickName) + public function register($username, $password, $nickName, $avatar) { $userModel = UserModel::create([ 'username' => $username, + '$avatar' => $$avatar, 'password' => md5($password), 'nick_name' => $nickName, 'created_at' => time() @@ -37,4 +40,23 @@ class UserService 'user_info' => $userModel ]; } + + public function userList() + { + $userModel = UserModel::where('id', '<>', $this->userId)->get(); + if (empty($userModel)) { + return []; + } + + $myRooms = ChatRoomUserModel::where('user_id', $this->userId)->pluck('chat_room_id'); + $allRooms = ChatRoomUserModel::where('user_id', '<>', $this->userId)->whereIn('chat_room_id', $myRooms)->get(); + $roomsMap = array_column($allRooms->toArray(), 'chat_room_id', 'user_id'); + $userModel = $userModel->toArray(); + $gatewayClient = GatewayClientService::getInstance()->init(); + foreach ($userModel as &$v) { + $v['is_uid_online'] = $gatewayClient->isUidOnline($v['id']); + $v['chat_room_id'] = !empty($roomsMap[$v['id']])? $roomsMap[$v['id']] : 0; + } + return $userModel; + } } diff --git a/config/gateway.php b/config/gateway.php index 6c241bae..a83c0c94 100644 --- a/config/gateway.php +++ b/config/gateway.php @@ -7,7 +7,8 @@ return [ // 'register_address' => 'http://t-ws.奶酪yun.cn/register/' // 'register_address' => 't-ws.奶酪yun.cn/register/', // 'register_address' => '10.0.12.17:11238', - 'register_address' => '127.0.0.1:11238', + 'register_address' => env('GATEWAYWORKER_REGISTER_HOST'), + 'ws_address' => env('WEBSOCKET_HOST'), // 'register_address' => '101.43.12.11:11238', // 'register_address' => '172.22.240.1:11238', ]; diff --git a/resources/views/chat.blade.php b/resources/views/chat.blade.php index 558ff989..14c66b3a 100644 --- a/resources/views/chat.blade.php +++ b/resources/views/chat.blade.php @@ -6,6 +6,9 @@ 奶酪云聊天室 + + + - -
-
- 未连接 -
- - -
-
-
-
U
-

奶酪云聊天室

-
- +
+ +
+
+ @{{ statusText }}：@{{ selectUsers.nick_name }}
-
-
-
在线用户 (0)
-
- + +
+
+
+
+ @{{ currentUser.name.charAt(0).toUpperCase() }} +
+

@{{ currentUser.name }} 的接诊室

+
-
-
-
- -

开始聊天吧！您发送的消息将在这里显示

+
+
+
用户列表 (@{{ users.length }})
+
+ +
+
+ @{{ currentUser.name.charAt(0).toUpperCase() }} +
+
@{{ currentUser.name }} (我)
+
+
+ + +
+
+ @{{ user.nick_name.charAt(0).toUpperCase() }} +
+
@{{ user.nick_name }}
+
+
-
- -
-
- +
+
+
+ +

开始聊天吧！您发送的消息将在这里显示

-
- + + +
+ @{{ msg.content }}
-
- + + +
+
+ @{{ msg.name.charAt(0).toUpperCase() }} +
+
+
@{{ msg.name }}
+
+
@{{ msg.text }}
+
+
+ @{{ formatTime(msg.timestamp) }} +
+
-
- -
-
- +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + +
+
+ @{{ emoji }}
-
-
-
-
@@ -519,100 +584,141 @@
diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php index 2400a4fc..f86bb645 100644 --- a/resources/views/login.blade.php +++ b/resources/views/login.blade.php @@ -529,6 +529,12 @@ }, 3000); } + // 头像颜色 + const AVATAR_COLORS = [ + '#6a55fa', '#f87171', '#4ade80', '#fbbf24', + '#60a5fa', '#c084fc', '#fb923c', '#34d399' + ]; + // 用户登录 loginForm.addEventListener('submit', function(e) { e.preventDefault(); @@ -551,6 +557,7 @@ id: res.result.user_info.id, username: res.result.user_info.username, name: res.result.user_info.nick_name, + avatarColor: res.result.user_info.avatar, loginTime: new Date().toISOString() })); sessionStorage.setItem('token', res.result.token); @@ -594,9 +601,12 @@ return; } + const colorIndex = Math.floor(Math.random() * AVATAR_COLORS.length); + let avatarColor = AVATAR_COLORS[colorIndex]; axios.post('/api/auth/register', { username, password, + avatar: avatarColor, nickname: registerNickname }).then(response => { console.log(response); diff --git a/routes/api.php b/routes/api.php index adf06ca5..9c740ec1 100644 --- a/routes/api.php +++ b/routes/api.php @@ -14,6 +14,7 @@ Route::group([ ], function () { cc_auto_route_register([ 'im' => \App\Http\Controllers\ImController::class, + 'user' => \App\Http\Controllers\UserController::class, ]); });