From fd4a3be3eedfbf9fa77987dd8a2c7db1bdc3d0d6 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Sun, 8 Oct 2023 09:14:39 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/controller/ImController.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/common/controller/ImController.php b/app/common/controller/ImController.php
index 885db5746..86aabebb4 100644
--- a/app/common/controller/ImController.php
+++ b/app/common/controller/ImController.php
@@ -77,7 +77,7 @@ class ImController extends BaseLikeAdminController
             return $this->fail('场景错误');
         }
         Gateway::bindUid($params['client_id'], $this->sceneText($params['scene']).'_'.$params['user_id']);
-        return $this->success('绑定成功');
+        return $this->success('绑定成功',['msg'=>$this->sceneText($params['scene']).'_'.$params['user_id']]);
     }
 
     //发送消息
@@ -280,6 +280,22 @@ class ImController extends BaseLikeAdminController
         $params['page_no'] -= 1;
         $sql = "SELECT id,from_user_id,to_user_id,content,type,is_read,create_time,extends FROM la_user_im_message WHERE (from_user_id = {$params['from_user_id']}  AND to_user_id = {$params['to_user_id']}) OR (from_user_id = {$params['to_user_id']} AND to_user_id = {$params['from_user_id']}) ORDER BY create_time DESC LIMIT {$params['page_no']},{$params['page_size']}";
         $msgData = Db::query($sql);
+        foreach($msgData as $k=>$v){
+            if($v['from_user_id'] == $params['from_user_id']){
+                $msgData[$k]['from_user_name'] = $fromUserInfo['name'];
+                $msgData[$k]['from_user_avatar'] = $fromUserInfo['avatar'];
+            }else{
+                $msgData[$k]['from_user_name'] = $toUserInfo['name'];
+                $msgData[$k]['from_user_avatar'] = $toUserInfo['avatar'];
+            }
+            if($v['to_user_id'] == $params['to_user_id']){
+                $msgData[$k]['to_user_name'] = $toUserInfo['name'];
+                $msgData[$k]['to_user_avatar'] = $toUserInfo['avatar'];
+            }else{
+                $msgData[$k]['to_user_name'] = $fromUserInfo['name'];
+                $msgData[$k]['to_user_avatar'] = $fromUserInfo['avatar'];
+            }
+        }
         //返回数据
         return $this->success('请求成功',$msgData);
     }

From cfa10d4c503750079285ab21d1cfea67bbae7d15 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Sun, 8 Oct 2023 14:50:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E6=B6=88=E6=81=AF=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/controller/ImController.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/common/controller/ImController.php b/app/common/controller/ImController.php
index 86aabebb4..09ecadae0 100644
--- a/app/common/controller/ImController.php
+++ b/app/common/controller/ImController.php
@@ -275,11 +275,13 @@ class ImController extends BaseLikeAdminController
             return $this->fail('接收者信息错误');
         }
         //将消息设置为已读
-        UserImMessage::where([['from_user_id','=',$params['from_user_id']],['to_user_id','=',$params['to_user_id']]])->update(['is_read' => 1]);
+        UserImMessage::where([['from_user_id','=',$params['to_user_id']],['to_user_id','=',$params['from_user_id']]])->update(['is_read' => 1]);
         //获取用户消息
-        $params['page_no'] -= 1;
-        $sql = "SELECT id,from_user_id,to_user_id,content,type,is_read,create_time,extends FROM la_user_im_message WHERE (from_user_id = {$params['from_user_id']}  AND to_user_id = {$params['to_user_id']}) OR (from_user_id = {$params['to_user_id']} AND to_user_id = {$params['from_user_id']}) ORDER BY create_time DESC LIMIT {$params['page_no']},{$params['page_size']}";
-        $msgData = Db::query($sql);
+        $msgData = Db::name('user_im_message')->field('id,from_user_id,to_user_id,content,type,is_read,create_time,extends')
+                   ->whereRaw("(from_user_id = {$params['from_user_id']} AND to_user_id = {$params['to_user_id']}) OR (from_user_id = {$params['to_user_id']} AND to_user_id = {$params['from_user_id']})")
+                   ->order('create_time desc')
+                   ->page($params['page_no'],$params['page_size'])
+                   ->select()->toArray();
         foreach($msgData as $k=>$v){
             if($v['from_user_id'] == $params['from_user_id']){
                 $msgData[$k]['from_user_name'] = $fromUserInfo['name'];
@@ -327,9 +329,12 @@ class ImController extends BaseLikeAdminController
         $users = User::field('id,nickname as name,avatar')->where('company_id','in',$company)->select()->each(function($item) use($params) {
             //获取消息
             $msg_no_read = UserImMessage::field('id')->where('from_user_id',$item['id'])->where('to_user_id',$params['user_id'])->where('is_read',0)->count();
-            $last_msg = UserImMessage::field('id,content,create_time')->where('from_user_id',$item['id'])->where('to_user_id',$params['user_id'])->where('is_read',0)->order('create_time desc')->limit(1)->findOrEmpty();
+            $last_msg = Db::name('user_im_message')->field('id,content,type,create_time')
+                        ->whereRaw("(from_user_id = {$item['id']} AND to_user_id = {$params['user_id']}) OR (from_user_id = {$params['user_id']} AND to_user_id = {$item['id']})")
+                        ->order('create_time desc')->limit(1)->findOrEmpty();
             $item['no_read_num'] = $msg_no_read;
             $item['last_msg_content'] = $last_msg['content'];
+            $item['last_msg_type'] = $last_msg['type'];
             $item['last_msg_time'] = $last_msg['create_time'];
         })->toArray();
         $key = array_column($users,'last_msg_time');
@@ -363,7 +368,9 @@ class ImController extends BaseLikeAdminController
         if($params['user_id'] == $companyInfo['area_manager']){
             return $this->fail('用户身份错误错误');
         }
+        //获取用户信息
+        $adminInfo = Admin::field('id,name,avatar')->where('id',$companyInfo['area_manager'])->findOrEmpty();
         //返回
-        return $this->success('请求成功',['to_user_id'=>$companyInfo['area_manager']]);
+        return $this->success('请求成功',['to_user_id'=>$adminInfo['id'],'manager_name'=>$adminInfo['name'],'manager_avatar'=>$adminInfo['avatar']]);
     }
 }
\ No newline at end of file

From 3b72cefd38e3954855f69eaab06635830e9970da Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Sun, 8 Oct 2023 15:22:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/alioss/alioss.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/extend/alioss/alioss.php b/extend/alioss/alioss.php
index ea54009c7..09e7479ff 100644
--- a/extend/alioss/alioss.php
+++ b/extend/alioss/alioss.php
@@ -19,10 +19,6 @@ class alioss
         if(!in_array($fileType,$ext)){
             return ['code'=>0,'msg'=>'图片格式错误'];
         }
-        //验证图片大小
-        if($fileSize > 500*1024){
-            return ['code'=>0,'msg'=>'图片大小错误'];
-        }
         try {
             //实例化对象 将配置传入
             $ossClient = new OssClient($this->accessKeyId, $this->accessKeySecret, $this->endpoint);
@@ -44,11 +40,7 @@ class alioss
         //验证视频类型
         $ext = ['mp4','avi','flv','wmv','swf'];
         if(!in_array($fileType,$ext)){
-            return ['code'=>0,'msg'=>'图片格式错误'];
-        }
-        //验证视频大小
-        if($fileSize > 1024*1024*100){
-            return ['code'=>0,'msg'=>'图片大小错误'];
+            return ['code'=>0,'msg'=>'视频格式错误'];
         }
         try {
             //实例化对象 将配置传入