chenchong
/
hyperf-chat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:兼容开发

main
gzydong 2022-01-19 22:02:00 +08:00
parent bd308ed7f8
commit ca0bdf843f
9 changed files with 234 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
app/Controller/Api/V1/DownloadController.php
View File

@ -1,73 +0,0 @@
<?php
namespace App\Controller\Api\V1;
use App\Service\Group\GroupMemberService;
use Hyperf\Di\Annotation\Inject;
use Hyperf\HttpServer\Annotation\Controller;
use Hyperf\HttpServer\Annotation\RequestMapping;
use Hyperf\HttpServer\Annotation\Middleware;
use App\Middleware\JWTAuthMiddleware;
use App\Model\Article\ArticleAnnex;
use App\Model\Talk\TalkRecords;
use App\Model\Talk\TalkRecordsFile;
use Hyperf\HttpServer\Contract\ResponseInterface;
use League\Flysystem\Filesystem;
/**
* Class DownloadController
* @Controller(prefix="/api/v1/download")
* @Middleware(JWTAuthMiddleware::class)
*
* @package App\Controller\Api\V1
*/
class DownloadController extends CController
{
private function getFilePath(string $path)
{
return di()->get(Filesystem::class)->getConfig()->get('root') . '/' . $path;
}
/**
* 下载用户聊天文件
* @RequestMapping(path="user-chat-file", methods="get")
*
* @param ResponseInterface $response
* @param Filesystem $filesystem
* @return \Psr\Http\Message\ResponseInterface
*/
public function userChatFile(ResponseInterface $response, Filesystem $filesystem)
{
$params = $this->request->inputs(['cr_id']);
$this->validate($params, [
'cr_id' => 'required|integer'
]);
$recordsInfo = TalkRecords::select(['msg_type', 'talk_type', 'user_id', 'receiver_id'])->where('id', $params['cr_id'])->first();
if (!$recordsInfo) {
return $this->response->fail('文件不存在！');
}
$user_id = $this->uid();
// 判断消息是否是当前用户发送(如果是则跳过权限验证)
if ($recordsInfo->user_id != $user_id) {
if ($recordsInfo->talk_type == 1) {
if ($recordsInfo->receiver_id != $user_id) {
return $this->response->fail('非法请求！');
}
} else {
if (!di()->get(GroupMemberService::class)->isMember($recordsInfo->receiver_id, $user_id)) {
return $this->response->fail('非法请求！');
}
}
}
$info = TalkRecordsFile::select(['save_dir', 'original_name'])->where('record_id', $params['cr_id'])->first();
if (!$info || !$filesystem->has($info->save_dir)) {
return $this->response->fail('文件不存在或没有下载权限！');
}
return $response->download($this->getFilePath($info->save_dir), $info->original_name);
}
}

32
app/Controller/Api/V1/Talk/MessageController.php
View File

