diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index bc6c31663..2aaa35294 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -951,7 +951,7 @@ class SystemController extends AbstractController * * @apiParam {File} image post-图片对象 * @apiParam {String} [image64] post-图片base64（与'image'二选一） - * @apiParam {String} filename post-文件名 + * @apiParam {String} [filename] post-文件名 * @apiParam {Number} [width] 压缩图片宽（默认0） * @apiParam {Number} [height] 压缩图片高（默认0） * @apiParam {String} [whcut] 压缩方式（等比缩放） @@ -1112,9 +1112,9 @@ class SystemController extends AbstractController * @apiGroup system * @apiName fileupload * - * @apiParam {String} [image64] 图片base64 - * @apiParam {String} filename 文件名 - * @apiParam {String} [files] 文件名 + * @apiParam {File} files 文件名 + * @apiParam {String} [image64] 图片base64（与'files'二选一） + * @apiParam {String} [filename] 文件名 * * @apiSuccess {Number} ret 返回状态码（1正确、0错误） * @apiSuccess {String} msg 返回信息（错误描述） diff --git a/app/Module/Base.php b/app/Module/Base.php index 1d01c491e..d18526f10 100755 --- a/app/Module/Base.php +++ b/app/Module/Base.php @@ -1872,18 +1872,18 @@ class Base if (!in_array($extension, ['mp3', 'wav'])) { return Base::retError('语音格式错误'); } - $fileName = 'record_' . md5($base64) . '.' . $extension; + $saveName = 'record_' . md5($base64) . '.' . $extension; $fileDir = $param['path']; $filePath = public_path($fileDir); Base::makeDir($filePath); - if (file_put_contents($filePath . $fileName, base64_decode(str_replace($res[1], '', $base64)))) { - $fileSize = filesize($filePath . $fileName); + if (file_put_contents($filePath . $saveName, base64_decode(str_replace($res[1], '', $base64)))) { + $fileSize = filesize($filePath . $saveName); $array = [ - "name" => $fileName, //原文件名 + "name" => $saveName, //原文件名 "size" => Base::twoFloat($fileSize / 1024, true), //大小KB - "file" => $filePath . $fileName, //文件的完整路径 "D:\www....KzZ.jpg" - "path" => $fileDir . $fileName, //相对路径 "uploads/pic....KzZ.jpg" - "url" => Base::fillUrl($fileDir . $fileName), //完整的URL "https://.....hhsKzZ.jpg" + "file" => $filePath . $saveName, //文件的完整路径 "D:\www....KzZ.jpg" + "path" => $fileDir . $saveName, //相对路径 "uploads/pic....KzZ.jpg" + "url" => Base::fillUrl($fileDir . $saveName), //完整的URL "https://.....hhsKzZ.jpg" "ext" => $extension, //文件后缀名 ]; return Base::retSuccess('success', $array); @@ -1894,8 +1894,23 @@ class Base /** * image64图片保存 - * @param array $param [ image64=带前缀的base64, path=>文件路径, fileName=>文件名称, scale=>[压缩原图宽,高, 压缩方式], autoThumb=>false不要自动生成缩略图, 'quality'=>压缩图片质量(默认：0不压缩) ] - * @return array [name=>文件名, size=>文件大小(单位KB),file=>绝对地址, path=>相对地址, url=>全路径地址, ext=>文件后缀名] + * @param array $param [ + image64=带前缀的base64, + path=>文件路径, + fileName=>文件名称, + saveName=>保存文件名称, + scale=>[压缩原图宽,高, 压缩方式], + autoThumb=>false不要自动生成缩略图, + quality=>压缩图片质量(默认：0不压缩) + ] + * @return array [ + name=>文件名, + size=>文件大小(单位KB), + file=>绝对地址, + path=>相对地址, + url=>全路径地址, + ext=>文件后缀名 + ] */ public static function image64save($param) { @@ -1906,8 +1921,8 @@ class Base return Base::retError('图片格式错误'); } $scaleName = ""; - if ($param['fileName']) { - $fileName = basename($param['fileName']); + if ($param['saveName']) { + $saveName = basename($param['saveName']); } else { if ($param['scale'] && is_array($param['scale'])) { list($width, $height) = $param['scale']; @@ -1918,21 +1933,21 @@ class Base } } } - $fileName = 'paste_' . md5($imgBase64) . '.' . $extension; + $saveName = 'paste_' . md5($imgBase64) . '.' . $extension; $scaleName = md5_file($imgBase64) . $scaleName . '.' . $extension; } $fileDir = $param['path']; $filePath = public_path($fileDir); - $fileFullPath = $filePath . $fileName; + $fileFullPath = $filePath . $saveName; Base::makeDir($filePath); if (file_put_contents($fileFullPath, base64_decode(str_replace($res[1], '', $imgBase64)))) { $fileSize = filesize($fileFullPath); $array = [ - "name" => $fileName, //原文件名 + "name" => $param['fileName'] ?: $saveName, //原文件名 "size" => Base::twoFloat($fileSize / 1024, true), //大小KB "file" => $fileFullPath, //文件的完整路径 "D:\www....KzZ.jpg" - "path" => $fileDir . $fileName, //相对路径 "uploads/pic....KzZ.jpg" - "url" => Base::fillUrl($fileDir . $fileName), //完整的URL "https://.....hhsKzZ.jpg" + "path" => $fileDir . $saveName, //相对路径 "uploads/pic....KzZ.jpg" + "url" => Base::fillUrl($fileDir . $saveName), //完整的URL "https://.....hhsKzZ.jpg" "thumb" => '', //缩略图（预览图） "https://.....hhsKzZ.jpg_thumb.jpg" "width" => -1, //图片宽度 "height" => -1, //图片高度 @@ -1963,10 +1978,10 @@ class Base // 重命名 if ($scaleName) { $scaleName = str_replace(['{WIDTH}', '{HEIGHT}'], [$array['width'], $array['height']], $scaleName); - if (rename($array['file'], Base::rightDelete($array['file'], $fileName) . $scaleName)) { - $array['file'] = Base::rightDelete($array['file'], $fileName) . $scaleName; - $array['path'] = Base::rightDelete($array['path'], $fileName) . $scaleName; - $array['url'] = Base::rightDelete($array['url'], $fileName) . $scaleName; + if (rename($array['file'], Base::rightDelete($array['file'], $saveName) . $scaleName)) { + $array['file'] = Base::rightDelete($array['file'], $saveName) . $scaleName; + $array['path'] = Base::rightDelete($array['path'], $saveName) . $scaleName; + $array['url'] = Base::rightDelete($array['url'], $saveName) . $scaleName; } } } @@ -2000,6 +2015,7 @@ class Base file=>Request::file, path=>文件路径, fileName=>文件名称, + saveName=>保存文件名称, scale=>[压缩原图宽,高, 压缩方式], size=>限制大小KB, autoThumb=>false不要自动生成缩略图, @@ -2091,10 +2107,10 @@ class Base } } $scaleName = ""; - if ($param['fileName'] === true) { - $fileName = $file->getClientOriginalName(); - } elseif ($param['fileName']) { - $fileName = basename($param['fileName']); + if ($param['saveName'] === true) { + $saveName = $file->getClientOriginalName(); + } elseif ($param['saveName']) { + $saveName = basename($param['saveName']); } else { if ($param['scale'] && is_array($param['scale'])) { list($width, $height) = $param['scale']; @@ -2105,19 +2121,19 @@ class Base } } } - $fileName = md5_file($file); + $saveName = md5_file($file); $scaleName = md5_file($file) . $scaleName; if ($extension) { - $fileName = $fileName . '.' . $extension; + $saveName = $saveName . '.' . $extension; $scaleName = $scaleName . '.' . $extension; } } // - $file->move(public_path($param['path']), $fileName); + $file->move(public_path($param['path']), $saveName); // - $path = $param['path'] . $fileName; + $path = $param['path'] . $saveName; $array = [ - "name" => $file->getClientOriginalName(), //原文件名 + "name" => $param['fileName'] ?: $file->getClientOriginalName(), //原文件名 "size" => Base::twoFloat($fileSize / 1024, true), //大小KB "file" => public_path($path), //文件的完整路径 "D:\www....KzZ.jpg" "path" => $path, //相对路径 "uploads/pic....KzZ.jpg" @@ -2207,10 +2223,10 @@ class Base // 重命名 if ($scaleName) { $scaleName = str_replace(['{WIDTH}', '{HEIGHT}'], [$array['width'], $array['height']], $scaleName); - if (rename($array['file'], Base::rightDelete($array['file'], $fileName) . $scaleName)) { - $array['file'] = Base::rightDelete($array['file'], $fileName) . $scaleName; - $array['path'] = Base::rightDelete($array['path'], $fileName) . $scaleName; - $array['url'] = Base::rightDelete($array['url'], $fileName) . $scaleName; + if (rename($array['file'], Base::rightDelete($array['file'], $saveName) . $scaleName)) { + $array['file'] = Base::rightDelete($array['file'], $saveName) . $scaleName; + $array['path'] = Base::rightDelete($array['path'], $saveName) . $scaleName; + $array['url'] = Base::rightDelete($array['url'], $saveName) . $scaleName; } } } diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue index de695a6e5..bd2be2d53 100755 --- a/resources/assets/js/pages/manage/components/ChatInput/index.vue +++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue @@ -796,6 +796,9 @@ export default { this.showEmoji = false; this.emojiQuickShow = false; // + if (this.isAiBot) { + return + } $A.eeuiAppGetLatestPhoto().then(({thumbnail, original}) => { const width = 120; const height = Math.min(150, thumbnail.height / (thumbnail.width / width)); diff --git a/resources/assets/sass/pages/components/chat-input.scss b/resources/assets/sass/pages/components/chat-input.scss index b40297d15..7c8def09b 100755 --- a/resources/assets/sass/pages/components/chat-input.scss +++ b/resources/assets/sass/pages/components/chat-input.scss @@ -741,16 +741,15 @@ align-items: flex-start; flex-direction: column; padding-bottom: 12px; - margin-bottom: 4px; - border-bottom: 1px solid #e8e8e8; border-radius: 0; - line-height: 30px; &:hover { background-color: transparent; } > span { + line-height: 34px; + padding-bottom: 2px; font-size: 12px; opacity: 0.8; } diff --git a/resources/mobile b/resources/mobile index 7979e0b57..c20b18934 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit 7979e0b577906aeb1ec1d56fca8725f167f0d8cd +Subproject commit c20b18934d5ec24d41b0533b355fd15acd623f89