From 05617ff3567b5d574c5bc4ac8a52c88640a911e8 Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Thu, 29 Jun 2023 10:26:36 +0800
Subject: [PATCH] fix code

---
 .../hutool/core/text/CharSequenceUtil.java    | 45 +++++++++++++++++++
 .../hutool/json/convert/JSONConverter.java    |  4 +-
 .../org/dromara/hutool/json/JSONUtilTest.java |  7 +++
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java
index 37ff073c9..ab5d317dd 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java
@@ -32,7 +32,11 @@ import org.dromara.hutool.core.util.ByteUtil;
 import org.dromara.hutool.core.util.CharsetUtil;
 import org.dromara.hutool.core.util.ObjUtil;
 
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
 import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
 import java.text.MessageFormat;
 import java.text.Normalizer;
 import java.util.HashSet;
@@ -3183,6 +3187,47 @@ public class CharSequenceUtil extends StrValidator {
 		}
 		return sub(string, 0, length) + "...";
 	}
+
+	/**
+	 * 截断字符串，使用其按照指定编码为字节后不超过maxBytes长度
+	 *
+	 * @param str            原始字符串
+	 * @param charset        指定编码
+	 * @param maxBytesLength 最大字节数
+	 * @param factor         速算因子，取该编码下单个字符的最大可能字节数
+	 * @param appendDots     截断后是否追加省略号(...)
+	 * @return 限制后的长度
+	 */
+	public static String limitByteLength(final String str, final Charset charset, final int maxBytesLength,
+										 final int factor, final boolean appendDots) {
+		//字符数*速算因子<=最大字节数
+		if (str == null || str.length() * factor <= maxBytesLength) {
+			return str;
+		}
+		final byte[] sba = str.getBytes(charset);
+		if (sba.length <= maxBytesLength) {
+			return str;
+		}
+		//限制字节数
+		final int limitBytes;
+		if (appendDots) {
+			limitBytes = maxBytesLength - "...".getBytes(charset).length;
+		} else {
+			limitBytes = maxBytesLength;
+		}
+		final ByteBuffer bb = ByteBuffer.wrap(sba, 0, limitBytes);
+		final CharBuffer cb = CharBuffer.allocate(limitBytes);
+		final CharsetDecoder decoder = charset.newDecoder();
+		//忽略被截断的字符
+		decoder.onMalformedInput(CodingErrorAction.IGNORE);
+		decoder.decode(bb, cb, true);
+		decoder.flush(cb);
+		final String result = new String(cb.array(), 0, cb.position());
+		if (appendDots) {
+			return result + "...";
+		}
+		return result;
+	}
 	// endregion
 
 	// region ----- firstXXX
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java b/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java
index 44e8a0866..ca407f0af 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java
@@ -124,7 +124,7 @@ public class JSONConverter implements Converter {
 	 *     <li>String: 转换为相应的对象，"和'包围的字符串返回原字符串，""返回{@code null}</li>
 	 *     <li>Array、Iterable、Iterator：转换为JSONArray</li>
 	 *     <li>Bean对象：转为JSONObject</li>
-	 *     <li>Number：返回原对象</li>
+	 *     <li>Number、Boolean：返回原对象</li>
 	 *     <li>null：返回{@code null}</li>
 	 * </ul>
 	 *
@@ -138,7 +138,7 @@ public class JSONConverter implements Converter {
 			return null;
 		}
 		final JSON json;
-		if (obj instanceof JSON || obj instanceof Number) {
+		if (obj instanceof JSON || obj instanceof Number || obj instanceof Boolean) {
 			return obj;
 		} else if (obj instanceof CharSequence) {
 			final String jsonStr = StrUtil.trim((CharSequence) obj);
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java
index 3ef1a19d5..33c1a00a4 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java
@@ -2,6 +2,7 @@ package org.dromara.hutool.json;
 
 import org.dromara.hutool.core.collection.ListUtil;
 import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.lang.Console;
 import org.dromara.hutool.core.map.MapUtil;
 import org.dromara.hutool.core.math.NumberUtil;
 import org.dromara.hutool.json.serialize.JSONStringer;
@@ -334,4 +335,10 @@ public class JSONUtilTest {
 		private Byte[] d = new Byte[0];
 		private Byte[] e = new Byte[1];
 	}
+
+	@Test
+	void toJsonStrOfBooleanTest() {
+		final String jsonStr = JSONUtil.toJsonStr(true);
+		Assertions.assertEquals("true", jsonStr);
+	}
 }