diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index fa3701e37..fd9ca6510 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -984,7 +984,7 @@ class SystemController extends AbstractController
                 ];
                 //
                 $extension = pathinfo($dirPath . $filename, PATHINFO_EXTENSION);
-                if (in_array($extension, array('gif', 'jpg', 'jpeg', 'webp', 'png', 'bmp'))) {
+                if (in_array($extension, ['png', 'jpg', 'jpeg', 'gif', 'webp', 'bmp'])) {
                     if ($extension = Base::getThumbExt($dirPath . $filename)) {
                         $array['thumb'] .= "_thumb.{$extension}";
                     } else {
diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php
index c0beb8543..18877977a 100644
--- a/app/Models/WebSocketDialog.php
+++ b/app/Models/WebSocketDialog.php
@@ -716,7 +716,7 @@ class WebSocketDialog extends AbstractModel
      *
      * @param User $user 发起会话的会员
      * @param array $dialogIds 对话id
-     * @param file $files 文件对象
+     * @param file|mixed $files 文件对象
      * @param string $image64 base64文件
      * @param string $fileName 文件名称
      * @param int $replyId 恢复id
diff --git a/app/Module/Base.php b/app/Module/Base.php
index 170ff0027..187f0fb12 100755
--- a/app/Module/Base.php
+++ b/app/Module/Base.php
@@ -2177,19 +2177,10 @@ class Base
                 if ($param['scale'] && is_array($param['scale'])) {
                     list($width, $height) = $param['scale'];
                     if (($width > 0 && $array['width'] > $width) || ($height > 0 && $array['height'] > $height)) {
-                        $cut = ($width > 0 && $height > 0) ? 'cover' : 'percentage';
-                        $cut = $param['scale'][2] ?? $cut;
                         // 图片裁剪
-                        $tmpFile = $array['file'] . '_tmp.jpg';
-                        if (Image::thumbImage($array['file'], $tmpFile, $width, $height, 90, $cut)) {
-                            $tmpSize = filesize($tmpFile);
-                            if ($tmpSize > $fileSize) {
-                                @unlink($tmpFile);
-                            } else {
-                                @unlink($array['file']);
-                                rename($tmpFile, $array['file']);
-                            }
-                        }
+                        $cutMode = ($width > 0 && $height > 0) ? 'cover' : 'percentage';
+                        $cutMode = $param['scale'][2] ?? $cutMode;
+                        Image::thumbImage($array['file'], $array['file'], $width, $height, 90, $cutMode);
                         // 更新图片尺寸
                         $paramet = getimagesize($array['file']);
                         $array['width'] = $paramet[0];
@@ -2416,19 +2407,10 @@ class Base
                 if ($param['scale'] && is_array($param['scale'])) {
                     list($width, $height) = $param['scale'];
                     if (($width > 0 && $array['width'] > $width) || ($height > 0 && $array['height'] > $height)) {
-                        $cut = ($width > 0 && $height > 0) ? 'cover' : 'percentage';
-                        $cut = $param['scale'][2] ?? $cut;
                         // 图片裁剪
-                        $tmpFile = $array['file'] . '_tmp.jpg';
-                        if (Image::thumbImage($array['file'], $tmpFile, $width, $height, 90, $cut)) {
-                            $tmpSize = filesize($tmpFile);
-                            if ($tmpSize > $fileSize) {
-                                @unlink($tmpFile);
-                            } else {
-                                @unlink($array['file']);
-                                rename($tmpFile, $array['file']);
-                            }
-                        }
+                        $cutMode = ($width > 0 && $height > 0) ? 'cover' : 'percentage';
+                        $cutMode = $param['scale'][2] ?? $cutMode;
+                        Image::thumbImage($array['file'], $array['file'], $width, $height, 90, $cutMode);
                         // 更新图片尺寸
                         $paramet = getimagesize($array['file']);
                         $array['width'] = $paramet[0];
@@ -2517,12 +2499,12 @@ class Base
      */
     public static function getThumbExt($file): string
     {
-        if (file_exists($file . '_thumb.jpeg')) {
-            return 'jpeg';
+        if (file_exists($file . '_thumb.png')) {
+            return 'png';
         } elseif (file_exists($file . '_thumb.jpg')) {
             return 'jpg';
-        } elseif (file_exists($file . '_thumb.png')) {
-            return 'png';
+        } elseif (file_exists($file . '_thumb.jpeg')) {
+            return 'jpeg';
         } else {
             return '';
         }
diff --git a/app/Module/Image.php b/app/Module/Image.php
index e0d8f6384..b2130a678 100644
--- a/app/Module/Image.php
+++ b/app/Module/Image.php
@@ -240,7 +240,7 @@ class Image
             if ($quality > 0) {
                 Image::compressImage($savePath, null, $quality);
             }
-            if (filesize($savePath) >= filesize($imagePath)) {
+            if ($savePath != $imagePath && filesize($savePath) >= filesize($imagePath)) {
                 unlink($savePath);
                 symlink(basename($imagePath), $savePath);
             }
diff --git a/resources/assets/js/components/ImgUpload.vue b/resources/assets/js/components/ImgUpload.vue
index b08907925..4f904e01a 100755
--- a/resources/assets/js/components/ImgUpload.vue
+++ b/resources/assets/js/components/ImgUpload.vue
@@ -2,7 +2,7 @@
     <div class="common-img-update">
         <div v-if="type !== 'callback'" class="imgcomp-upload-list" v-for="item in uploadList">
             <template v-if="item.status === 'finished'">
-                <div class="imgcomp-upload-img" v-bind:style="{ 'background-image': 'url(' + __thumb(item.thumb) + ')' }"></div>
+                <div class="imgcomp-upload-img" v-bind:style="{ 'background-image': 'url(' + backgroundImage(item.thumb) + ')' }"></div>
                 <div class="imgcomp-upload-list-cover">
                     <Icon type="ios-eye-outline" @click.native="handleView(item)"></Icon>
                     <Icon type="ios-trash-outline" @click.native="handleRemove(item)"></Icon>
@@ -373,7 +373,7 @@
                 }
             },
 
-            __thumb(url) {
+            backgroundImage(url) {
                 if ($A.strExists(url, "?", false)) {
                     return $A.mainUrl(url) + "&__thumb=true";
                 }else{
diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue
index 091afd7ce..b67d3ee13 100644
--- a/resources/assets/js/pages/manage/approve/details.vue
+++ b/resources/assets/js/pages/manage/approve/details.vue
@@ -480,7 +480,10 @@ export default {
         },
         // 获取图片缩略图
         getPictureThumb(src) {
-            return src + '_thumb.' + src.split('.').pop()
+            if (!/\.(png|jpg|jpeg)$/.test(src)) {
+                return src
+            }
+            return $A.thumbRestore(src) + '_thumb.' + src.split('.').pop()
         },
         // 打开图片
         onViewPicture(currentUrl, type) {
diff --git a/resources/assets/js/pages/manage/components/DialogView/file.vue b/resources/assets/js/pages/manage/components/DialogView/file.vue
index 57cb59138..1a9d0e72b 100644
--- a/resources/assets/js/pages/manage/components/DialogView/file.vue
+++ b/resources/assets/js/pages/manage/components/DialogView/file.vue
@@ -49,10 +49,10 @@ export default {
             return {};
         },
 
-        imageStyle({width, height, ext}, type = 'style') {
+        imageStyle({width, height, thumb}, type = 'style') {
             if (width && height) {
                 const ratioExceed = $A.imageRatioExceed(width, height, 3)
-                if (['png', 'jpg', 'jpeg'].includes(ext) && ratioExceed > 0) {
+                if (/\.(png|jpg|jpeg)$/.test(thumb) && ratioExceed > 0) {
                     if (width > height) {
                         width = height * ratioExceed;
                     } else {
@@ -89,9 +89,9 @@ export default {
             return {};
         },
 
-        imageSrc({width, height, ext, thumb}) {
+        imageSrc({width, height, thumb}) {
             const ratioExceed = $A.imageRatioExceed(width, height, 3)
-            if (['png', 'jpg', 'jpeg'].includes(ext) && ratioExceed > 0) {
+            if (/\.(png|jpg|jpeg)$/.test(thumb) && ratioExceed > 0) {
                 thumb = $A.thumbRestore(thumb) + `/crop/ratio:${ratioExceed},percentage:320x0`;
             }
             return thumb;
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 4fbc3bc11..f44f2e287 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -2874,7 +2874,7 @@ export default {
 
                     case "newTask":
                         let content = $A.formatMsgBasic(this.operateItem.msg.text)
-                        content = content.replace(/<img[^>]*?src=(["'])(.*?)(_thumb\.jpg)*\1[^>]*?>/g, `<img src="$2">`)
+                        content = content.replace(/<img[^>]*?src=(["'])(.*?)(_thumb\.(png|jpg|jpeg))*\1[^>]*?>/g, `<img src="$2">`)
                         content = content.replace(/<li\s+data-list="checked">/g, `<li class="tox-checklist--checked">`)
                         content = content.replace(/<li\s+data-list="unchecked">/g, `<li>`)
                         content = content.replace(/<ol[^>]*>([\s\S]*?)<\/ol>/g, `<ul class="tox-checklist">$1</ul>`)