From 600d002cdb5482a28980c730f75052bc7e8c1d3e Mon Sep 17 00:00:00 2001
From: pig666 <pig666@qq.com>
Date: Tue, 10 Nov 2020 17:03:35 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20#2002=20=E3=80=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E3=80=91=20=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E4=B8=AD=E6=96=87=E5=90=8D=E7=A7=B0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E6=BA=90=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 2b0dd0b6e..56cde4873 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
@@ -18,6 +18,7 @@ package com.pig4cloud.pigx.admin.service.impl;
 
 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;
@@ -119,7 +120,8 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
 	private void fileLog(MultipartFile file, String fileName) {
 		SysFile sysFile = new SysFile();
 		// 原文件名
-		String original = file.getOriginalFilename();
+		String original = CharsetUtil.convert(file.getOriginalFilename(), CharsetUtil.CHARSET_ISO_8859_1,
+				CharsetUtil.CHARSET_UTF_8);
 		sysFile.setFileName(fileName);
 		sysFile.setOriginal(original);
 		sysFile.setFileSize(file.getSize());