From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CharsetKit.java | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CharsetKit.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CharsetKit.java
index 061485a..6063a11 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CharsetKit.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CharsetKit.java
@@ -8,8 +8,7 @@
*
* @author ruoyi
*/
-public class CharsetKit
-{
+public class CharsetKit {
/** ISO-8859-1 */
public static final String ISO_8859_1 = "ISO-8859-1";
/** UTF-8 */
@@ -18,58 +17,59 @@
public static final String GBK = "GBK";
/** ISO-8859-1 */
- public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
+ public static final Charset CHARSET_ISO_8859_1 = StandardCharsets.ISO_8859_1;
/** UTF-8 */
- public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
+ public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8;
/** GBK */
public static final Charset CHARSET_GBK = Charset.forName(GBK);
/**
* 转换为Charset对象
*
- * @param charset 字符集，为空则返回默认字符集
+ * @param charset
+ * 字符集，为空则返回默认字符集
* @return Charset
*/
- public static Charset charset(String charset)
- {
+ public static Charset charset(String charset) {
return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
}
/**
* 转换字符串的字符集编码
*
- * @param source 字符串
- * @param srcCharset 源字符集，默认ISO-8859-1
- * @param destCharset 目标字符集，默认UTF-8
+ * @param source
+ * 字符串
+ * @param srcCharset
+ * 源字符集，默认ISO-8859-1
+ * @param destCharset
+ * 目标字符集，默认UTF-8
* @return 转换后的字符集
*/
- public static String convert(String source, String srcCharset, String destCharset)
- {
+ public static String convert(String source, String srcCharset, String destCharset) {
return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
}
/**
* 转换字符串的字符集编码
*
- * @param source 字符串
- * @param srcCharset 源字符集，默认ISO-8859-1
- * @param destCharset 目标字符集，默认UTF-8
+ * @param source
+ * 字符串
+ * @param srcCharset
+ * 源字符集，默认ISO-8859-1
+ * @param destCharset
+ * 目标字符集，默认UTF-8
* @return 转换后的字符集
*/
- public static String convert(String source, Charset srcCharset, Charset destCharset)
- {
- if (null == srcCharset)
- {
+ public static String convert(String source, Charset srcCharset, Charset destCharset) {
+ if (null == srcCharset) {
srcCharset = StandardCharsets.ISO_8859_1;
}
- if (null == destCharset)
- {
+ if (null == destCharset) {
srcCharset = StandardCharsets.UTF_8;
}
- if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
- {
+ if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) {
return source;
}
return new String(source.getBytes(srcCharset), destCharset);
@@ -78,8 +78,7 @@
/**
* @return 系统字符集编码
*/
- public static String systemCharset()
- {
+ public static String systemCharset() {
return Charset.defaultCharset().name();
}
}
--
Gitblit v1.7.1