新功能点：支持全局水印

jodconverter-web/src/main/config/application.properties

@@ -15,8 +15,8 @@ spring.freemarker.suffix = .ftl
 
 server.tomcat.uri-encoding = UTF-8
 #文件上传限制
-spring.http.multipart.max-request-size=100MB
-spring.http.multipart.max-file-size=100MB
+spring.http.multipart.max-request-size=500MB
+spring.http.multipart.max-file-size=500MB
 
 #文件资源路径（默认为打包根路径下的file目录下）
 #file.dir = D:\\kkFileview\\
@@ -60,3 +60,25 @@ ftp.username = ${KK_FTP_USERNAME:ftpuser}
 ftp.password = ${KK_FTP_PASSWORD:123456}
 #预览源为FTP时, FTP连接默认ControlEncoding(根据FTP服务器操作系统选择，Linux一般为UTF-8，Windows一般为GBK)，可在ftp url后面加参数ftp.control.encoding=UTF-8指定，不指定默认用配置的
 ftp.control.encoding = ${KK_FTP_CONTROL_ENCODING:UTF-8}
+
+#水印内容
+#例：watermark.txt = ${WATERMARK_TXT:凯京科技内部文件，严禁外泄}
+watermark.txt = ${WATERMARK_TXT:}
+#水印x轴间隔
+watermark.x.space = ${WATERMARK_X_SPACE:10}
+#水印y轴间隔
+watermark.y.space = ${WATERMARK_Y_SPACE:10}
+#水印字体
+watermark.font = ${WATERMARK_FONT:微软雅黑}
+#水印字体大小
+watermark.fontsize = ${WATERMARK_FONTSIZE:18px}
+#水印字体颜色
+watermark.color = ${WATERMARK_COLOR:black}
+#水印透明度，要求设置在大于等于0.005，小于1
+watermark.alpha = ${WATERMARK_ALPHA:0.2}
+#水印宽度
+watermark.width = ${WATERMARK_WIDTH:240}
+#水印高度
+watermark.height = ${WATERMARK_HEIGHT:80}
+#水印倾斜度数，要求设置在大于等于0，小于90
+watermark.angle = ${WATERMARK_ANGLE:10}