Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/fangkeji

liujie

2026-07-22 782ef4493c10caa79bf2cfe401f84c93b4aa1ec8

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/tool/ImageUtil.java

@@ -1,14 +1,19 @@
package com.ruoyi.web.controller.tool;

import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.utils.file.FileUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Base64;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;

import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.file.Files;

@Slf4j
@Component
@@ -25,20 +30,21 @@
            return null;
        }

        String imagePath = RuoYiConfig.getUploadPath() + imageUrl.replace("/profile/upload", "");

        InputStream inputStream = null;
        ByteArrayOutputStream outputStream = null;

        try {
            // 1. 创建URL连接
            URL url = new URL(imageUrl);
            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
            connection.setRequestMethod("GET");
            connection.setConnectTimeout(5000);
            connection.setReadTimeout(10000);
            connection.setDoInput(true);
            // 1. 获取本地文件
            File imageFile = new File(imagePath);
            if (!imageFile.exists()) {
                log.error("图片文件不存在：{}", imagePath);
                return null;
            }

            // 2. 获取图片数据
            inputStream = connection.getInputStream();
            // 2. 读取图片数据
            inputStream = Files.newInputStream(imageFile.toPath());
            outputStream = new ByteArrayOutputStream();

            byte[] buffer = new byte[8192];
@@ -51,16 +57,12 @@
            byte[] imageBytes = outputStream.toByteArray();
            String base64 = Base64.encodeBase64String(imageBytes);

            // 4. 根据图片类型添加前缀
            String contentType = connection.getContentType();
            if (contentType != null && contentType.startsWith("image/")) {
                return "data:" + contentType + ";base64," + base64;
            }

            return "data:image/jpeg;base64," + base64;
            // 4. 根据文件扩展名添加前缀
            String contentType = getContentType(imagePath);
            return "data:" + contentType + ";base64," + base64;

        } catch (Exception e) {
            log.error("图片转Base64失败，URL：{}", imageUrl, e);
            log.error("本地图片转Base64失败，路径：{}", imagePath, e);
            return null;
        } finally {
            try {
@@ -75,4 +77,30 @@
            }
        }
    }

    /**
     * 根据文件扩展名获取Content-Type
     */
    private static String getContentType(String imagePath) {
        if (StringUtils.isEmpty(imagePath)) {
            return "image/jpeg";
        }
        String ext = imagePath.substring(imagePath.lastIndexOf(".") + 1).toLowerCase();
        switch (ext) {
            case "png":
                return "image/png";
            case "gif":
                return "image/gif";
            case "bmp":
                return "image/bmp";
            case "webp":
                return "image/webp";
            case "svg":
                return "image/svg+xml";
            case "jpg":
            case "jpeg":
            default:
                return "image/jpeg";
        }
    }
}