From 7f435ddec44753192b062400ecc94a463d5383fb Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Thu, 4 Sep 2025 16:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=83=85=E5=B7=B2=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/controller/Upload.php | 5 +++--
 app/lang/en_us.php               | 3 ++-
 app/lang/zh_cn.php               | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/common/controller/Upload.php b/app/common/controller/Upload.php
index 87c10d4..d30b7de 100644
--- a/app/common/controller/Upload.php
+++ b/app/common/controller/Upload.php
@@ -327,7 +327,7 @@ class Upload extends BaseController
             }
             $prefix='emoji/'.$uid.'/';
             $name=str_replace('.'.$info['ext'],'',$info['name']);
-            $fileInfo=false;//FileModel::where(['md5'=>$info['md5'],'user_id'=>$uid])->find();
+            $fileInfo=FileModel::where(['md5'=>$info['md5'],'user_id'=>$uid])->find();
             // 判断文件是否存在，如果有则不再上传
             if(!$fileInfo){
                 $newName   = uniqid() . '.' . $info['ext'];
@@ -350,7 +350,8 @@ class Upload extends BaseController
                 $fileInfo=new FileModel;
                 $fileInfo->save($ret);
             }else{
-                $object = $fileInfo->src;
+                //$object = $fileInfo->src;
+                return shutdown(lang('file.emojiExist'));
             }
             // 把左边的/去掉再加上，避免有些有/有些没有
             $object='/'.ltrim($object,'/');
diff --git a/app/lang/en_us.php b/app/lang/en_us.php
index c458064..7d32a73 100644
--- a/app/lang/en_us.php
+++ b/app/lang/en_us.php
@@ -154,7 +154,8 @@ return [
     'file' => [  
         'preview' => "Preview file",  
         'browserDown' => "Please use the browser to download",  
-        'exist' => "The file does not exist", // Note: This might be a duplicate of 'preview' and could be replaced with a more specific message  
+        'exist' => "The file does not exist", // Note: This might be a duplicate of 'preview' and could be replaced with a more specific message
+        'emojiExist'=>"The emoji already exists",
         'uploadLimit' => "File size cannot exceed {:size}MB",  
         'typeNotSupport' => "File format is not supported",
         'error'=>"Upload failed",
diff --git a/app/lang/zh_cn.php b/app/lang/zh_cn.php
index bb05f71..4129958 100644
--- a/app/lang/zh_cn.php
+++ b/app/lang/zh_cn.php
@@ -154,6 +154,7 @@ return [
         'preview'=>"预览文件",
         'browserDown'=>"请使用浏览器下载",
         'exist'=>"文件不存在",
+        'emojiExist'=>"表情已存在",
         'uploadLimit'=>"文件大小不能超过{:size}MB",
         'typeNotSupport'=>"文件格式不支持",
         'error'=>"上传失败",