@ -9,7 +9,7 @@ use App\Constants\TalkModeConstant;
use App\Controller\Api\V1\CController;
use App\Event\TalkEvent;
use App\Model\EmoticonItem;
use App\Model\FileSplitUpload;
use App\Model\SplitUpload;
use App\Service\TalkForwardService;
use App\Service\TalkMessageService;
use App\Support\UserRelation;
@ -149,9 +149,9 @@ class MessageController extends CController
'receiver_id' => $params['receiver_id'],
], [
'user_id' => $user_id,
'file_suffix' => $ext,
'file_size' => $file->getSize(),
'save_dir' => $path,
'suffix' => $ext,
'size' => $file->getSize(),
'path' => $path,
'original_name' => $file->getClientFilename(),
]);
@ -180,14 +180,14 @@ class MessageController extends CController
return $this->response->fail('暂不属于好友关系或群聊成员，无法发送聊天消息！');
}
$file = FileSplitUpload::where('user_id', $user_id)->where('hash_name', $params['hash_name'])->where('file_type', 1)->first();
if (!$file || empty($file->save_dir)) {
$file = SplitUpload::where('user_id', $user_id)->where('upload_id', $params['hash_name'])->where('type', 1)->first();
if (!$file || empty($file->path)) {
return $this->response->fail('文件不存在...');
}
$save_dir = "private/files/talks/" . date('Ymd') . '/' . create_random_filename($file->file_ext);
try {
$save_dir = "files/talks/" . date('Ymd') . '/' . create_random_filename($file->file_ext);
$filesystem->copy($file->save_dir, $save_dir);
$filesystem->copy($file->path, $save_dir);
} catch (\Exception $e) {
return $this->response->fail('文件不存在...');
}
@ -198,14 +198,14 @@ class MessageController extends CController
'receiver_id' => $params['receiver_id']
], [
'user_id' => $user_id,
'file_source' => 1,
'source' => 1,
'original_name' => $file->original_name,
'file_suffix' => $file->file_ext,
'file_size' => $file->file_size,
'save_dir' => $save_dir,
'suffix' => $file->file_ext,
'size' => $file->file_size,
'path' => $save_dir,
]);
if (!$isTrue) return $this->response->fail('表情发送失败！');
if (!$isTrue) return $this->response->fail('文件发送失败！');
return $this->response->success();
}
@ -275,9 +275,9 @@ class MessageController extends CController
'receiver_id' => $params['receiver_id'],
], [
'user_id' => $user_id,
'file_suffix' => $emoticon->file_suffix,
'file_size' => $emoticon->file_size,
'save_dir' => $emoticon->url,
'suffix' => $emoticon->file_suffix,
'size' => $emoticon->file_size,
'url' => $emoticon->url,
'original_name' => '图片表情',
]);

58
app/Controller/Api/V1/Talk/RecordsController.php
View File

@ -3,9 +3,12 @@ declare(strict_types=1);
namespace App\Controller\Api\V1\Talk;
use App\Constants\FileDriveConstant;
use App\Constants\TalkMessageType;
use App\Constants\TalkModeConstant;
use App\Controller\Api\V1\CController;
use App\Model\Talk\TalkRecords;
use App\Model\Talk\TalkRecordsFile;
use App\Service\Group\GroupMemberService;
use App\Service\TalkListService;
use App\Service\TalkService;
@ -14,6 +17,7 @@ use Hyperf\HttpServer\Annotation\Controller;
use Hyperf\HttpServer\Annotation\RequestMapping;
use Hyperf\HttpServer\Annotation\Middleware;
use App\Middleware\JWTAuthMiddleware;
use League\Flysystem\Filesystem;
use Psr\Http\Message\ResponseInterface;
/**
@ -145,4 +149,58 @@ class RecordsController extends CController
return $this->response->success(['rows' => $rows]);
}
/**
* 获取转发记录详情
*
* @RequestMapping(path="file/download", methods="get")
*/
public function download(\Hyperf\HttpServer\Contract\ResponseInterface $response, Filesystem $filesystem)
{
$params = $this->request->inputs(['cr_id']);
$this->validate($params, [
'cr_id' => 'required|integer'
]);
$recordsInfo = TalkRecords::select(['msg_type', 'talk_type', 'user_id', 'receiver_id'])->where('id', $params['cr_id'])->first();
if (!$recordsInfo) {
return $this->response->fail('文件不存在！');
}
$user_id = $this->uid();
// 判断消息是否是当前用户发送(如果是则跳过权限验证)
if ($recordsInfo->user_id != $user_id) {
if ($recordsInfo->talk_type == 1) {
if ($recordsInfo->receiver_id != $user_id) {
return $this->response->fail('非法请求！');
}
} else {
if (!di()->get(GroupMemberService::class)->isMember($recordsInfo->receiver_id, $user_id)) {
return $this->response->fail('非法请求！');
}
}
}
$info = TalkRecordsFile::select(['path', 'original_name', "drive"])->where('record_id', $params['cr_id'])->first();
switch ($info->drive) {
case FileDriveConstant::Local:
if (!$info || !$filesystem->has($info->path)) {
return $this->response->fail('文件不存在或没有下载权限！');
}
return $response->download($this->getFilePath($info->path), $info->original_name);
case FileDriveConstant::Cos:
// 后期添加
break;
default:
break;
}
}
private function getFilePath(string $path)
{
return di()->get(Filesystem::class)->getConfig()->get('root') . '/' . $path;
}
}

