From f34a510629676ebf22d75bde2e89e2fe4a2f56be Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java
index 7cbaf3c..eaa35ef 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java
@@ -25,7 +25,7 @@
private static String PRE_URL = "software/minio/data/jfpt/animalHeat";
- private static String PRF_MINIO_URL = "jfpt/animalHeat";
+ private static String PRF_MINIO_URL = "minio/jfpt/animalHeat";
/**
* 二进制原始数据转换为图片
@@ -36,8 +36,9 @@
byte[] bytes1 = decoder.decodeBuffer(base64String);
ByteArrayInputStream bais = new ByteArrayInputStream(bytes1);
BufferedImage bi1 = ImageIO.read(bais);
- File w2 = new File("D://"+PRE_URL+StringPool.SLASH+ DateUtil.today()+StringPool.SLASH+ StringUtil.randomUUID()
- +".jpg");//可以是jpg,png,gif格式
+ String UUID = DateUtil.today()+StringPool.SLASH+ StringUtil.randomUUID();
+ //可以是jpg,png,gif格式
+ File w2 = new File("D://"+PRE_URL+StringPool.SLASH+ UUID+".jpg");
//判断父文件夹存在与否
File parentFile = w2.getParentFile();
System.out.println("parentFile = " + parentFile);
@@ -45,10 +46,10 @@
//如果不存在，则创建
parentFile.mkdirs();
}
- ImageIO.write(bi1, "jpg", w2);//不管输出什么格式图片，此处不需改动
+ //不管输出什么格式图片，此处不需改动
+ ImageIO.write(bi1, "jpg", w2);
//返回图片路径
- return PRF_MINIO_URL+ StringPool.SLASH+ DateUtil.today()+StringPool.SLASH+ StringUtil.randomUUID()
- +StringPool.DOT+ "jpg";
+ return PRF_MINIO_URL+ StringPool.SLASH+ UUID +StringPool.DOT+ "jpg";
} catch (IOException e) {
e.printStackTrace();
}
--
Gitblit v1.9.3