Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化字段

Browse Source
This commit is contained in:
kuaifan
2022-03-17 21:41:17 +08:00
parent eaf1a59e89
commit 7491a6faac
14 changed files with 102 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/DialogController.php
+7 -7
View File
@@ -41,7 +41,7 @@ class DialogController extends AbstractController
{
$user = User::auth();
//
$list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.is_mark_unread'])
$list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread'])
->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
->where('u.userid', $user->userid)
->orderByDesc('u.top_at')
@@ -74,7 +74,7 @@ class DialogController extends AbstractController
//
$dialog_id = intval(Request::input('dialog_id'));
//
$item = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.is_mark_unread'])
$item = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread'])
->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
->where('web_socket_dialogs.id', $dialog_id)
->where('u.userid', $user->userid)
@@ -156,9 +156,9 @@ class DialogController extends AbstractController
$user->save();
}
//去掉标记未读
$isMarkDialogUser = WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($user->userid)->whereIsMarkUnread(1)->first();
$isMarkDialogUser = WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($user->userid)->whereMarkUnread(1)->first();
if ($isMarkDialogUser) {
$isMarkDialogUser->is_mark_unread = 0;
$isMarkDialogUser->mark_unread = 0;
$isMarkDialogUser->save();
}
//
@@ -531,12 +531,12 @@ class DialogController extends AbstractController
->chunkById(100, function ($list) {
WebSocketDialogMsgRead::onlyMarkRead($list);
});
$dialogUser->is_mark_unread = 0;
$dialogUser->mark_unread = 0;
$dialogUser->save();
break;
case 'unread':
$dialogUser->is_mark_unread = 1;
$dialogUser->mark_unread = 1;
$dialogUser->save();
break;
@@ -545,7 +545,7 @@ class DialogController extends AbstractController
}
return Base::retSuccess("success", [
'id' => $dialogId,
'is_mark_unread' => $dialogUser->is_mark_unread,
'mark_unread' => $dialogUser->mark_unread,
]);
}
}
app/Http/Controllers/Api/UsersController.php
+2 -2
View File
@@ -90,7 +90,7 @@ class UsersController extends AbstractController
return $retError('帐号已停用...');
}
Cache::forget("code::" . $email);
if ($isRegVerify && $user->is_email_verity === 0) {
if ($isRegVerify && $user->email_verity === 0) {
UserEmailVerification::userEmailSend($user);
return $retError('您还没有验证邮箱，请先登录邮箱通过验证邮件验证邮箱');
}
@@ -612,7 +612,7 @@ class UsersController extends AbstractController
'status' => 1
]);
User::whereUserid($res->userid)->update([
'is_email_verity' => 1
'email_verity' => 1
]);
return Base::retSuccess('绑定邮箱成功');
}