From 125018df1d8df24c57c8b228a5e47e68294c5a6f Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sat, 24 Nov 2018 20:38:03 +0800 Subject: [PATCH] start 4.1.2 --- common/pom.xml | 8 +++++- .../common/ueditor/upload/BinaryUploader.java | 2 +- modules/core/pom.xml | 2 +- modules/template/pom.xml | 2 +- parent/pom.xml | 3 ++- root/pom.xml | 2 +- .../org.eclipse.wst.common.component | 8 +++--- web/pom.xml | 2 +- .../views/modules/test/testTreeForm.html | 27 +++++++++---------- 9 files changed, 30 insertions(+), 26 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 1a703d19..ad7ceb0e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT ../parent/pom.xml @@ -150,6 +150,12 @@ thumbnailator ${thumbnailator.version} + + + com.twelvemonkeys.imageio + imageio-jpeg + ${twelvemonkeys.version} + com.bladejava diff --git a/common/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java b/common/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java index a76a4041..b8d3fc00 100644 --- a/common/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java +++ b/common/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java @@ -118,8 +118,8 @@ public class BinaryUploader { // 过滤掉gif图片，因为gif图片转换后会出现黑色背景的情况（gif基本也没有比较大的图片）。 if (StringUtils.inString(FileUtils.getFileExtension(physicalPath), "png","jpg","jpeg","bmp","ico")){ - Builder file = Thumbnails.of(physicalPath); BufferedImage bufferedImage = ImageIO.read(new File(physicalPath)); + Builder file = Thumbnails.of(bufferedImage); if (bufferedImage != null){ if (bufferedImage.getWidth() <= width){ file.width(bufferedImage.getWidth()); diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 20816e79..ba81b26b 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT ../../parent/pom.xml diff --git a/modules/template/pom.xml b/modules/template/pom.xml index 82021660..238af636 100644 --- a/modules/template/pom.xml +++ b/modules/template/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT ../../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index cda48d4f..6c0ba80c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.jeesite jeesite-parent - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT pom JeeSite Parent @@ -34,6 +34,7 @@ 1.21 2.11.0 0.4.8 + 3.4.1 1.1.0 0.1.5 3.3.2 diff --git a/root/pom.xml b/root/pom.xml index 943e8701..f53472a9 100644 --- a/root/pom.xml +++ b/root/pom.xml @@ -5,7 +5,7 @@ com.jeesite jeesite-root - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT pom JeeSite diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component index adc9a32a..4e44282e 100644 --- a/web/.settings/org.eclipse.wst.common.component +++ b/web/.settings/org.eclipse.wst.common.component @@ -1,15 +1,15 @@ - + uses - + uses - + uses - + uses diff --git a/web/pom.xml b/web/pom.xml index bc0f9b90..a14c17c5 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT ../parent/pom.xml diff --git a/web/src/main/resources/views/modules/test/testTreeForm.html b/web/src/main/resources/views/modules/test/testTreeForm.html index 1f0f443a..5e3cb307 100644 --- a/web/src/main/resources/views/modules/test/testTreeForm.html +++ b/web/src/main/resources/views/modules/test/testTreeForm.html @@ -23,30 +23,18 @@ class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/> - - -
+
- <#form:hidden path="isNewRecord"/> <#form:input path="treeCode" maxlength="64" readonly="${!testTree.isNewRecord}" class="form-control required abc"/>
-
-
-
- -
- <#form:input path="treeSort" class="form-control required digits"/> -
-
-
- + +
@@ -56,6 +44,15 @@ <#form:input path="treeName" maxlength="200" class="form-control required"/>
+
+
+
+ +
+ <#form:input path="treeSort" class="form-control required digits"/> +
+