优化拉黑重发

app/common/controller/Upload.php

@@ -83,12 +83,12 @@ class Upload extends BaseController
         if(!$prefix){
             $prefix=$filecate.'/'.date('Y-m-d').'/'.$uid."/";
         }
+        $name=str_replace('.'.$info['ext'],'',$info['name']);
         if ($oldFile && !$fileObj) {
             $rep_path = str_replace(public_path(),'',$path);
             $file=FileModel::where(['src'=>$rep_path,'user_id'=>$uid])->find();
-            $name=$file['name'];
+            if ($file['name']) $name=$file['name'];
         } else {
-            $name=str_replace('.'.$info['ext'],'',$info['name']);
             $file=FileModel::where(['md5'=>$info['md5'],'user_id'=>$uid])->find();
         }
         // 判断文件是否存在，如果有则不再上传

app/enterprise/model/Message.php

@@ -47,6 +47,7 @@ class Message extends BaseModel
          //    发送消息
     public function sendMessage($param,$globalConfig=false){
         $is_group = $param['is_group'] ?? 0;
+        $param['del_user'] = '';
         $uid=self::$uid;
         if($param['toContactId']==-1 || $param['toContactId']==-2){
             $is_group=0;
@@ -170,6 +171,8 @@ class Message extends BaseModel
         }
         $fileSzie=isset($param['file_size'])?$param['file_size']:'';
         $fileName=isset($param['file_name'])?$param['file_name']:'';
+        if (empty($fileSzie)) $fileSzie=isset($param['fileSize'])?$param['fileSize']:'';
+        if (empty($fileName)) $fileName=isset($param['fileName'])?$param['fileName']:'';
         $ossUrl=getDiskUrl();
         // 如果是转发图片文件的消息，必须把域名去除掉
         $content=$param['content'];
@@ -208,6 +211,7 @@ class Message extends BaseModel
             'at'=>$at,
             'pid'=>$param['pid'] ?? 0,
             'extends'=>($param['extends'] ?? null) ? $param['extends'] : null,
+            'is_last' => 1
         ];
         if ($param['type'] == 'video' && is_null($data['extends'])) {
             $filePath = root_path().'public' . $param['content'];