From 94503ddc3958a8f437145a5dec509cea2905567c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=9B=84?= Date: Wed, 15 Mar 2023 02:34:52 +0000 Subject: [PATCH] =?UTF-8?q?update=20server/src/main/java/cn/keking/service?= =?UTF-8?q?/FileHandlerService.java.=20=E4=BF=AE=E5=A4=8Dxlsx7.4=E4=BB=A5?= =?UTF-8?q?=E4=B8=8A=E7=89=88=E6=9C=AC=20=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 高雄 --- .../src/main/java/cn/keking/service/FileHandlerService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/cn/keking/service/FileHandlerService.java b/server/src/main/java/cn/keking/service/FileHandlerService.java index 4c55204b..2702a04f 100644 --- a/server/src/main/java/cn/keking/service/FileHandlerService.java +++ b/server/src/main/java/cn/keking/service/FileHandlerService.java @@ -41,8 +41,6 @@ import java.util.Map; public class FileHandlerService { private final Logger logger = LoggerFactory.getLogger(FileHandlerService.class); - - private static final String DEFAULT_CONVERTER_CHARSET = System.getProperty("sun.jnu.encoding"); private final String fileDir = ConfigConstants.getFileDir(); private final CacheService cacheService; @@ -142,9 +140,10 @@ public class FileHandlerService { * @param outFilePath 文件绝对路径 */ public void doActionConvertedFile(String outFilePath) { + String charset = EncodingDetects.getJavaEncode(outFilePath); StringBuilder sb = new StringBuilder(); try (InputStream inputStream = new FileInputStream(outFilePath); - BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, DEFAULT_CONVERTER_CHARSET))) { + BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, charset))) { String line; while (null != (line = reader.readLine())) { if (line.contains("charset=gb2312")) {