From f068030caf86c87e4b6a4c359c9a347920562ab0 Mon Sep 17 00:00:00 2001 From: zhouping Date: Tue, 10 Mar 2020 18:14:40 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-27578=20=E3=80=9010.0=E5=9B=9E=E5=BD=92?= =?UTF-8?q?=E3=80=91=E6=A8=A1=E7=89=88=E5=AF=BC=E5=87=BAsvg=200kb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step2-jdk11.gradle | 3 ++- build.third_step2.gradle | 1 + .../third/alibaba/druid/pool/DruidAbstractDataSource.java | 2 +- .../META-INF/services/javax.xml.transform.URIResolver | 1 + ...org.apache.xmlgraphics.image.loader.spi.ImageConverter | 4 ++++ ...apache.xmlgraphics.image.loader.spi.ImageLoaderFactory | 6 ++++++ ...org.apache.xmlgraphics.image.loader.spi.ImagePreloader | 8 ++++++++ .../org.apache.xmlgraphics.image.writer.ImageWriter | 5 +++++ 8 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/javax.xml.transform.URIResolver create mode 100644 fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter create mode 100644 fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory create mode 100644 fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader create mode 100644 fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter diff --git a/build.third_step2-jdk11.gradle b/build.third_step2-jdk11.gradle index b7e7c1092..d0eadb737 100644 --- a/build.third_step2-jdk11.gradle +++ b/build.third_step2-jdk11.gradle @@ -85,7 +85,8 @@ def resourceDirs = [ "${srcDir}/fine-redisson/src", "${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/java", "${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/resources", - "${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/java" + "${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/java", + "${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/resources" ] sourceSets.main.java.outputDir = file('build/classes/2') diff --git a/build.third_step2.gradle b/build.third_step2.gradle index 2bd6311c5..bb1206816 100644 --- a/build.third_step2.gradle +++ b/build.third_step2.gradle @@ -123,6 +123,7 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){ with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/java") with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/resources") with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/java") + with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/resources") into "${classesDir}" } } diff --git a/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidAbstractDataSource.java b/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidAbstractDataSource.java index b905427db..d1e669618 100644 --- a/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidAbstractDataSource.java @@ -1361,7 +1361,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements return true; } catch (Exception ex) { - // skip + LOG.debug(ex.getMessage(), ex); return false; } finally { if (sqlFile != null) { diff --git a/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/javax.xml.transform.URIResolver b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/javax.xml.transform.URIResolver new file mode 100644 index 000000000..9202f619a --- /dev/null +++ b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/javax.xml.transform.URIResolver @@ -0,0 +1 @@ +org.apache.xmlgraphics.util.uri.DataURIResolver diff --git a/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter new file mode 100644 index 000000000..24b0d8b04 --- /dev/null +++ b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter @@ -0,0 +1,4 @@ +org.apache.xmlgraphics.image.loader.impl.ImageConverterBuffered2Rendered +org.apache.xmlgraphics.image.loader.impl.ImageConverterG2D2Bitmap +org.apache.xmlgraphics.image.loader.impl.ImageConverterBitmap2G2D +org.apache.xmlgraphics.image.loader.impl.ImageConverterRendered2PNG diff --git a/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory new file mode 100644 index 000000000..e1efed257 --- /dev/null +++ b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory @@ -0,0 +1,6 @@ +org.apache.xmlgraphics.image.loader.impl.imageio.ImageLoaderFactoryImageIO +org.apache.xmlgraphics.image.loader.impl.ImageLoaderFactoryRaw +org.apache.xmlgraphics.image.loader.impl.ImageLoaderFactoryRawCCITTFax +org.apache.xmlgraphics.image.loader.impl.ImageLoaderFactoryEPS +org.apache.xmlgraphics.image.loader.impl.ImageLoaderFactoryInternalTIFF +org.apache.xmlgraphics.image.loader.impl.ImageLoaderFactoryPNG diff --git a/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader new file mode 100644 index 000000000..e2c8c004b --- /dev/null +++ b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader @@ -0,0 +1,8 @@ +org.apache.xmlgraphics.image.loader.impl.PreloaderTIFF +org.apache.xmlgraphics.image.loader.impl.PreloaderGIF +org.apache.xmlgraphics.image.loader.impl.PreloaderJPEG +org.apache.xmlgraphics.image.loader.impl.PreloaderBMP +org.apache.xmlgraphics.image.loader.impl.PreloaderEMF +org.apache.xmlgraphics.image.loader.impl.PreloaderEPS +org.apache.xmlgraphics.image.loader.impl.imageio.PreloaderImageIO +org.apache.xmlgraphics.image.loader.impl.PreloaderRawPNG \ No newline at end of file diff --git a/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter new file mode 100644 index 000000000..9f67d4a6c --- /dev/null +++ b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter @@ -0,0 +1,5 @@ +org.apache.xmlgraphics.image.writer.internal.PNGImageWriter +org.apache.xmlgraphics.image.writer.internal.TIFFImageWriter +org.apache.xmlgraphics.image.writer.imageio.ImageIOPNGImageWriter +org.apache.xmlgraphics.image.writer.imageio.ImageIOTIFFImageWriter +org.apache.xmlgraphics.image.writer.imageio.ImageIOJPEGImageWriter