接口文档的支持

yzg-util-db/src/main/java/com/yanzuoguang/excel/ExcelConsole.java

@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -29,7 +30,7 @@ import java.util.regex.Pattern;
  * @author 颜佐光
  */
 public class ExcelConsole<T extends Object> implements DbRow<T> {
-    private Pattern chinese = Pattern.compile("[\u4e00-\u9fa5]");
+    private Pattern chinese = Pattern.compile("[^x00-xff]");
     /**
      * 配置信息
      */
@@ -419,8 +420,12 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
      */
     private Cell createCell(Row row, int column, String content) {
         // 获取字节数、用于设置最大宽度
-        int chinaCount = chinese.matcher(content).groupCount();
-        int bytes = (content.length() - chinaCount) + chinaCount * 2;
+        int chinaCount = 0;
+        Matcher matcher = chinese.matcher(content);
+        while (matcher.find()) {
+            chinaCount++;
+        }
+        int bytes = (content.length() - chinaCount) + (int) Math.round(chinaCount * 2);
         int maxBytes = Math.max(columnBytes.getOrDefault(column, 0), bytes);
         columnBytes.put(column, maxBytes);