From 79cb7687435cfe2f5118e0ccf6a6b61c893f32e0 Mon Sep 17 00:00:00 2001
From: gzydong <837215079@qq.com>
Date: Mon, 17 Jan 2022 21:27:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=85=BC=E5=AE=B9=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/Group/GroupMember.php                | 6 ++++--
 app/Model/Talk/TalkSession.php                 | 5 +++--
 app/Service/ContactsService.php                | 2 +-
 app/Service/Message/SubscribeHandleService.php | 2 +-
 app/Service/UserFriendService.php              | 2 +-
 app/Service/UserService.php                    | 4 ++--
 seeders/initialize.php                         | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/Model/Group/GroupMember.php b/app/Model/Group/GroupMember.php
index afb7d88..dbf7450 100644
--- a/app/Model/Group/GroupMember.php
+++ b/app/Model/Group/GroupMember.php
@@ -15,8 +15,9 @@ use App\Model\BaseModel;
  * @property integer $is_mute    是否禁言[0:否;1:是;]
  * @property integer $is_quit    是否退群[0:否;1:是;]
  * @property string  $user_card  群名片
- * @property string  $created_at 入群时间
- * @property string  $deleted_at 退群时间
+ * @property string  $created_at 创建时间
+ * @property string  $updated_at 更新时间
+ * @property string  $deleted_at 删除时间
  * @package App\Model\Group
  */
 class GroupMember extends BaseModel
@@ -30,6 +31,7 @@ class GroupMember extends BaseModel
         'is_mute',
         'is_quit',
         'user_card',
+        'last_record_id',
         'created_at',
         'updated_at',
         'deleted_at',
diff --git a/app/Model/Talk/TalkSession.php b/app/Model/Talk/TalkSession.php
index 26bcd7a..f075f55 100644
--- a/app/Model/Talk/TalkSession.php
+++ b/app/Model/Talk/TalkSession.php
@@ -19,6 +19,7 @@ use App\Model\BaseModel;
  * @property integer        $is_robot      是否机器人
  * @property string         $created_at    创建时间
  * @property \Carbon\Carbon $updated_at    更新时间
+ *
  * @package App\Model
  */
 class TalkSession extends BaseModel
@@ -31,10 +32,10 @@ class TalkSession extends BaseModel
         'talk_type',
         'user_id',
         'receiver_id',
-        'is_delete',
         'is_top',
-        'is_robot',
         'is_disturb',
+        'is_delete',
+        'is_robot',
         'created_at',
         'updated_at'
     ];
diff --git a/app/Service/ContactsService.php b/app/Service/ContactsService.php
index 5a39fa1..0f03368 100644
--- a/app/Service/ContactsService.php
+++ b/app/Service/ContactsService.php
@@ -11,7 +11,7 @@
 namespace App\Service;
 
 use App\Model\User;
-use App\Model\Contact;
+use App\Model\Contact\Contact;
 use App\Traits\PagingTrait;
 
 /**
diff --git a/app/Service/Message/SubscribeHandleService.php b/app/Service/Message/SubscribeHandleService.php
index 0704c5a..ab663e4 100644
--- a/app/Service/Message/SubscribeHandleService.php
+++ b/app/Service/Message/SubscribeHandleService.php
@@ -9,7 +9,7 @@ use App\Constants\TalkEventConstant;
 use App\Constants\TalkModeConstant;
 use App\Model\Talk\TalkRecords;
 use App\Model\User;
-use App\Model\ContactApply;
+use App\Model\Contact\ContactApply;
 use App\Service\SocketClientService;
 use App\Service\UserService;
 
diff --git a/app/Service/UserFriendService.php b/app/Service/UserFriendService.php
index 86ac220..9c4cbcf 100644
--- a/app/Service/UserFriendService.php
+++ b/app/Service/UserFriendService.php
@@ -3,7 +3,7 @@
 namespace App\Service;
 
 use App\Cache\FriendRemark;
-use App\Model\Contact;
+use App\Model\Contact\Contact;
 
 class UserFriendService
 {
diff --git a/app/Service/UserService.php b/app/Service/UserService.php
index 2cb9407..41c0567 100644
--- a/app/Service/UserService.php
+++ b/app/Service/UserService.php
@@ -5,8 +5,8 @@ namespace App\Service;
 use App\Helpers\HashHelper;
 use App\Model\User;
 use App\Model\Article\ArticleClass;
-use App\Model\Contact;
-use App\Model\ContactApply;
+use App\Model\Contact\Contact;
+use App\Model\Contact\ContactApply;
 use Hyperf\DbConnection\Db;
 
 class UserService extends BaseService
diff --git a/seeders/initialize.php b/seeders/initialize.php
index 1a00f85..18528d7 100644
--- a/seeders/initialize.php
+++ b/seeders/initialize.php
@@ -7,7 +7,7 @@ use Hyperf\Database\Seeders\Seeder;
 use App\Model\User;
 use App\Model\Article\ArticleClass;
 use Hyperf\DbConnection\Db;
-use App\Model\Contact;
+use App\Model\Contact\Contact;
 
 class Initialize extends Seeder
 {