33
app/Controller/Api/V1/UploadController.php
View File

@ -30,20 +30,21 @@ class UploadController extends CController
/**
* 图片文件流上传接口
*
* @RequestMapping(path="file-stream", methods="post")
* @RequestMapping(path="avatar", methods="post")
* @param Filesystem $filesystem
* @return ResponseInterface
*/
public function fileStream(Filesystem $filesystem): ResponseInterface
{
$fileStream = $this->request->post('fileStream', '');
if (empty($fileStream)) {
$file = $this->request->file("file");
if (!$file->isValid()) {
return $this->response->fail();
}
$path = 'media/images/avatar/' . date('Ymd') . '/' . create_random_filename('png');
$path = 'public/media/images/avatar/' . date('Ymd') . '/' . create_random_filename('png');
try {
$filesystem->write($path, base64_decode(str_replace(['data:image/png;base64,', ' '], ['', '+'], $fileStream)));
$filesystem->write($path, file_get_contents($file->getRealPath()));
} catch (\Exception $e) {
return $this->response->fail();
}
@ -54,9 +55,9 @@ class UploadController extends CController
/**
* 获取拆分文件信息
*
* @RequestMapping(path="get-file-split-info", methods="get")
* @RequestMapping(path="multipart/initiate", methods="post")
*/
public function getFileSplitInfo(): ResponseInterface
public function initiateMultipart(): ResponseInterface
{
$params = $this->request->inputs(['file_name', 'file_size']);
$this->validate($params, [
@ -66,23 +67,23 @@ class UploadController extends CController
$data = $this->splitUploadService->create($this->uid(), $params['file_name'], $params['file_size']);
$data['hash_name'] = $data["upload_id"];
return $data ? $this->response->success($data) : $this->response->fail('获取文件拆分信息失败！');
}
/**
* 文件拆分上传接口
*
* @RequestMapping(path="file-subarea-upload", methods="post")
* @RequestMapping(path="multipart", methods="post")
*/
public function fileSubareaUpload(): ResponseInterface
{
$file = $this->request->file('file');
$params = $this->request->inputs(['name', 'hash', 'ext', 'size', 'split_index', 'split_num']);
$params = $this->request->inputs(['upload_id', 'split_index', 'split_num']);
$this->validate($params, [
'name' => "required",
'hash' => 'required',
'ext' => 'required',
'size' => 'required',
'upload_id' => 'required',
'split_index' => 'required',
'split_num' => 'required'
]);
@ -92,20 +93,20 @@ class UploadController extends CController
}
$user_id = $this->uid();
$uploadRes = $this->splitUploadService->upload($user_id, $file, $params['hash'], intval($params['split_index']), intval($params['size']));
$uploadRes = $this->splitUploadService->upload($user_id, $file, $params['upload_id'], intval($params['split_index']));
if (!$uploadRes) {
return $this->response->fail('上传文件失败！');
}
if (($params['split_index'] + 1) == $params['split_num']) {
$fileInfo = $this->splitUploadService->merge($user_id, $params['hash']);
$fileInfo = $this->splitUploadService->merge($user_id, $params['upload_id']);
if (!$fileInfo) {
return $this->response->fail('上传文件失败！');
}
return $this->response->success([
'is_file_merge' => true,
'hash' => $params['hash']
'hash' => $params['upload_id']
]);
}

51
app/Model/FileSplitUpload.php
View File

@ -1,51 +0,0 @@
<?php
declare (strict_types=1);
namespace App\Model;
/**
* 文件拆分上传数据表模型
*
* @property int $id 临时文件ID
* @property int $file_type 上传类型[1:合并文件;2:拆分文件]
* @property int $user_id 上传的用户ID
* @property string $hash_name 临时文件hash名
* @property string $original_name 原文件名
* @property int $split_index 当前索引块
* @property int $split_num 总上传索引块
* @property string $save_dir 文件的临时保存路径
* @property string $file_ext 文件后缀名
* @property int $file_size 临时文件大小
* @property int $is_delete 文件是否已被删除[1:是;0:否;]
* @property int $upload_at 文件上传时间
* @package App\Model
*/
class FileSplitUpload extends BaseModel
{
protected $table = 'file_split_upload';
protected $fillable = [
'file_type',
'user_id',
'hash_name',
'original_name',
'split_index',
'split_num',
'save_dir',
'file_ext',
'file_size',
'is_delete',
'upload_at'
];
protected $casts = [
'file_type' => 'integer',
'user_id' => 'integer',
'split_index' => 'integer',
'split_num' => 'integer',
'file_size' => 'integer',
'is_delete' => 'integer',
'upload_at' => 'integer'
];
}

60
app/Model/SplitUpload.php Normal file
View File

@ -0,0 +1,60 @@
<?php
declare (strict_types=1);
namespace App\Model;
/**
* 拆分上传数据表模型
*
* @property int $id 自增ID
* @property int $type 上传类型[1:合并文件;2:拆分文件]
* @property int $drive 文件驱动
* @property int $upload_id 文件上传ID
* @property int $user_id 上传的用户ID
* @property string $original_name 原文件名
* @property int $split_index 当前索引块
* @property int $split_num 总上传索引块
* @property string $path 保存路径
* @property string $file_ext 文件后缀名
* @property int $file_size 文件大小
* @property int $is_delete 是否删除
* @property int $attr 附加信息
* @property string $created_at 创建时间
* @property string $updated_at 更新时间
*
* @package App\Model
*/
class SplitUpload extends BaseModel
{
protected $table = 'split_upload';
protected $fillable = [
'type',
'drive',
'upload_id',
'user_id',
'original_name',
'split_index',
'split_num',
'path',
'file_ext',
'file_size',
'is_delete',
'attr',
'created_at',
'updated_at',
];
protected $casts = [
'type' => 'integer',
'drive' => 'integer',
'user_id' => 'integer',
'split_index' => 'integer',
'split_num' => 'integer',
'file_size' => 'integer',
'is_delete' => 'integer',
'attr' => 'json',
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
}

29
app/Model/Talk/TalkRecordsLocation.php Normal file
View File

@ -0,0 +1,29 @@
<?php
declare(strict_types=1);
namespace App\Model\Talk;
use App\Model\BaseModel;
/**
* Class TalkRecordsLocation
*
* @package App\Model\Talk
*/
class TalkRecordsLocation extends BaseModel
{
protected $table = 'talk_records_location';
protected $fillable = [
'record_id',
'user_id',
'longitude',
'latitude',
'created_at',
];
protected $casts = [
'record_id' => 'integer',
'user_id' => 'integer',
];
}

101
app/Service/SplitUploadService.php
View File

@ -3,8 +3,8 @@ declare(strict_types=1);
namespace App\Service;
use App\Model\FileSplitUpload;
use Hyperf\Utils\Str;
use App\Constants\FileDriveConstant;
use App\Model\SplitUpload;
use Hyperf\HttpMessage\Upload\UploadedFile;
use League\Flysystem\Filesystem;
@ -24,29 +24,33 @@ class SplitUploadService
* 创建文件拆分相关信息
*
* @param int $user_id 用户ID
* @param string $fileName 上传的文件名
* @param string $fileSize 上传文件大小
* @param string $fileName 文件名
* @param int $fileSize 文件大小
* @return array|bool
*/
public function create(int $user_id, string $fileName, string $fileSize)
public function create(int $user_id, string $fileName, int $fileSize)
{
$hash_name = implode('-', [uniqid(), rand(10000000, 99999999), Str::random(6)]);
$split_num = intval(ceil($fileSize / self::SPLIT_SIZE));
$data = [];
$data['file_type'] = 1;
$data['type'] = 1;
$data['drive'] = FileDriveConstant::Local;
$data['upload_id'] = uniqid(strval(time()));
$data['user_id'] = $user_id;
$data['original_name'] = $fileName;
$data['hash_name'] = $hash_name;
$data['file_ext'] = pathinfo($fileName, PATHINFO_EXTENSION);
$data['file_size'] = $fileSize;
$data['upload_at'] = time();
$data['attr'] = new \stdClass();
$data['created_at'] = date("Y-m-d H:i:s");
$data['updated_at'] = date("Y-m-d H:i:s");
$data['path'] = sprintf("private/tmp/multipart/%s/%s.tmp", date("Ymd"), md5($data['upload_id']));
// 文件拆分数量
$data['split_num'] = $split_num;
$data['split_index'] = $split_num;
return FileSplitUpload::create($data) ? array_merge($data, ['split_size' => self::SPLIT_SIZE]) : false;
return SplitUpload::create($data) ? array_merge($data, ['split_size' => self::SPLIT_SIZE]) : false;
}
/**
@ -54,39 +58,43 @@ class SplitUploadService
*
* @param int $user_id 用户ID
* @param UploadedFile $file 文件信息
* @param string $hashName 上传临时问价hash名
* @param string $upload_id 上传临时问价hash名
* @param int $split_index 当前拆分文件索引
* @param int $fileSize 文件大小
* @return bool
*/
public function upload(int $user_id, UploadedFile $file, string $hashName, int $split_index, int $fileSize)
public function upload(int $user_id, UploadedFile $file, string $upload_id, int $split_index)
{
$fileInfo = FileSplitUpload::select(['id', 'original_name', 'split_num', 'file_ext'])
->where([['user_id', '=', $user_id], ['hash_name', '=', $hashName], ['file_type', '=', 1]])
$fileInfo = SplitUpload::select(['id', 'original_name', 'split_num', 'file_ext'])
->where([['user_id', '=', $user_id], ['upload_id', '=', $upload_id], ['type', '=', 1]])
->first();
if (!$fileInfo) return false;
$save_path = "tmp/{$hashName}/" . "{$hashName}_{$split_index}_{$fileInfo->file_ext}.tmp";
$path = sprintf("private/tmp/%s/%s/%d-%s.tmp", date("Ymd"), md5($upload_id), $split_index, $upload_id);
try {
di()->get(Filesystem::class)->write($save_path, file_get_contents($file->getRealPath()));
di()->get(Filesystem::class)->write($path, file_get_contents($file->getRealPath()));
} catch (\Exception $e) {
return false;
}
$info = FileSplitUpload::where('user_id', $user_id)->where('hash_name', $hashName)->where('split_index', $split_index)->first();
$info = SplitUpload::where('user_id', $user_id)->where('upload_id', $upload_id)->where('split_index', $split_index)->first();
if (!$info) {
return (bool)FileSplitUpload::create([
return (bool)SplitUpload::create([
'user_id' => $user_id,
'file_type' => 2,
'hash_name' => $hashName,
'type' => 2,
'drive' => FileDriveConstant::Local,
'upload_id' => $upload_id,
'original_name' => $fileInfo->original_name,
'split_index' => $split_index,
'split_num' => $fileInfo->split_num,
'save_dir' => $save_path,
'path' => $path,
'attr' => new \stdClass(),
'file_ext' => $fileInfo->file_ext,
'file_size' => $fileSize,
'upload_at' => time(),
'file_size' => $file->getSize(),
'created_at' => date("Y-m-d H:i:s"),
'updated_at' => date("Y-m-d H:i:s"),
]);
}
@ -97,46 +105,38 @@ class SplitUploadService
* 文件合并
*
* @param int $user_id 用户ID
* @param string $hash_name 上传临时问价hash名
* @param string $upload_id 上传临时问价hash名
* @return array|bool
*/
public function merge(int $user_id, string $hash_name)
public function merge(int $user_id, string $upload_id)
{
$fileInfo = FileSplitUpload::select(['id', 'original_name', 'split_num', 'file_ext', 'file_size'])
$fileInfo = SplitUpload::select(['id', 'original_name', 'split_num', 'file_ext', 'file_size', 'path'])
->where('user_id', $user_id)
->where('hash_name', $hash_name)
->where('file_type', 1)
->where('upload_id', $upload_id)
->where('type', 1)
->first();
if (!$fileInfo) return false;
$files = FileSplitUpload::where('user_id', $user_id)
->where('hash_name', $hash_name)
->where('file_type', 2)
->orderBy('split_index', 'asc')
->get(['split_index', 'save_dir'])->toArray();
$files = SplitUpload::where('user_id', $user_id)
->where('upload_id', $upload_id)
->where('type', 2)
->orderBy('split_index')
->get(['split_index', 'path'])->toArray();
if (!$files || count($files) != $fileInfo->split_num) return false;
$file_merge = "tmp/{$hash_name}/{$fileInfo->original_name}.tmp";
$filesystem = di()->get(Filesystem::class);
$root_path = $filesystem->getConfig()->get('root');
@mkdir(pathinfo("{$root_path}/{$fileInfo->path}", PATHINFO_DIRNAME));
foreach ($files as $file) {
file_put_contents(
"{$root_path}/{$file_merge}",
$filesystem->read($file['save_dir']),
FILE_APPEND
);
file_put_contents("{$root_path}/{$fileInfo->path}", $filesystem->read($file['path']), FILE_APPEND);
}
FileSplitUpload::select(['id', 'original_name', 'split_num', 'file_ext', 'file_size'])
->where('user_id', $user_id)->where('hash_name', $hash_name)
->where('file_type', 1)
->update(['save_dir' => $file_merge]);
return [
'path' => $file_merge,
'path' => $fileInfo->path,
'tmp_file_name' => "{$fileInfo->original_name}.tmp",
'original_name' => $fileInfo->original_name,
'file_size' => $fileInfo->file_size
@ -152,10 +152,11 @@ class SplitUploadService
// 24小时前
$time = time() - 60 * 60 * 24 * 1;
FileSplitUpload::where('file_type', 1)->where('upload_at', '<', $time)->select('hash_name')->chunk(100, function ($rows) {
SplitUpload::where('file_type', 1)->where('upload_at', '<', $time)->select('upload_id')->chunk(100, function ($rows) {
foreach ($rows as $row) {
@di()->get(Filesystem::class)->deleteDir("tmp/{$row->hash_name}");
@FileSplitUpload::where('hash_name', $row->hash_name)->delete();
@di()->get(Filesystem::class)->deleteDir(pathinfo($row->path, PATHINFO_DIRNAME));
@SplitUpload::where('upload_id', $row->upload_id)->delete();
}
});
}

4
app/Service/TalkMessageService.php
View File

@ -105,8 +105,9 @@ class TalkMessageService
}
$file['record_id'] = $insert->id;
$file['file_type'] = MediaTypeConstant::getMediaType($file['file_suffix']);
$file['type'] = MediaTypeConstant::getMediaType($file['suffix']);
$file['created_at'] = date('Y-m-d H:i:s');
if (!TalkRecordsFile::create($file)) {
throw new Exception('插入聊天记录(代码消息)失败...');
}
@ -114,6 +115,7 @@ class TalkMessageService
Db::commit();
} catch (Exception $e) {
Db::rollBack();
logger()->error($e->getMessage());
return false;
}