From 96286178ee1c257c130cb2ad964a781f36c4eee5 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 10 五月 2023 16:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/qxueyou/scc/base/util/ImageUtils.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/qxueyou/scc/base/util/ImageUtils.java b/src/main/java/com/qxueyou/scc/base/util/ImageUtils.java
index c52db28..7414f0a 100644
--- a/src/main/java/com/qxueyou/scc/base/util/ImageUtils.java
+++ b/src/main/java/com/qxueyou/scc/base/util/ImageUtils.java
@@ -30,50 +30,50 @@
 			Ellipse2D.Double shapeEllipse = new Ellipse2D.Double(0, 0, Math.min(bi1.getWidth(),bi1.getHeight()),
 					Math.min(bi1.getWidth(),bi1.getHeight()));
 
-			// 设置透明背景
+			// 璁剧疆閫忔槑鑳屾櫙
 			BufferedImage bi2 = new BufferedImage(bi1.getWidth(),
 					bi1.getHeight(), BufferedImage.TRANSLUCENT);
 			Graphics2D g2 = bi2.createGraphics();
 			g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 			g2.setClip(shapeEllipse);
 
-			// 画图片
+			// 鐢诲浘鐗�
 			g2.drawImage(bi1, 0, 0, null);
 			g2.dispose();
 
 			ImageIO.write(bi2, "PNG", file);
 
 		} catch (IOException e) {
-			log.error("图片处理失败", e);
+			log.error("鍥剧墖澶勭悊澶辫触", e);
 		}
 	}
-	//矩形头像
+	//鐭╁舰澶村儚
 	public static void doRectangle(File file){
 		try {
 			BufferedImage bi1 = ImageIO.read(file);
 			Rectangle2D.Double shapeRectangle = new Rectangle2D.Double(0, 0, Math.min(bi1.getWidth(),bi1.getHeight()),
 					Math.min(bi1.getWidth(),bi1.getHeight()));
 
-			// 设置透明背景
+			// 璁剧疆閫忔槑鑳屾櫙
 			BufferedImage bi2 = new BufferedImage(bi1.getWidth(),
 					bi1.getHeight(), BufferedImage.TRANSLUCENT);
 			Graphics2D g2 = bi2.createGraphics();
 			g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 			g2.setClip(shapeRectangle);
 
-			// 画图片
+			// 鐢诲浘鐗�
 			g2.drawImage(bi1, 0, 0, null);
 			g2.dispose();
 
 			ImageIO.write(bi2, "PNG", file);
 
 		} catch (IOException e) {
-			log.error("图片处理失败", e);
+			log.error("鍥剧墖澶勭悊澶辫触", e);
 		}
 	}
 	
 	/**
-	 * 为图片生成缩略图
+	 * 涓哄浘鐗囩敓鎴愮缉鐣ュ浘
 	 * @param file
 	 */
 	public static void decreaseSizeImage(File file) {
@@ -87,12 +87,12 @@
 			int height = bi1.getHeight();
 			
 
-			// 设置透明背景
+			// 璁剧疆閫忔槑鑳屾櫙
 			BufferedImage bi2 = new BufferedImage(getPriviewImageWidth(width,height),
 					getPriviewImageHeight(width,height), bi1.getType());
 			Graphics2D g2 = bi2.createGraphics();
 
-			// 画图片
+			// 鐢诲浘鐗�
 			Image image = bi1.getScaledInstance(getPriviewImageWidth(width,height), getPriviewImageHeight(width,height), Image.SCALE_DEFAULT);  
 			g2.drawImage(image, 0, 0, null);
 			g2.dispose();
@@ -100,7 +100,7 @@
 			ImageIO.write(bi2, "PNG", createPreviewFile(file));
 
 		} catch (IOException e) {
-			log.error("图片处理失败", e);
+			log.error("鍥剧墖澶勭悊澶辫触", e);
 		}
 	}
 	
@@ -136,7 +136,7 @@
 		}
 	}
 	
-	public static String encodeImgageToBase64(String imgStr) { // 将图片文件转化为字节数组字符串,并对其进行Base64编码处理  
+	public static String encodeImgageToBase64(String imgStr) { // 灏嗗浘鐗囨枃浠惰浆鍖栦负瀛楄妭鏁扮粍瀛楃涓诧紝骞跺鍏惰繘琛孊ase64缂栫爜澶勭悊  
         
 		
 		ByteArrayOutputStream outputStream = null;  
@@ -150,9 +150,9 @@
         } catch (IOException e) {  
             e.printStackTrace();  
         }  
-        // 对字节数组Base64编码  
+        // 瀵瑰瓧鑺傛暟缁凚ase64缂栫爜  
         BASE64Encoder encoder = new BASE64Encoder();  
-        return encoder.encode(outputStream.toByteArray());// 返回Base64编码过的字节数组字符串  
+        return encoder.encode(outputStream.toByteArray());// 杩斿洖Base64缂栫爜杩囩殑瀛楄妭鏁扮粍瀛楃涓�  
     } 
 	
 	public static void main(String[] args){

--
Gitblit v1.8.0