From 5fcec99e6cf7e9e059729fcb30a0dc0621462591 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Tue, 18 Apr 2023 16:07:22 +0800
Subject: [PATCH] !321 解决文件输入流为可能为空的问题 Merge pull request !321 from maochd/master
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
index 31eef05..662f817 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
@@ -66,7 +66,7 @@
if (null == destCharset)
{
- srcCharset = StandardCharsets.UTF_8;
+ destCharset = StandardCharsets.UTF_8;
}
if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
--
Gitblit v1.9.3