From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/common/utils/ImageUtils.java |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 41 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/common/utils/ImageUtils.java b/src/main/java/org/springblade/common/utils/ImageUtils.java
index dafb8fd..a0af0b6 100644
--- a/src/main/java/org/springblade/common/utils/ImageUtils.java
+++ b/src/main/java/org/springblade/common/utils/ImageUtils.java
@@ -8,6 +8,7 @@
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -15,6 +16,44 @@
 
 
 public class ImageUtils {
+
+	/**
+	 * 几种常见的图片格式
+	 */
+	public static String IMAGE_TYPE_GIF = "gif";// 图形交换格式
+	public static String IMAGE_TYPE_JPG = "jpg";// 联合照片专家组
+	public static String IMAGE_TYPE_JPEG = "jpeg";// 联合照片专家组
+	public static String IMAGE_TYPE_BMP = "bmp";// 英文Bitmap(位图)的简写,它是Windows操作系统中的标准图像文件格式
+	public static String IMAGE_TYPE_PNG = "png";// 可移植网络图形
+	public static String IMAGE_TYPE_PSD = "psd";// Photoshop的专用格式Photoshop
+
+
+	/**
+	 * 程序入口:用于测试
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		// -图像类型转换:
+		ImageUtils.convert("D:/IMG_20180811_222034.png", "jpg", "D:/test.jpg");//测试OK
+	}
+
+	/**
+	 * 图像类型转换:GIF->JPG、GIF->PNG、PNG->JPG、PNG->GIF(X)、BMP->PNG
+	 * @param srcImageFile 源图像地址
+	 * @param formatName 包含格式非正式名称的 String:如JPG、JPEG、GIF等
+	 * @param destImageFile 目标图像地址
+	 */
+	public static void convert(String srcImageFile, String formatName, String destImageFile) {
+		try {
+			File f = new File(srcImageFile);
+			f.canRead();
+			f.canWrite();
+			BufferedImage src = ImageIO.read(f);
+			ImageIO.write(src, formatName, new File(destImageFile));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 
 
 
@@ -125,7 +164,8 @@
 			inputStream.close();
 			bos.close();
 			buffer = bos.toByteArray();
-			base64EncoderImg = "data:image/png;base64," +Base64.encodeBase64String(buffer);
+//			base64EncoderImg = "data:image/png;base64," +Base64.encodeBase64String(buffer);
+			base64EncoderImg = Base64.encodeBase64String(buffer);
 			// 返回
 			return base64EncoderImg;
 		} catch (IOException e) {

--
Gitblit v1.9.3