更新相关依赖版本

优化 baseURL 的获取逻辑 (#376 )
添加通过 http header X-Base-Url 来动态传入 baseUrl 的功能 (#252 )
2026-03-30 11:24:35 +00:00 · 2022-08-01 15:09:57 +08:00 · 2022-08-01 14:09:41 +08:00 · 2022-08-01 14:01:04 +08:00 · 2022-07-29 23:08:21 +08:00 · 2022-07-25 18:33:57 +08:00
13 changed files with 260 additions and 149 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -10,9 +10,34 @@

    <properties>
        <java.version>1.8</java.version>
+
        <spring.boot.version>2.4.2</spring.boot.version>
+        <poi.version>5.2.2</poi.version>
+        <xdocreport.version>1.0.6</xdocreport.version>
+        <xstream.version>1.4.19</xstream.version>
+        <junrar.version>7.4.1</junrar.version>
+        <redisson.version>3.2.0</redisson.version>
+        <sevenzipjbinding.version>16.02-2.01</sevenzipjbinding.version>
+        <tukaani.version>1.8</tukaani.version>
+        <jchardet.version>1.0</jchardet.version>
+        <antlr.version>2.7.7</antlr.version>
+        <concurrentlinkedhashmap.version>1.4.2</concurrentlinkedhashmap.version>
+        <rocksdb.version>5.17.2</rocksdb.version>
+        <pdfbox.version>2.0.26</pdfbox.version>
+        <galimatias.version>0.2.1</galimatias.version>
+        <bytedeco.version>1.5.2</bytedeco.version>
+        <opencv.version>4.1.2-1.5.2</opencv.version>
+        <openblas.version>0.3.6-1.5.1</openblas.version>
+        <ffmpeg.version>4.2.1-1.5.2</ffmpeg.version>
+        <itext.version>2.1.7</itext.version>
+        <commons-cli.version>1.2</commons-cli.version>
+        <commons-net.version>3.6</commons-net.version>
+        <commons-lang3.version>3.7</commons-lang3.version>
+        <commons-compress.version>1.21</commons-compress.version>
+
        <maven.compiler.source>${java.version}</maven.compiler.source>
        <maven.compiler.target>${java.version}</maven.compiler.target>
+
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
    </properties>
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -55,22 +55,22 @@
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi</artifactId>
-            <version>3.17</version>
+            <version>${poi.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-scratchpad</artifactId>
-            <version>3.17</version>
+            <version>${poi.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
+            <version>${poi.version}</version>
        </dependency>
        <dependency>
            <groupId>fr.opensagres.xdocreport</groupId>
            <artifactId>org.apache.poi.xwpf.converter.core</artifactId>
-            <version>1.0.5</version>
+            <version>${xdocreport.version}</version>
            <exclusions>
                <exclusion>
                    <artifactId>poi</artifactId>
@@ -81,12 +81,12 @@
        <dependency>
            <groupId>fr.opensagres.xdocreport</groupId>
            <artifactId>org.apache.poi.xwpf.converter.xhtml</artifactId>
-            <version>1.0.5</version>
+            <version>${xdocreport.version}</version>
        </dependency>
        <dependency>
            <groupId>fr.opensagres.xdocreport</groupId>
            <artifactId>fr.opensagres.xdocreport.document</artifactId>
-            <version>1.0.5</version>
+            <version>${xdocreport.version}</version>
        </dependency>
        <!-- poi start -->

@@ -94,89 +94,89 @@
        <dependency>
            <groupId>net.sf.sevenzipjbinding</groupId>
            <artifactId>sevenzipjbinding</artifactId>
-            <version>16.02-2.01</version>
+            <version>${sevenzipjbinding.version}</version>
        </dependency>
        <dependency>
            <groupId>net.sf.sevenzipjbinding</groupId>
            <artifactId>sevenzipjbinding-all-platforms</artifactId>
-            <version>16.02-2.01</version>
+            <version>${sevenzipjbinding.version}</version>
        </dependency>

        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
+            <version>${commons-lang3.version}</version>
        </dependency>
        <dependency>
            <groupId>org.redisson</groupId>
            <artifactId>redisson</artifactId>
-            <version>3.2.0</version>
+            <version>${redisson.version}</version>
        </dependency>

        <!-- 解压(apache) -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-compress</artifactId>
-            <version>1.21</version>
+            <version>${commons-compress.version}</version>
        </dependency>
        <!-- 解压(rar)-->
        <dependency>
            <groupId>com.github.junrar</groupId>
            <artifactId>junrar</artifactId>
-            <version>4.0.0</version>
+            <version>${junrar.version}</version>
        </dependency>
        <!-- 解压(7z)-->
        <dependency>
            <groupId>org.tukaani</groupId>
            <artifactId>xz</artifactId>
-            <version>1.8</version>
+            <version>${tukaani.version}</version>
        </dependency>
        <dependency>
            <groupId>net.sourceforge.jchardet</groupId>
            <artifactId>jchardet</artifactId>
-            <version>1.0</version>
+            <version>${jchardet.version}</version>
        </dependency>
        <dependency>
            <groupId>antlr</groupId>
            <artifactId>antlr</artifactId>
-            <version>2.7.7</version>
+            <version>${antlr.version}</version>
        </dependency>
        <dependency>
            <groupId>commons-cli</groupId>
            <artifactId>commons-cli</artifactId>
-            <version>1.2</version>
+            <version>${commons-cli.version}</version>
        </dependency>

        <!-- FTP -->
        <dependency>
            <groupId>commons-net</groupId>
            <artifactId>commons-net</artifactId>
-            <version>3.6</version>
+            <version>${commons-net.version}</version>
        </dependency>
        <dependency>
            <groupId>com.thoughtworks.xstream</groupId>
            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
+            <version>${xstream.version}</version>
        </dependency>
        <dependency>
            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
            <artifactId>concurrentlinkedhashmap-lru</artifactId>
-            <version>1.4.2</version>
+            <version>${concurrentlinkedhashmap.version}</version>
        </dependency>
        <dependency>
            <groupId>org.rocksdb</groupId>
            <artifactId>rocksdbjni</artifactId>
-            <version>5.17.2</version>
+            <version>${rocksdb.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>pdfbox</artifactId>
-            <version>2.0.24</version>
+            <version>${pdfbox.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>pdfbox-tools</artifactId>
-            <version>2.0.15</version>
+            <version>${pdfbox.version}</version>
        </dependency>
        <dependency>
            <groupId>com.aspose</groupId>
@@ -197,62 +197,62 @@
        <dependency>
            <groupId>io.mola.galimatias</groupId>
            <artifactId>galimatias</artifactId>
-            <version>0.2.1</version>
+            <version>${galimatias.version}</version>
        </dependency>

        <!-- 以下是bytedeco 基于opencv ffmpeg封装的javacv，用于视频处理 -->
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>javacv</artifactId>
-            <version>1.5.2</version>
+            <version>${bytedeco.version}</version>
        </dependency>
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>javacpp</artifactId>
-            <version>1.5.2</version>
+            <version>${bytedeco.version}</version>
        </dependency>

        <!-- 此版本中主要兼容linux和windows系统，如需兼容其他系统平台，请引入对应依赖即可 -->
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>opencv</artifactId>
-            <version>4.1.2-1.5.2</version>
+            <version>${opencv.version}</version>
            <classifier>linux-x86_64</classifier>
        </dependency>
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>opencv</artifactId>
-            <version>4.1.2-1.5.2</version>
+            <version>${opencv.version}</version>
            <classifier>windows-x86_64</classifier>
        </dependency>
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>openblas</artifactId>
-            <version>0.3.6-1.5.1</version>
+            <version>${openblas.version}</version>
            <classifier>linux-x86_64</classifier>
        </dependency>
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>openblas</artifactId>
-            <version>0.3.6-1.5.1</version>
+            <version>${openblas.version}</version>
            <classifier>windows-x86_64</classifier>
        </dependency>
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>ffmpeg</artifactId>
-            <version>4.2.1-1.5.2</version>
+            <version>${ffmpeg.version}</version>
            <classifier>linux-x86_64</classifier>
        </dependency>
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>ffmpeg</artifactId>
-            <version>4.2.1-1.5.2</version>
+            <version>${ffmpeg.version}</version>
            <classifier>windows-x86_64</classifier>
        </dependency>
        <dependency>
            <groupId>com.lowagie</groupId>
            <artifactId>itext</artifactId>
-            <version>2.1.7</version>
+            <version>${itext.version}</version>
        </dependency>

        <dependency>
--- a/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
@@ -48,8 +48,7 @@ public class SimTextFilePreviewImpl implements FilePreview {
    private String textData(String baseUrll) throws IOException {
        File file = new File(baseUrll);
        if(!file.exists() || file.length() == 0) {
-            String line="";
-            return line;
+            return "";
        }else {
            String charset = EncodingDetects.getJavaEncode(baseUrll);
            System.out.println(charset);
--- a/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java
@@ -8,6 +8,8 @@ import cn.keking.utils.ConvertPicUtil;
 import cn.keking.utils.DownloadUtils;
 import cn.keking.utils.WebUtils;
 import cn.keking.web.filter.BaseUrlFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
@@ -18,12 +20,15 @@ import java.util.List;

 /**
 * tiff 图片文件处理
+ *
 * @author kl (http://kailing.pub)
 * @since 2021/2/8
 */
@Service
 public class TiffFilePreviewImpl implements FilePreview {

+    private final static Logger logger = LoggerFactory.getLogger(TiffFilePreviewImpl.class);
+
    private final PictureFilePreviewImpl pictureFilePreview;
    private static final String INITIALIZE_MEMORY_SIZE = "initializeMemorySize";
    //默认初始化 50MB 内存
@@ -43,25 +48,25 @@ public class TiffFilePreviewImpl implements FilePreview {
            tifPreviewType = tifOnLinePreviewType;
        }

-        if("tif".equalsIgnoreCase(tifPreviewType)){
+        if ("tif".equalsIgnoreCase(tifPreviewType)) {

-            pictureFilePreview.filePreviewHandle(url,model,fileAttribute);
-            String fileSize = WebUtils.getUrlParameterReg(url,INITIALIZE_MEMORY_SIZE);
-            if(StringUtils.hasText(fileSize)){
-                model.addAttribute(INITIALIZE_MEMORY_SIZE,fileSize);
-            }else {
-                model.addAttribute(INITIALIZE_MEMORY_SIZE,Long.toString(INITIALIZE_MEMORY_SIZE_VALUE_DEFAULT));
+            pictureFilePreview.filePreviewHandle(url, model, fileAttribute);
+            String fileSize = WebUtils.getUrlParameterReg(url, INITIALIZE_MEMORY_SIZE);
+            if (StringUtils.hasText(fileSize)) {
+                model.addAttribute(INITIALIZE_MEMORY_SIZE, fileSize);
+            } else {
+                model.addAttribute(INITIALIZE_MEMORY_SIZE, Long.toString(INITIALIZE_MEMORY_SIZE_VALUE_DEFAULT));
            }
            return TIFF_FILE_PREVIEW_PAGE;

-        }else if("jpg".equalsIgnoreCase(tifPreviewType) || "pdf".equalsIgnoreCase(tifPreviewType)){
+        } else if ("jpg".equalsIgnoreCase(tifPreviewType) || "pdf".equalsIgnoreCase(tifPreviewType)) {
            String inputFileName = url.substring(url.lastIndexOf("/") + 1);
            String inputFileNamePrefix = inputFileName.substring(0, inputFileName.lastIndexOf("."));

            String strLocalTif = fileDir + inputFileName;
            File fileTiff = new File(strLocalTif);
            // 如果本地不存在这个tif文件，则下载
-            if(!fileTiff.exists()){
+            if (!fileTiff.exists()) {
                ReturnResponse<String> response = DownloadUtils.downLoad(fileAttribute, inputFileName);
                if (response.isFailure()) {
                    return NOT_SUPPORTED_FILE_PAGE;
@@ -69,22 +74,23 @@ public class TiffFilePreviewImpl implements FilePreview {
            }

            String baseUrl = BaseUrlFilter.getBaseUrl();
-            if("pdf".equalsIgnoreCase(tifPreviewType)){
+            if ("pdf".equalsIgnoreCase(tifPreviewType)) {
                // 以PDF模式预览的过程
                File filePdf = new File(fileDir + inputFileNamePrefix + ".pdf");
                // 如果本地不存在对应的pdf，则调用转换过程。否则直接用现有的pdf文件
-                if(!filePdf.exists()){
+                if (!filePdf.exists()) {
                    filePdf = ConvertPicUtil.convertTif2Pdf(strLocalTif, fileDir + inputFileNamePrefix + ".pdf");
                }

                // 如果pdf已经存在，则将url路径加入到对象中，返回给页面
-                if(filePdf.exists()){
+                assert filePdf != null;
+                if (filePdf.exists()) {
                    String pdfUrl = baseUrl + inputFileNamePrefix + ".pdf";
                    model.addAttribute("pdfUrl", pdfUrl);

                    return PDF_FILE_PREVIEW_PAGE;
                }
-            }else{
+            } else {
                // 以JPG模式预览的过程
                String strJpgFilePathName = fileDir + inputFileNamePrefix + ".jpg";
                // 将tif转换为jpg，返回转换后的文件路径、文件名的list
@@ -92,7 +98,7 @@ public class TiffFilePreviewImpl implements FilePreview {
                // 将返回页面的图片url的list对象
                List<String> listImageUrls = new ArrayList<>();
                // 循环，拼装url的list对象
-                for(String strJpg : listPic2Jpg){
+                for (String strJpg : listPic2Jpg) {
                    listImageUrls.add(baseUrl + strJpg);
                }

@@ -101,8 +107,8 @@ public class TiffFilePreviewImpl implements FilePreview {
            }

            // 转换后的tif没用了，可以删掉了
-            if(fileTiff.exists()){
-                fileTiff.delete();
+            if (fileTiff.exists() && !fileTiff.delete()) {
+                logger.error("{} 清理失败", strLocalTif);
            }

            return PICTURE_FILE_PREVIEW_PAGE;
--- a/server/src/main/java/cn/keking/utils/ConvertPicUtil.java
+++ b/server/src/main/java/cn/keking/utils/ConvertPicUtil.java
@@ -27,6 +27,7 @@ public class ConvertPicUtil {

    /**
     * Tif 转  JPG。
+     *
     * @param strInputFile  输入文件的路径和文件名
     * @param strOutputFile 输出文件的路径和文件名
     * @return boolean 是否转换成功
@@ -60,8 +61,8 @@ public class ConvertPicUtil {
            int intTifCount = imageDecoder.getNumPages();
            logger.info("该tif文件共有【" + intTifCount + "】页");

-            String strJpgPath = "";
-            String strJpgUrl = "";
+            String strJpgPath;
+            String strJpgUrl;
            if (intTifCount == 1) {
                // 如果是单页tif文件，则转换的目标文件夹就在指定的位置
                strJpgPath = strOutputFile.substring(0, strOutputFile.lastIndexOf("/"));
@@ -72,17 +73,17 @@ public class ConvertPicUtil {

            // 处理目标文件夹，如果不存在则自动创建
            File fileJpgPath = new File(strJpgPath);
-            if (!fileJpgPath.exists()) {
-                fileJpgPath.mkdirs();
+            if (!fileJpgPath.exists() && !fileJpgPath.mkdirs()) {
+                logger.error("{} 创建失败", strJpgPath);
            }

            // 循环，处理每页tif文件，转换为jpg
            for (int i = 0; i < intTifCount; i++) {
-                String strJpg = "";
-                if(intTifCount == 1){
+                String strJpg;
+                if (intTifCount == 1) {
                    strJpg = strJpgPath + "/" + strFilePrefix + ".jpg";
                    strJpgUrl = strFilePrefix + ".jpg";
-                }else{
+                } else {
                    strJpg = strJpgPath + "/" + i + ".jpg";
                    strJpgUrl = strFilePrefix + "/" + i + ".jpg";
                }
@@ -90,7 +91,7 @@ public class ConvertPicUtil {
                File fileJpg = new File(strJpg);

                // 如果文件不存在，则生成
-                if(!fileJpg.exists()){
+                if (!fileJpg.exists()) {
                    RenderedImage renderedImage = imageDecoder.decodeAsRenderedImage(i);
                    ParameterBlock pb = new ParameterBlock();
                    pb.addSource(renderedImage);
@@ -102,7 +103,7 @@ public class ConvertPicUtil {
                    renderedOp.dispose();

                    logger.info("每页分别保存至： " + fileJpg.getCanonicalPath());
-                }else{
+                } else {
                    logger.info("JPG文件已存在： " + fileJpg.getCanonicalPath());
                }

@@ -118,21 +119,19 @@ public class ConvertPicUtil {
                try {
                    fileSeekStream.close();
                } catch (IOException e) {
+                    logger.error(e.getMessage(), e);
                }
-                fileSeekStream = null;
            }
        }
    }

-
    /**
     * 将Jpg图片转换为Pdf文件
     *
     * @param strJpgFile 输入的jpg的路径和文件名
     * @param strPdfFile 输出的pdf的路径和文件名
-     * @return
     */
-    public static File convertJpg2Pdf(String strJpgFile, String strPdfFile) {
+    public static void convertJpg2Pdf(String strJpgFile, String strPdfFile) {
        Document document = new Document();
        // 设置文档页边距
        document.setMargins(0, 0, 0, 0);
@@ -157,23 +156,18 @@ public class ConvertPicUtil {
            document.add(image);
        } catch (Exception ioe) {
            ioe.printStackTrace();
-            return null;
        } finally {
            //关闭文档
            document.close();
            try {
+                assert fos != null;
                fos.flush();
                fos.close();
-
-                File filePDF = new File(strPdfFile);
-                return filePDF;
            } catch (IOException e) {
                e.printStackTrace();
            }

        }
-
-        return null;
    }


@@ -182,7 +176,7 @@ public class ConvertPicUtil {
     *
     * @param strTifFile 输入的tif的路径和文件名
     * @param strPdfFile 输出的pdf的路径和文件名
-     * @return
+     * @return File
     */
    public static File convertTif2Pdf(String strTifFile, String strPdfFile) {
        try {
@@ -198,16 +192,16 @@ public class ConvertPicUtil {
            Image image;
            File filePDF;

-            if(intPages == 1){
+            if (intPages == 1) {
                String strJpg = strTifFile.substring(0, strTifFile.lastIndexOf(".")) + ".jpg";
                File fileJpg = new File(strJpg);
                List<String> listPic2Jpg = convertTif2Jpg(strTifFile, strJpg);

-                if(listPic2Jpg != null && fileJpg.exists()){
-                    filePDF = convertJpg2Pdf(strJpg, strPdfFile);
+                if (listPic2Jpg != null && fileJpg.exists()) {
+                    convertJpg2Pdf(strJpg, strPdfFile);
                }

-            }else{
+            } else {
                for (int i = 1; i <= intPages; i++) {
                    image = TiffImage.getTiffImage(rafa, i);
                    // 设置页面宽高与图片一致
@@ -229,7 +223,7 @@ public class ConvertPicUtil {

            return filePDF;
        } catch (Exception e) {
-            System.out.println(e.toString());
+            logger.error(e.getMessage(), e);
        }
        return null;
    }
--- a/server/src/main/java/cn/keking/utils/KkFileUtils.java
+++ b/server/src/main/java/cn/keking/utils/KkFileUtils.java
@@ -7,6 +7,8 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;

 public class KkFileUtils {
@@ -15,6 +17,33 @@ public class KkFileUtils {

    public static final String DEFAULT_FILE_ENCODING = "UTF-8";

+    private static final List<String> illegalFileStrList = new ArrayList<>();
+
+    static {
+        illegalFileStrList.add("../");
+        illegalFileStrList.add("./");
+        illegalFileStrList.add("..\\");
+        illegalFileStrList.add(".\\");
+        illegalFileStrList.add("\\..");
+        illegalFileStrList.add("\\.");
+        illegalFileStrList.add("..");
+        illegalFileStrList.add("...");
+    }
+
+    /**
+     * 检查文件名是否合规
+     * @param fileName 文件名
+     * @return 合规结果,true:不合规，false:合规
+     */
+    public static boolean isIllegalFileName(String fileName){
+        for (String str: illegalFileStrList){
+            if(fileName.contains(str)){
+                return true;
+            }
+        }
+        return false;
+    }
+
    /**
     * 判断url是否是http资源
     *
--- a/server/src/main/java/cn/keking/utils/WebUtils.java
+++ b/server/src/main/java/cn/keking/utils/WebUtils.java
@@ -9,6 +9,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
@@ -156,22 +157,48 @@ public class WebUtils {
        String currentUrl = request.getParameter("currentUrl");
        String urlPath = request.getParameter("urlPath");
        if (StringUtils.isNotBlank(url)) {
-            return new String(Base64Utils.decodeFromString(url), StandardCharsets.UTF_8);
+            return decodeBase64String(url);
        }
        if (StringUtils.isNotBlank(currentUrl)) {
-            return new String(Base64Utils.decodeFromString(currentUrl), StandardCharsets.UTF_8);
+            return decodeBase64String(currentUrl);
        }
        if (StringUtils.isNotBlank(urlPath)) {
-            return new String(Base64Utils.decodeFromString(urlPath), StandardCharsets.UTF_8);
+            return decodeBase64String(urlPath);
        }
        if (StringUtils.isNotBlank(urls)) {
-            urls = new String(Base64Utils.decodeFromString(urls), StandardCharsets.UTF_8);
+            urls = decodeBase64String(urls);
            String[] images = urls.split("\\|");
            return images[0];
        }
        return null;
    }

+    /**
+     * 将 Base64 字符串解码，默认使用 UTF-8
+     * @param source 原始 Base64 字符串
+     * @return decoded string
+     */
+    public static String decodeBase64String(String source) {
+        return decodeBase64String(source, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * 将 Base64 字符串使用指定字符集解码
+     * @param source 原始 Base64 字符串
+     * @param charsets 字符集
+     * @return decoded string
+     */
+    public static String decodeBase64String(String source, Charset charsets) {
+        /*
+         * url 传入的参数里加号会被替换成空格，导致解析出错，这里需要把空格替换回加号
+         * 有些 Base64 实现可能每 76 个字符插入换行符，也一并去掉
+         * https://github.com/kekingcn/kkFileView/pull/340
+         */
+        return new String(Base64Utils.decodeFromString(
+                source.replaceAll(" ", "+").replaceAll("\n", "")
+        ), charsets);
+    }
+
    /**
     * 获取 url 的 host
     * @param urlStr url
--- a/server/src/main/java/cn/keking/web/controller/FileController.java
+++ b/server/src/main/java/cn/keking/web/controller/FileController.java
@@ -1,26 +1,33 @@
 package cn.keking.web.controller;

 import cn.keking.config.ConfigConstants;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import cn.keking.model.ReturnResponse;
+import cn.keking.utils.KkFileUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StreamUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
 import org.springframework.web.util.HtmlUtils;

+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 /**
- *
 * @author yudian-it
 * @date 2017/12/1
 */
@@ -33,16 +40,17 @@ public class FileController {
    private final String demoDir = "demo";
    private final String demoPath = demoDir + File.separator;

-    @RequestMapping(value = "fileUpload", method = RequestMethod.POST)
-    public String fileUpload(@RequestParam("file") MultipartFile file) throws JsonProcessingException {
+    @PostMapping("/fileUpload")
+    public ReturnResponse<Object> fileUpload(@RequestParam("file") MultipartFile file) throws JsonProcessingException {
        if (ConfigConstants.getFileUploadDisable()) {
-            return new ObjectMapper().writeValueAsString(ReturnResponse.failure("文件传接口已禁用"));
+            return ReturnResponse.failure("文件传接口已禁用");
        }
        // 获取文件名
        String fileName = file.getOriginalFilename();
        //判断是否为IE浏览器的文件名，IE浏览器下文件名会带有盘符信息
-        
+
        // escaping dangerous characters to prevent XSS
+        assert fileName != null;
        fileName = HtmlUtils.htmlEscape(fileName, StandardCharsets.UTF_8.name());

        // Check for Unix-style path
@@ -51,42 +59,47 @@ public class FileController {
        int winSep = fileName.lastIndexOf('\\');
        // Cut off at latest possible point
        int pos = (Math.max(winSep, unixSep));
-        if (pos != -1)  {
+        if (pos != -1) {
            fileName = fileName.substring(pos + 1);
        }
        // 判断是否存在同名文件
        if (existsFile(fileName)) {
-            return new ObjectMapper().writeValueAsString(ReturnResponse.failure("存在同名文件，请先删除原有文件再次上传"));
+            return ReturnResponse.failure("存在同名文件，请先删除原有文件再次上传");
        }
        File outFile = new File(fileDir + demoPath);
        if (!outFile.exists() && !outFile.mkdirs()) {
-            logger.error("创建文件夹【{}】失败，请检查目录权限！",fileDir + demoPath);
+            logger.error("创建文件夹【{}】失败，请检查目录权限！", fileDir + demoPath);
        }
        logger.info("上传文件：{}", fileDir + demoPath + fileName);
-        try(InputStream in = file.getInputStream(); OutputStream out = new FileOutputStream(fileDir + demoPath + fileName)) {
+        try (InputStream in = file.getInputStream(); OutputStream out = new FileOutputStream(fileDir + demoPath + fileName)) {
            StreamUtils.copy(in, out);
-            return new ObjectMapper().writeValueAsString(ReturnResponse.success(null));
+            return ReturnResponse.success(null);
        } catch (IOException e) {
            logger.error("文件上传失败", e);
-            return new ObjectMapper().writeValueAsString(ReturnResponse.failure());
+            return ReturnResponse.failure();
        }
    }

-    @RequestMapping(value = "deleteFile", method = RequestMethod.GET)
-    public String deleteFile(String fileName) throws JsonProcessingException {
+    @GetMapping("/deleteFile")
+    public ReturnResponse<Object> deleteFile(String fileName) throws JsonProcessingException {
        if (fileName.contains("/")) {
            fileName = fileName.substring(fileName.lastIndexOf("/") + 1);
        }
+        if (KkFileUtils.isIllegalFileName(fileName)) {
+            return ReturnResponse.failure("非法文件名，删除失败！");
+        }
        File file = new File(fileDir + demoPath + fileName);
        logger.info("删除文件：{}", file.getAbsolutePath());
        if (file.exists() && !file.delete()) {
-           logger.error("删除文件【{}】失败，请检查目录权限！",file.getPath());
+            String msg = String.format("删除文件【%s】失败，请检查目录权限！", file.getPath());
+            logger.error(msg);
+            return ReturnResponse.failure(msg);
        }
-        return new ObjectMapper().writeValueAsString(ReturnResponse.success());
+        return ReturnResponse.success();
    }

-    @RequestMapping(value = "listFiles", method = RequestMethod.GET)
-    public String getFiles() throws JsonProcessingException {
+    @GetMapping("/listFiles")
+    public List<Map<String, String>> getFiles() throws JsonProcessingException {
        List<Map<String, String>> list = new ArrayList<>();
        File file = new File(fileDir + demoPath);
        if (file.exists()) {
@@ -96,7 +109,7 @@ public class FileController {
                list.add(fileName);
            });
        }
-        return new ObjectMapper().writeValueAsString(list);
+        return list;
    }

    private boolean existsFile(String fileName) {
--- a/server/src/main/java/cn/keking/web/controller/IndexController.java
+++ b/server/src/main/java/cn/keking/web/controller/IndexController.java
@@ -1,8 +1,7 @@
 package cn.keking.web.controller;

 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;

 /**
 *  页面跳转
@@ -12,12 +11,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
@Controller
 public class IndexController {

-    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    @GetMapping( "/index")
    public String go2Index(){
        return "index";
    }

-    @RequestMapping(value = "/", method = RequestMethod.GET)
+    @GetMapping( "/")
    public String root() {
        return "redirect:/index";
    }
--- a/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
+++ b/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
@@ -16,8 +16,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.util.HtmlUtils;

@@ -53,11 +52,11 @@ public class OnlinePreviewController {
        this.otherFilePreview = otherFilePreview;
    }

-    @RequestMapping(value = "/onlinePreview")
+    @GetMapping( "/onlinePreview")
    public String onlinePreview(String url, Model model, HttpServletRequest req) {
        String fileUrl;
        try {
-            fileUrl = new String(Base64.decodeBase64(url), StandardCharsets.UTF_8);
+            fileUrl = WebUtils.decodeBase64String(url);
        } catch (Exception ex) {
            String errorMsg = String.format(BASE64_DECODE_ERROR_MSG, "url");
            return otherFilePreview.notSupportedFile(model, errorMsg);
@@ -69,11 +68,11 @@ public class OnlinePreviewController {
        return filePreview.filePreviewHandle(fileUrl, model, fileAttribute);
    }

-    @RequestMapping(value = "/picturesPreview")
+    @GetMapping( "/picturesPreview")
    public String picturesPreview(String urls, Model model, HttpServletRequest req) throws UnsupportedEncodingException {
        String fileUrls;
        try {
-            fileUrls = new String(Base64.decodeBase64(urls));
+            fileUrls = WebUtils.decodeBase64String(urls);
            // 防止XSS攻击
            fileUrls = HtmlUtils.htmlEscape(fileUrls);
        } catch (Exception ex) {
@@ -104,15 +103,16 @@ public class OnlinePreviewController {
     * @param urlPath  url
     * @param response response
     */
-    @RequestMapping(value = "/getCorsFile", method = RequestMethod.GET)
+    @GetMapping("/getCorsFile")
    public void getCorsFile(String urlPath, HttpServletResponse response) {
        try {
-            urlPath = new String(Base64.decodeBase64(urlPath), StandardCharsets.UTF_8);
+            urlPath = WebUtils.decodeBase64String(urlPath);
        } catch (Exception ex) {
-            logger.error(String.format(BASE64_DECODE_ERROR_MSG, urlPath, ex));
+            logger.error(String.format(BASE64_DECODE_ERROR_MSG, urlPath),ex);
            return;
        }
-        if (urlPath == null || urlPath.toLowerCase().startsWith("file:") || urlPath.toLowerCase().startsWith("file%3") || !urlPath.toLowerCase().startsWith("http")) {
+        if (urlPath.toLowerCase().startsWith("file:") || urlPath.toLowerCase().startsWith("file%3")
+            || !urlPath.toLowerCase().startsWith("http")) {
            logger.info("读取跨域文件异常，可能存在非法访问，urlPath：{}", urlPath);
            return;
        }
@@ -132,7 +132,7 @@ public class OnlinePreviewController {
     *
     * @param url 请编码后在入队
     */
-    @RequestMapping("/addTask")
+    @GetMapping("/addTask")
    @ResponseBody
    public String addQueueTask(String url) {
        logger.info("添加转码队列url：{}", url);
--- a/server/src/main/java/cn/keking/web/filter/AttributeSetFilter.java
+++ b/server/src/main/java/cn/keking/web/filter/AttributeSetFilter.java
@@ -48,15 +48,24 @@ public class AttributeSetFilter implements Filter {
    private void setWatermarkAttribute(ServletRequest request) {
        String watermarkTxt = request.getParameter("watermarkTxt");
        request.setAttribute("watermarkTxt", watermarkTxt != null ? watermarkTxt : WatermarkConfigConstants.getWatermarkTxt());
-        request.setAttribute("watermarkXSpace", WatermarkConfigConstants.getWatermarkXSpace());
-        request.setAttribute("watermarkYSpace", WatermarkConfigConstants.getWatermarkYSpace());
-        request.setAttribute("watermarkFont", WatermarkConfigConstants.getWatermarkFont());
-        request.setAttribute("watermarkFontsize", WatermarkConfigConstants.getWatermarkFontsize());
-        request.setAttribute("watermarkColor", WatermarkConfigConstants.getWatermarkColor());
-        request.setAttribute("watermarkAlpha", WatermarkConfigConstants.getWatermarkAlpha());
-        request.setAttribute("watermarkWidth", WatermarkConfigConstants.getWatermarkWidth());
-        request.setAttribute("watermarkHeight", WatermarkConfigConstants.getWatermarkHeight());
-        request.setAttribute("watermarkAngle", WatermarkConfigConstants.getWatermarkAngle());
+        String watermarkXSpace = request.getParameter("watermarkXSpace");
+        request.setAttribute("watermarkXSpace", watermarkXSpace != null ? watermarkXSpace : WatermarkConfigConstants.getWatermarkXSpace());
+        String watermarkYSpace = request.getParameter("watermarkYSpace");
+        request.setAttribute("watermarkYSpace", watermarkYSpace != null ? watermarkYSpace : WatermarkConfigConstants.getWatermarkYSpace());
+        String watermarkFont = request.getParameter("watermarkFont");
+        request.setAttribute("watermarkFont", watermarkFont != null ? watermarkFont : WatermarkConfigConstants.getWatermarkFont());
+        String watermarkFontsize = request.getParameter("watermarkFontsize");
+        request.setAttribute("watermarkFontsize", watermarkFontsize != null ? watermarkFontsize : WatermarkConfigConstants.getWatermarkFontsize());
+        String watermarkColor = request.getParameter("watermarkColor");
+        request.setAttribute("watermarkColor", watermarkColor != null ? watermarkColor : WatermarkConfigConstants.getWatermarkColor());
+        String watermarkAlpha = request.getParameter("watermarkAlpha");
+        request.setAttribute("watermarkAlpha", watermarkAlpha != null ? watermarkAlpha : WatermarkConfigConstants.getWatermarkAlpha());
+        String watermarkWidth = request.getParameter("watermarkWidth");
+        request.setAttribute("watermarkWidth", watermarkWidth != null ? watermarkWidth : WatermarkConfigConstants.getWatermarkWidth());
+        String watermarkHeight = request.getParameter("watermarkHeight");
+        request.setAttribute("watermarkHeight", watermarkHeight != null ? watermarkHeight : WatermarkConfigConstants.getWatermarkHeight());
+        String watermarkAngle = request.getParameter("watermarkAngle");
+        request.setAttribute("watermarkAngle", watermarkAngle != null ? watermarkAngle : WatermarkConfigConstants.getWatermarkAngle());
    }

    @Override
--- a/server/src/main/java/cn/keking/web/filter/BaseUrlFilter.java
+++ b/server/src/main/java/cn/keking/web/filter/BaseUrlFilter.java
@@ -1,6 +1,7 @@
 package cn.keking.web.filter;

 import cn.keking.config.ConfigConstants;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;

 import javax.servlet.*;
@@ -18,7 +19,7 @@ public class BaseUrlFilter implements Filter {
    public static String getBaseUrl() {
        String baseUrl;
        try {
-            baseUrl = (String) RequestContextHolder.currentRequestAttributes().getAttribute("baseUrl",0);
+            baseUrl = (String) RequestContextHolder.currentRequestAttributes().getAttribute("baseUrl", 0);
        } catch (Exception e) {
            baseUrl = BASE_URL;
        }
@@ -33,19 +34,28 @@ public class BaseUrlFilter implements Filter {

    @Override
    public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
+
        String baseUrl;
-        StringBuilder pathBuilder = new StringBuilder();
-        pathBuilder.append(request.getScheme()).append("://").append(request.getServerName()).append(":")
-                .append(request.getServerPort()).append(((HttpServletRequest) request).getContextPath()).append("/");
-        String baseUrlTmp = ConfigConstants.getBaseUrl();
-        if (baseUrlTmp != null && !ConfigConstants.DEFAULT_BASE_URL.equalsIgnoreCase(baseUrlTmp)) {
-            if (!baseUrlTmp.endsWith("/")) {
-                baseUrlTmp = baseUrlTmp.concat("/");
-            }
-            baseUrl = baseUrlTmp;
+        String configBaseUrl = ConfigConstants.getBaseUrl();
+
+        final HttpServletRequest servletRequest = (HttpServletRequest) request;
+        //1、支持通过 http header 中 X-Base-Url 来动态设置 baseUrl 以支持多个域名/项目的共享使用
+        final String urlInHeader = servletRequest.getHeader("X-Base-Url");
+        if (StringUtils.isNotEmpty(urlInHeader)) {
+            baseUrl = urlInHeader;
+        } else if (configBaseUrl != null && !ConfigConstants.DEFAULT_BASE_URL.equalsIgnoreCase(configBaseUrl)) {
+            //2、如果配置文件中配置了 baseUrl 且不为 default 则以配置文件为准
+            baseUrl = configBaseUrl;
        } else {
-            baseUrl = pathBuilder.toString();
+            //3、默认动态拼接 baseUrl
+            baseUrl = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
+                    + servletRequest.getContextPath() + "/";
        }
+
+        if (!baseUrl.endsWith("/")) {
+            baseUrl = baseUrl.concat("/");
+        }
+
        BASE_URL = baseUrl;
        request.setAttribute("baseUrl", baseUrl);
        filterChain.doFilter(request, response);
--- a/server/src/main/java/cn/keking/web/filter/TrustHostFilter.java
+++ b/server/src/main/java/cn/keking/web/filter/TrustHostFilter.java
@@ -2,16 +2,16 @@ package cn.keking.web.filter;

 import cn.keking.config.ConfigConstants;
 import cn.keking.utils.WebUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.util.Base64Utils;
-import org.springframework.util.FileCopyUtils;
-
-import javax.servlet.*;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.util.FileCopyUtils;

 /**
 * @author chenjh
Author	SHA1	Message	Date
kl	0e86de1e8e	更新相关依赖版本	2022-08-01 15:09:57 +08:00
kl	106036d989	优化 baseURL 的获取逻辑 (#376 )	2022-08-01 14:09:41 +08:00
kischn.sun	026656711d	添加通过 http header X-Base-Url 来动态传入 baseUrl 的功能 (#252 ) * 将 baseUrl 拼接挪到 else 分支下消除特殊情况下(不走else)不必要的拼接处理 * 添加通过 Http Header X-Base-Url 来动态赋值 baseUrl 的功能来实现更灵活代理支持	2022-08-01 14:01:04 +08:00
gkchp	35a8c4a5a6	修复加号被转换成空格导致Base64解码出错 (#340 ) * 修复url中加号被替换为空格导致的Base64解码出错 * Base64解码抽象到工具类 * #340 补充注释	2022-07-29 23:08:21 +08:00
kl	86960e3813	Fix #370	2022-07-25 18:33:57 +08:00
kl	b099d52520	优化、精简代码。使用 @GetMapping、@PostMapping 替换 @RequestMapping	2022-07-25 17:28:26 +08:00
shenghuadun	6efe15788c	!43 水印其他属性不知道动态传入的问题 * 水印除文本外其他属性可通过url动态传入	2022-07-21 06:45:46 +00:00