|
|
|
@ -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,'/'); |
|
|
|
|