From e9a3a76d2affb84ab9609cf3a4534bdfc87bfb04 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 17 May 2023 15:50:35 +0800
Subject: [PATCH] 正式环境

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java |   59 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
index c0a5ade..9910b02 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
@@ -14,6 +14,7 @@
 import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
 import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
 import cc.mrbird.febs.mall.vo.AdminMallGoodsTreeVo;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
@@ -30,6 +31,7 @@
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -53,36 +55,37 @@
         if (file.isEmpty()) {
             new FebsResponse().message("上传文件为空");
         }
-
         String base64EncoderImg = "";
-        try {
-            //输出到BufferedImage
-            BufferedImage bufferedImage = Thumbnails.of(file.getInputStream())
-                    // 图片大小(长宽)压缩比例 从0-1,1表示原图
-                    .scale(1f)
-                    // 图片质量压缩比例 从0-1,越接近1质量越好
-                    .outputQuality(0.5f)
-                    .asBufferedImage();
-            //对内存中的图片文件进行Base64处理
-            ByteArrayOutputStream newBaos = new ByteArrayOutputStream();//io流
-            ImageIO.write(bufferedImage, "jpg", newBaos);//写入流中
-            byte[] bytes = newBaos.toByteArray();//转换成字节
-            base64EncoderImg = new BASE64Encoder().encode(bytes);
-//            base64EncoderImg = URLEncoder.encode(new BASE64Encoder().encode(bytes), "UTF-8");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        //文件加密
-//        BASE64Encoder base64Encoder =new BASE64Encoder();
-//        String base64EncoderImg = null;
-//        try {
-//            base64EncoderImg = base64Encoder.encode(file.getBytes());
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-
+        BASE64Encoder base64Encoder =new BASE64Encoder();
+        List<String> imageFuffixStr = CollUtil.toList(StrUtil.split(file.getOriginalFilename(), "."));
         String imageFuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+        if("jpg".equals(imageFuffixStr.get(1))){
+            try {
+                //输出到BufferedImage
+                BufferedImage bufferedImage = Thumbnails.of(file.getInputStream())
+                        // 图片大小(长宽)压缩比例 从0-1,1表示原图
+                        .scale(1f)
+                        // 图片质量压缩比例 从0-1,越接近1质量越好
+                        .outputQuality(0.5f)
+                        .asBufferedImage();
+                //对内存中的图片文件进行Base64处理
+                ByteArrayOutputStream newBaos = new ByteArrayOutputStream();//io流
+                ImageIO.write(bufferedImage, "jpg", newBaos);//写入流中
+                byte[] bytes = newBaos.toByteArray();//转换成字节
+                base64EncoderImg = base64Encoder.encode(bytes);
+//            base64EncoderImg = URLEncoder.encode(new BASE64Encoder().encode(bytes), "UTF-8");
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }else{
+            try {
+                base64EncoderImg = base64Encoder.encode(file.getBytes());
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        //文件加密
+//        String imageFuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
 //      String imageFuffix = ".png";
         String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageFuffix;
         String imageName = "uploadeFile/" + imageNames;

--
Gitblit v1.9.1