From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/animalheat/util/ImageUtil.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/animalheat/util/ImageUtil.java b/src/main/java/org/springblade/modules/animalheat/util/ImageUtil.java
index 238a480..7e32d0b 100644
--- a/src/main/java/org/springblade/modules/animalheat/util/ImageUtil.java
+++ b/src/main/java/org/springblade/modules/animalheat/util/ImageUtil.java
@@ -1,6 +1,7 @@
 package org.springblade.modules.animalheat.util;
 
 import jodd.util.StringPool;
+import org.apache.commons.codec.binary.Base64;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import sun.misc.BASE64Decoder;
@@ -8,9 +9,7 @@
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -54,6 +53,8 @@
 	}
 
 
+
+
 	/**
 	 * 获取base64原始数据图片的长宽
 	 * @param base64String

--
Gitblit v1.9.3