From a1cf719d268a9d16db81ece94e75037c844f898f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 18 二月 2020 14:47:23 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/common/core/text/CharsetKit.java | 172 ++++++++++++++++++++++++++++----------------------------
1 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
index 8297661..77b1a79 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
@@ -1,86 +1,86 @@
-package com.ruoyi.common.core.text;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 瀛楃闆嗗伐鍏风被
- *
- * @author ruoyi
- */
-public class CharsetKit
-{
- /** ISO-8859-1 */
- public static final String ISO_8859_1 = "ISO-8859-1";
- /** UTF-8 */
- public static final String UTF_8 = "UTF-8";
- /** GBK */
- public static final String GBK = "GBK";
-
- /** ISO-8859-1 */
- public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
- /** UTF-8 */
- public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
- /** GBK */
- public static final Charset CHARSET_GBK = Charset.forName(GBK);
-
- /**
- * 杞崲涓篊harset瀵硅薄
- *
- * @param charset 瀛楃闆嗭紝涓虹┖鍒欒繑鍥為粯璁ゅ瓧绗﹂泦
- * @return Charset
- */
- public static Charset charset(String charset)
- {
- return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
- }
-
- /**
- * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮�
- *
- * @param source 瀛楃涓�
- * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1
- * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8
- * @return 杞崲鍚庣殑瀛楃闆�
- */
- public static String convert(String source, String srcCharset, String destCharset)
- {
- return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
- }
-
- /**
- * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮�
- *
- * @param source 瀛楃涓�
- * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1
- * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8
- * @return 杞崲鍚庣殑瀛楃闆�
- */
- public static String convert(String source, Charset srcCharset, Charset destCharset)
- {
- if (null == srcCharset)
- {
- srcCharset = StandardCharsets.ISO_8859_1;
- }
-
- if (null == destCharset)
- {
- srcCharset = StandardCharsets.UTF_8;
- }
-
- if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
- {
- return source;
- }
- return new String(source.getBytes(srcCharset), destCharset);
- }
-
- /**
- * @return 绯荤粺瀛楃闆嗙紪鐮�
- */
- public static String systemCharset()
- {
- return Charset.defaultCharset().name();
- }
-}
+package com.ruoyi.common.core.text;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import com.ruoyi.common.utils.StringUtils;
+
+/**
+ * 瀛楃闆嗗伐鍏风被
+ *
+ * @author ruoyi
+ */
+public class CharsetKit
+{
+ /** ISO-8859-1 */
+ public static final String ISO_8859_1 = "ISO-8859-1";
+ /** UTF-8 */
+ public static final String UTF_8 = "UTF-8";
+ /** GBK */
+ public static final String GBK = "GBK";
+
+ /** ISO-8859-1 */
+ public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
+ /** UTF-8 */
+ public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
+ /** GBK */
+ public static final Charset CHARSET_GBK = Charset.forName(GBK);
+
+ /**
+ * 杞崲涓篊harset瀵硅薄
+ *
+ * @param charset 瀛楃闆嗭紝涓虹┖鍒欒繑鍥為粯璁ゅ瓧绗﹂泦
+ * @return Charset
+ */
+ public static Charset charset(String charset)
+ {
+ return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
+ }
+
+ /**
+ * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮�
+ *
+ * @param source 瀛楃涓�
+ * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1
+ * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8
+ * @return 杞崲鍚庣殑瀛楃闆�
+ */
+ public static String convert(String source, String srcCharset, String destCharset)
+ {
+ return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
+ }
+
+ /**
+ * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮�
+ *
+ * @param source 瀛楃涓�
+ * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1
+ * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8
+ * @return 杞崲鍚庣殑瀛楃闆�
+ */
+ public static String convert(String source, Charset srcCharset, Charset destCharset)
+ {
+ if (null == srcCharset)
+ {
+ srcCharset = StandardCharsets.ISO_8859_1;
+ }
+
+ if (null == destCharset)
+ {
+ srcCharset = StandardCharsets.UTF_8;
+ }
+
+ if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
+ {
+ return source;
+ }
+ return new String(source.getBytes(srcCharset), destCharset);
+ }
+
+ /**
+ * @return 绯荤粺瀛楃闆嗙紪鐮�
+ */
+ public static String systemCharset()
+ {
+ return Charset.defaultCharset().name();
+ }
+}
--
Gitblit v1.9.3