From 8ebbd1e063a2262cd4c398d47fd4101d2e2cb9d4 Mon Sep 17 00:00:00 2001 From: Kimi Liu <839536@qq.com> Date: Tue, 4 Jun 2024 17:24:57 +0800 Subject: [PATCH 01/16] v8.0.1 --- .../extra/image/gif/AnimatedGifEncoder.java | 25 +++++++++------ bus-tracer/pom.xml | 1 - .../dubbo/com.alibaba.dubbo.rpc.Filter | 2 -- ...xz.bus.tracer.backend.TraceBackendProvider | 1 - .../META-INF/tracer/tracer.default.properties | 32 ------------------- 5 files changed, 15 insertions(+), 46 deletions(-) delete mode 100755 bus-tracer/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter delete mode 100755 bus-tracer/src/main/resources/META-INF/services/org.miaixz.bus.tracer.backend.TraceBackendProvider delete mode 100644 bus-tracer/src/main/resources/META-INF/tracer/tracer.default.properties diff --git a/bus-extra/src/main/java/org/miaixz/bus/extra/image/gif/AnimatedGifEncoder.java b/bus-extra/src/main/java/org/miaixz/bus/extra/image/gif/AnimatedGifEncoder.java index a75fc95027..8ecc69e3b2 100755 --- a/bus-extra/src/main/java/org/miaixz/bus/extra/image/gif/AnimatedGifEncoder.java +++ b/bus-extra/src/main/java/org/miaixz/bus/extra/image/gif/AnimatedGifEncoder.java @@ -9,10 +9,8 @@ import java.io.OutputStream; /** - * Class AnimatedGifEncoder - Encodes a GIF file consisting of one or - * more frames. + * Gif编码压缩 *
- * Example:
  *    AnimatedGifEncoder e = new AnimatedGifEncoder();
  *    e.start(outputFileName);
  *    e.setDelay(1000);   // 1 frame per sec
@@ -20,25 +18,32 @@
  *    e.addFrame(image2);
  *    e.finish();
  * 
- * No copyright asserted on the source code of this class. May be used - * for any purpose, however, refer to the Unisys LZW patent for restrictions - * on use of the associated LZWEncoder class. Please forward any corrections - * to questions at fmsware.com. */ - public class AnimatedGifEncoder { - protected int width; // image size + /** + * 图片帧的宽度 + */ + protected int width; + /** + * 图片帧的高度 + */ protected int height; protected Color transparent = null; // transparent color if given protected boolean transparentExactMatch = false; // transparent color will be found by looking for the closest color // or for the exact color if transparentExactMatch == true protected Color background = null; // background color if given protected int transIndex; // transparent index in color table - protected int repeat = -1; // no repeat + /** + * 重复设置,0表示无限重复 + */ + protected int repeat = -1; protected int delay = 0; // frame delay (hundredths) protected boolean started = false; // ready to output frames protected OutputStream out; + /** + * 当前帧 + */ protected BufferedImage image; // current frame protected byte[] pixels; // BGR byte array from frame protected byte[] indexedPixels; // converted frame indexed to palette diff --git a/bus-tracer/pom.xml b/bus-tracer/pom.xml index bfa876aa07..4f5cff259c 100755 --- a/bus-tracer/pom.xml +++ b/bus-tracer/pom.xml @@ -43,7 +43,6 @@ UTF-8 21 21 - 3.3.0 1.18.32 diff --git a/bus-tracer/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/bus-tracer/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter deleted file mode 100755 index c8bf79e157..0000000000 --- a/bus-tracer/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1,2 +0,0 @@ -ProviderTranceFilter=dubbo.binding.tracer.org.miaixz.bus.ProviderTraceFilter -ConsumeTraceFilter=dubbo.binding.tracer.org.miaixz.bus.ConsumerTraceFilter \ No newline at end of file diff --git a/bus-tracer/src/main/resources/META-INF/services/org.miaixz.bus.tracer.backend.TraceBackendProvider b/bus-tracer/src/main/resources/META-INF/services/org.miaixz.bus.tracer.backend.TraceBackendProvider deleted file mode 100755 index 557e76ed4e..0000000000 --- a/bus-tracer/src/main/resources/META-INF/services/org.miaixz.bus.tracer.backend.TraceBackendProvider +++ /dev/null @@ -1 +0,0 @@ -org.miaixz.bus.tracer.thread.ThreadLocalTraceBackendProvider \ No newline at end of file diff --git a/bus-tracer/src/main/resources/META-INF/tracer/tracer.default.properties b/bus-tracer/src/main/resources/META-INF/tracer/tracer.default.properties deleted file mode 100644 index a5651e11ee..0000000000 --- a/bus-tracer/src/main/resources/META-INF/tracer/tracer.default.properties +++ /dev/null @@ -1,32 +0,0 @@ -# Default configuration for Tracer. -# @see config.tracer.org.miaixz.bus.PropertiesBasedTraceFilter -tracer.default.IncomingRequest=.* -tracer.default.OutgoingResponse=.* -tracer.default.OutgoingRequest=.* -tracer.default.IncomingResponse=.* -tracer.default.AsyncDispatch=.* -tracer.default.AsyncProcess=.* -tracer.default.invocationIdLength=32 -tracer.default.sessionIdLength=32 -# HideInbound Profile -# Does not respond with a Tracer-Header in OutgoingResponses. -tracer.profile.HideInbound.OutgoingResponse= -# HideOutbound Profile -# Does not send a Tracer-Header in OutgoingRequests. -tracer.profile.HideOutbound.OutgoingRequest= -# DisableInbound Profile. -# Prevents parsing of any Tracer header from IncomingRequests and prevents responding with a Tracer-Header in OutgoingResponses. -tracer.profile.DisableInbound.IncomingRequest= -tracer.profile.DisableInbound.OutgoingResponse= -# DisableOutbound Profile. -# Prevents passing of any Tracer header in OutgoingRequests and prevents parsing of any Tracer-Header in IncomingResponses. -tracer.profile.DisableOutbound.OutgoingRequest= -tracer.profile.DisableOutbound.IncomingResponse= -# Disabled Profile -# Completely disables Tracer context processing on all channels. -tracer.profile.Disabled.IncomingRequest= -tracer.profile.Disabled.OutgoingResponse= -tracer.profile.Disabled.OutgoingRequest= -tracer.profile.Disabled.IncomingResponse= -tracer.profile.Disabled.AsyncDispatch= -tracer.profile.Disabled.AsyncProcess= From 0f291525aa1615f4877a008499228c6e3c2e8dd9 Mon Sep 17 00:00:00 2001 From: Kimi Liu <839536@qq.com> Date: Wed, 5 Jun 2024 21:09:11 +0800 Subject: [PATCH 02/16] bug fix --- .../core/lang/thread/NamedThreadFactory.java | 9 + .../org/miaixz/bus/core/text/CharsBacker.java | 2 +- .../java/org/miaixz/bus/core/xyz/CollKit.java | 3 + .../java/org/miaixz/bus/core/xyz/DateKit.java | 2 +- .../org/miaixz/bus/core/xyz/MethodKit.java | 4 +- .../org/miaixz/bus/core/xyz/ObjectKit.java | 14 + .../health/linux/hardware/LinuxSoundCard.java | 5 +- .../java/org/miaixz/bus/office/Builder.java | 167 +++++++++- .../java/org/miaixz/bus/office/Registry.java | 6 +- .../org/miaixz/bus/office/csv/CsvParser.java | 1 + .../bus/office/excel/BigExcelWriter.java | 1 + .../miaixz/bus/office/excel/ExcelBase.java | 25 +- .../miaixz/bus/office/excel/ExcelDate.java | 102 ------ .../miaixz/bus/office/excel/ExcelFileKit.java | 105 ------ .../org/miaixz/bus/office/excel/ExcelKit.java | 81 ++--- .../miaixz/bus/office/excel/ExcelPicKit.java | 126 ------- .../miaixz/bus/office/excel/ExcelWriter.java | 101 ++---- .../org/miaixz/bus/office/excel/RowKit.java | 2 + .../miaixz/bus/office/excel/cell/CellKit.java | 314 +++++++++++------- .../office/excel/cell/CellLocationKit.java | 94 ------ .../excel/cell/values/CompositeCellValue.java | 120 +++++++ .../excel/cell/values/NumericCellValue.java | 4 +- .../excel/reader/AbstractSheetReader.java | 4 +- .../office/excel/sax/Excel03SaxReader.java | 6 +- .../office/excel/sax/Excel07SaxReader.java | 4 +- .../miaixz/bus/office/excel/sax/ExcelSax.java | 14 +- .../bus/office/excel/sax/SheetRidReader.java | 15 +- .../office/excel/style/CellBorderStyle.java | 255 ++++++++++++++ .../DefaultStyleSet.java} | 124 +++---- .../CellLocation.java => style/StyleSet.java} | 94 +----- .../miaixz/bus/office/excel/style/Styles.java | 51 ++- .../defaults/DefaultSqlServerSqlParser.java | 4 +- .../main/java/org/miaixz/bus/pay/Secure.java | 2 +- .../starter/wrapper/GenieWrapperHandler.java | 2 +- 34 files changed, 974 insertions(+), 889 deletions(-) delete mode 100644 bus-office/src/main/java/org/miaixz/bus/office/excel/ExcelDate.java delete mode 100644 bus-office/src/main/java/org/miaixz/bus/office/excel/ExcelFileKit.java delete mode 100644 bus-office/src/main/java/org/miaixz/bus/office/excel/ExcelPicKit.java delete mode 100644 bus-office/src/main/java/org/miaixz/bus/office/excel/cell/CellLocationKit.java create mode 100644 bus-office/src/main/java/org/miaixz/bus/office/excel/cell/values/CompositeCellValue.java create mode 100644 bus-office/src/main/java/org/miaixz/bus/office/excel/style/CellBorderStyle.java rename bus-office/src/main/java/org/miaixz/bus/office/excel/{StyleSet.java => style/DefaultStyleSet.java} (83%) rename bus-office/src/main/java/org/miaixz/bus/office/excel/{cell/CellLocation.java => style/StyleSet.java} (58%) diff --git a/bus-core/src/main/java/org/miaixz/bus/core/lang/thread/NamedThreadFactory.java b/bus-core/src/main/java/org/miaixz/bus/core/lang/thread/NamedThreadFactory.java index c607a96a80..952ac09905 100644 --- a/bus-core/src/main/java/org/miaixz/bus/core/lang/thread/NamedThreadFactory.java +++ b/bus-core/src/main/java/org/miaixz/bus/core/lang/thread/NamedThreadFactory.java @@ -66,6 +66,15 @@ public class NamedThreadFactory implements ThreadFactory { */ private final UncaughtExceptionHandler handler; + /** + * 构造 + * + * @param prefix 线程名前缀 + */ + public NamedThreadFactory(String prefix) { + this(prefix, true); + } + /** * 构造 * diff --git a/bus-core/src/main/java/org/miaixz/bus/core/text/CharsBacker.java b/bus-core/src/main/java/org/miaixz/bus/core/text/CharsBacker.java index a40d3e79b7..b2071863c7 100644 --- a/bus-core/src/main/java/org/miaixz/bus/core/text/CharsBacker.java +++ b/bus-core/src/main/java/org/miaixz/bus/core/text/CharsBacker.java @@ -605,7 +605,7 @@ public static boolean containsAny(final CharSequence text, final char... args) { } /** - * 检查指定字符串中是否只包含给定的字符
+ * 检查指定字符串中是否只包含给定的字符 * 这里的containsOnly并不是必须全部给定的args都需要有,而是一个子集。 * args是个限定集合,检查字符串中的字符是否在这个限定集合中。 *