|
|
@@ -199,7 +199,7 @@ class MessageService extends BaseService
|
|
|
public function getDataListFromatKey($userId, $params, $pageSize=0)
|
|
|
{
|
|
|
$page = request()->post('page', 1);
|
|
|
- $cacheKey = "caches:message:chat_{$page}_".md5($userId.json_encode($params).$pageSize);
|
|
|
+ $cacheKey = "caches:m_chat:{$page}_".md5($userId.json_encode($params).$pageSize);
|
|
|
$datas = RedisService::get($cacheKey);
|
|
|
$data = isset($datas['data'])? $datas['data'] : [];
|
|
|
if($datas && $data) {
|
|
|
@@ -215,8 +215,8 @@ class MessageService extends BaseService
|
|
|
$where = ['a.type'=>9,'a.status'=> 1,'a.mark'=>1];
|
|
|
$expire = ConfigService::make()->getConfigByCode('chat_log_expire');
|
|
|
$expire = $expire? $expire*86400 : 60*86400;
|
|
|
- $field = ['a.id','a.chat_key','a.from_user_id','a.to_user_id','a.msg_type','a.create_time','a.video_time','a.is_connect','a.is_read','a.from_is_show','a.to_is_show','a.status','b.avatar as from_avatar','b.nickname as from_nickname','c.avatar as to_avatar','c.nickname as to_nickname'];
|
|
|
- $datas = $this->model->from('imchat as a')
|
|
|
+ $field = ['a.id','a.title','a.type','a.msg_type','a.chat_type','a.description','a.content','a.from_user_name','a.from_user_avatar','a.from_uid','a.to_user_name','a.to_user_avatar','a.to_uid','a.create_time','a.is_read','a.pages','a.status'];
|
|
|
+ $datas = $this->model->from('message as a')
|
|
|
->where($where)
|
|
|
->where('a.chat_key','>', 0)
|
|
|
->where('a.create_time','>=', time() - $expire)
|
