ouyang/lsky-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 修复相同 md5 的文件，删除一条记录会将文件一并删除的 bug.

Browse Source
This commit is contained in:
WispX
2020-03-04 20:45:48 +08:00
parent 28d6f5d670
commit aa43585622
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/index/controller/User.php
+18 -2
View File
@@ -55,7 +55,10 @@ class User extends Base
if (is_array($id)) {
$images = Images::all($id);
foreach ($images as &$value) {
$deletes[$value->strategy][] = $value->pathname;
// 查找是否有相同 md5 的文件记录，有的话则只删除记录不删除文件
if (!$this->exists($value)) {
$deletes[$value->strategy][] = $value->pathname;
}
$value->delete();
unset($value);
}
@@ -64,7 +67,9 @@ class User extends Base
if (!$image) {
throw new Exception('没有找到该图片数据');
}
$deletes[$image->strategy][] = $image->pathname;
if (!$this->exists($image)) {
$deletes[$image->strategy][] = $image->pathname;
}
$image->delete();
}
// 是否开启软删除(开启了只删除记录，不删除文件)
@@ -211,6 +216,17 @@ class User extends Base
}
}
/**
* 检测除本身图片以外的记录是否存在
*
* @param Images $image
* @return float|string
*/
private function exists(Images $image)
{
return Images::where('id', 'neq', $image->id)->where('md5', $image->md5)->count();
}
private function getDeleteFoldersAndImages($folderId, &$folders, &$images)
{
$folderList = Folders::where('parent_id', $folderId)->column('id');
application/index/controller/admin/Images.php
+18 -2
View File
@@ -80,7 +80,10 @@ class Images extends Base
if (is_array($id)) {
$images = ImagesModel::all($id);
foreach ($images as &$value) {
$deletes[$value->strategy][] = $value->pathname;
// 查找是否有相同 md5 的文件记录，有的话则只删除记录不删除文件
if (!$this->exists($value)) {
$deletes[$value->strategy][] = $value->pathname;
}
$value->delete();
unset($value);
}
@@ -89,7 +92,9 @@ class Images extends Base
if (!$image) {
throw new Exception('没有找到该图片数据');
}
$deletes[$image->strategy][] = $image->pathname;
if (!$this->exists($image)) {
$deletes[$image->strategy][] = $image->pathname;
}
$image->delete();
}
// 是否开启软删除(开启了只删除记录，不删除文件)
@@ -123,6 +128,17 @@ class Images extends Base
}
}
/**
* 检测除本身图片以外的记录是否存在
*
* @param ImagesModel $image
* @return float|string
*/
private function exists(ImagesModel $image)
{
return ImagesModel::where('id', 'neq', $image->id)->where('md5', $image->md5)->count();
}
public function getIpInfo()
{
if ($this->request->isPost()) {