修复 全局限流key会多出一个"-" 将其移动到IP后面 去除多余的空格

RuoYi

2021-09-18 d24e551894e04a557adbcfffddd5cf0966f38e2f

 src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -60,7 +60,7 @@
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import com.ruoyi.common.core.text.Convert;

import com.ruoyi.common.exception.CustomException;

import com.ruoyi.common.exception.UtilException;

import com.ruoyi.common.utils.DateUtils;

import com.ruoyi.common.utils.DictUtils;

import com.ruoyi.common.utils.StringUtils;

@@ -195,11 +195,11 @@
        Map<String, PictureData> pictures;

        if (isXSSFWorkbook)

        {

            pictures = getSheetPictrues07((XSSFSheet) sheet, (XSSFWorkbook) wb);

            pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb);

        }

        else

        {

            pictures = getSheetPictrues03((HSSFSheet) sheet, (HSSFWorkbook) wb);

            pictures = getSheetPictures03((HSSFSheet) sheet, (HSSFWorkbook) wb);

        }

        // 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1

        int rows = sheet.getLastRowNum();

@@ -450,7 +450,7 @@
        catch (Exception e)

        {

            log.error("导出Excel异常{}", e.getMessage());

            throw new CustomException("导出Excel失败，请联系网站管理员！");

            throw new UtilException("导出Excel失败，请联系网站管理员！");

        }

        finally

        {

@@ -1196,7 +1196,7 @@
     * @param workbook 工作簿对象

     * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData

     */

    public static Map<String, PictureData> getSheetPictrues03(HSSFSheet sheet, HSSFWorkbook workbook)

    public static Map<String, PictureData> getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook)

    {

        Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();

        List<HSSFPictureData> pictures = workbook.getAllPictures();

@@ -1229,7 +1229,7 @@
     * @param workbook 工作簿对象

     * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData

     */

    public static Map<String, PictureData> getSheetPictrues07(XSSFSheet sheet, XSSFWorkbook workbook)

    public static Map<String, PictureData> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook)

    {

        Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();

        for (POIXMLDocumentPart dr : sheet.getRelations())