From 5caa9254d999c3e4c268e7d60fb6a8fce7b551d4 Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 15 Jan 2021 17:10:57 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20#2272=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/SysFileServiceImpl.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java index 56cde4873..1db6729d6 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java @@ -16,9 +16,13 @@ */ package com.pig4cloud.pigx.admin.service.impl; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletResponse; + import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.amazonaws.services.s3.model.S3Object; @@ -33,14 +37,11 @@ import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; + import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; -import java.util.HashMap; -import java.util.Map; - /** * 文件管理 * @@ -119,13 +120,10 @@ public class SysFileServiceImpl extends ServiceImpl impl */ private void fileLog(MultipartFile file, String fileName) { SysFile sysFile = new SysFile(); - // 原文件名 - String original = CharsetUtil.convert(file.getOriginalFilename(), CharsetUtil.CHARSET_ISO_8859_1, - CharsetUtil.CHARSET_UTF_8); sysFile.setFileName(fileName); - sysFile.setOriginal(original); + sysFile.setOriginal(file.getOriginalFilename()); sysFile.setFileSize(file.getSize()); - sysFile.setType(FileUtil.extName(original)); + sysFile.setType(FileUtil.extName(file.getOriginalFilename())); sysFile.setBucketName(ossProperties.getBucketName()); sysFile.setCreateUser(SecurityUtils.getUser().getUsername()); this.save(sysFile);