office 功能调整 支持批注 转换页码限制 生成水印等等

pull/178/head
陈精华 2023-07-22 13:42:29 +08:00
parent b5e711bf87
commit 7965d52f29
4 changed files with 57 additions and 57 deletions

View File

@ -131,30 +131,30 @@ beian = ${KK_BEIAN:default}
#
prohibit = ${KK_PROHIBIT:exe,dll,dat}
#
delete.captcha= ${KK_DELETE_CAPTCHA:true}
delete.captcha= ${KK_DELETE_CAPTCHA:false}
#
delete.password = ${KK_DELETE_PASSWORD:123456}
# OFFICECADTIFF
delete.source.file = ${KK_DELETE_SOURCE_FILE:false}
delete.source.file = ${KK_DELETE_SOURCE_FILE:true}
#PDFdpi
pdf2jpg.dpi = ${KK_PDF2JPG_DPI:144}
#xlsx
office.type.web = ${KK_OFFICE_TYPE_WEB:web}
#Cadtifjssvgsvgpdfpdf便
cad.preview.type = ${KK_CAD_PREVIEW_TYPE:svg}
cad.preview.type = ${KK_CAD_PREVIEW_TYPE:pdf}
#OFFICE
# 使 (1-5)
office.pagerange = ${KK_office_PageRange:false}
office.pagerange = ${KK_OFFICE_PAGERANGE:false}
# 使 (kkFileView)
office.watermark = ${KK_office_Watermark:false}
office.watermark = ${KK_OFFICE_WATERMARK:false}
#OFFICE JPEG
office.quality = ${KK_office_Quality:80}
office.quality = ${KK_OFFICE_QUALITY:80}
#
office.maximageresolution = ${KK_office_MaxImageResolution:150}
office.maximageresolution = ${KK_OFFICE_MAXIMAGERESOLUTION:150}
#
office.exportbookmarks = ${KK_office_ExportBookmarks:true}
office.exportbookmarks = ${KK_OFFICE_EXPORTBOOKMARKS:true}
#PDF
office.exportnotes = ${KK_office_ExportNotes:true}
office.exportnotes = ${KK_OFFICE_EXPORTNOTES:true}
# PDF ()
office.documentopenpasswords = ${KK_office_DocumentOpenPassword:true}
office.documentopenpasswords = ${KK_OFFICE_DOCUMENTOPENPASSWORD:true}

View File

@ -95,7 +95,7 @@ public class ConfigConstants {
public static final String DEFAULT_OFFICE_MAXIMAQERESOLUTION = "150";
public static final String DEFAULT_OFFICE_EXPORTBOOKMARKS = "true";
public static final String DEFAULT_OFFICE_EXPORTNOTES = "true";
public static final String DEFAULT_EOCUMENTOPENPASSWORDS = "true";
public static final String DEFAULT_OFFICE_EOCUMENTOPENPASSWORDS = "true";
public static Boolean isCacheEnabled() {
return cacheEnabled;
@ -499,81 +499,81 @@ public class ConfigConstants {
* OFFICE
*/
public static String getofficePageRange() {
public static String getOfficePageRange() {
return officePageRange;
}
@Value("${office.pagerange:false}")
public void setOfficePageRange(String officepagerange) {
setOfficePageRangeValue(officepagerange);
public void setOfficePageRange(String officePageRange) {
setOfficePageRangeValue(officePageRange);
}
public static void setOfficePageRangeValue(String officepagerange) {
ConfigConstants.officePageRange = officepagerange;
public static void setOfficePageRangeValue(String officePageRange) {
ConfigConstants.officePageRange = officePageRange;
}
public static String getofficeWatermark() {
public static String getOfficeWatermark() {
return officeWatermark;
}
@Value("${office.watermark:false}")
public void setOfficeWatermark(String officewatermark) {
setOfficeWatermarkValue(officewatermark);
public void setOfficeWatermark(String officeWatermark) {
setOfficeWatermarkValue(officeWatermark);
}
public static void setOfficeWatermarkValue(String officewatermark) {
ConfigConstants.officeWatermark = officewatermark;
public static void setOfficeWatermarkValue(String officeWatermark) {
ConfigConstants.officeWatermark = officeWatermark;
}
public static String getofficeQuality() {
public static String getOfficeQuality() {
return officeQuality;
}
@Value("${office.Quality:80}")
public void setOfficeQuality(String officequality) {
setOfficeQualityValue(officequality);
@Value("${office.quality:80}")
public void setOfficeQuality(String officeQuality) {
setOfficeQualityValue(officeQuality);
}
public static void setOfficeQualityValue(String officequality) {
ConfigConstants.officeQuality = officequality;
public static void setOfficeQualityValue(String officeQuality) {
ConfigConstants.officeQuality = officeQuality;
}
public static String getofficeMaxImageResolution() {
public static String getOfficeMaxImageResolution() {
return officeMaxImageResolution;
}
@Value("${office.maximageresolution:150}")
public void setofficeMaxImageResolution(String officemaximageresolution) {
setOfficeMaxImageResolutionValue(officemaximageresolution);
public void setOfficeMaxImageResolution(String officeMaxImageResolution) {
setOfficeMaxImageResolutionValue(officeMaxImageResolution);
}
public static void setOfficeMaxImageResolutionValue(String officemaximageresolution) {
ConfigConstants.officeMaxImageResolution = officemaximageresolution;
public static void setOfficeMaxImageResolutionValue(String officeMaxImageResolution) {
ConfigConstants.officeMaxImageResolution = officeMaxImageResolution;
}
public static Boolean getofficeExportBookmarks() {
public static Boolean getOfficeExportBookmarks() {
return officeExportBookmarks;
}
@Value("${office.exportbookmarks:true}")
public void setofficeExportBookmarks(Boolean officeexportbookmarks) {
setOfficeExportBookmarksValue(officeexportbookmarks);
public void setOfficeExportBookmarks(Boolean officeExportBookmarks) {
setOfficeExportBookmarksValue(officeExportBookmarks);
}
public static void setOfficeExportBookmarksValue(Boolean officeexportbookmarks) {
ConfigConstants.officeExportBookmarks = officeexportbookmarks;
public static void setOfficeExportBookmarksValue(Boolean officeExportBookmarks) {
ConfigConstants.officeExportBookmarks = officeExportBookmarks;
}
public static Boolean getofficeExportNotes() {
public static Boolean getOfficeExportNotes() {
return officeExportNotes;
}
@Value("${office.exportnotes:true}")
public void setExportNotes(Boolean officeofficeexportnotes) {
setOfficeExportNotesValue(officeofficeexportnotes);
public void setExportNotes(Boolean officeExportNotes) {
setOfficeExportNotesValue(officeExportNotes);
}
public static void setOfficeExportNotesValue(Boolean officeofficeexportnotes) {
ConfigConstants.officeExportNotes = officeofficeexportnotes;
public static void setOfficeExportNotesValue(Boolean officeExportNotes) {
ConfigConstants.officeExportNotes = officeExportNotes;
}
public static Boolean getofficeDocumentOpenPasswords() {
public static Boolean getOfficeDocumentOpenPasswords() {
return officeDocumentOpenPasswords;
}
@Value("${office.documentopenpasswords:true}")
public void setDocumentOpenPasswords(Boolean officedocumentopenpasswords) {
setOfficeDocumentOpenPasswordsValue(officedocumentopenpasswords);
public void setDocumentOpenPasswords(Boolean officeDocumentOpenPasswords) {
setOfficeDocumentOpenPasswordsValue(officeDocumentOpenPasswords);
}
public static void setOfficeDocumentOpenPasswordsValue(Boolean officedocumentopenpasswords) {
ConfigConstants.officeDocumentOpenPasswords = officedocumentopenpasswords;
public static void setOfficeDocumentOpenPasswordsValue(Boolean officeDocumentOpenPasswords) {
ConfigConstants.officeDocumentOpenPasswords = officeDocumentOpenPasswords;
}
}

View File

@ -109,7 +109,7 @@ public class ConfigRefreshComponent {
officMaxImageResolution = properties.getProperty("office.maximageresolution", ConfigConstants.DEFAULT_OFFICE_MAXIMAQERESOLUTION);
officExportBookmarks = Boolean.parseBoolean(properties.getProperty("office.exportbookmarks", ConfigConstants.DEFAULT_OFFICE_EXPORTBOOKMARKS));
officeExportNotes = Boolean.parseBoolean(properties.getProperty("office.exportnotes", ConfigConstants.DEFAULT_OFFICE_EXPORTNOTES));
officeDocumentOpenPasswords = Boolean.parseBoolean(properties.getProperty("office.documentopenpasswords", ConfigConstants.DEFAULT_EOCUMENTOPENPASSWORDS));
officeDocumentOpenPasswords = Boolean.parseBoolean(properties.getProperty("office.documentopenpasswords", ConfigConstants.DEFAULT_OFFICE_EOCUMENTOPENPASSWORDS));
prohibitArray = prohibit.split(",");
ConfigConstants.setCacheEnabledValueValue(cacheEnabled);

View File

@ -36,21 +36,21 @@ public class OfficeToPdfService {
LocalConverter.Builder builder;
Map<String, Object> filterData = new HashMap<>();
filterData.put("EncryptFile", true);
if(!ConfigConstants.getofficePageRange().equals("false")){
filterData.put("PageRange", ConfigConstants.getofficePageRange()); //限制页面
if(!ConfigConstants.getOfficePageRange().equals("false")){
filterData.put("PageRange", ConfigConstants.getOfficePageRange()); //限制页面
}
if(!ConfigConstants.getofficeWatermark().equals("false")){
filterData.put("Watermark", ConfigConstants.getofficeWatermark()); //水印
if(!ConfigConstants.getOfficeWatermark().equals("false")){
filterData.put("Watermark", ConfigConstants.getOfficeWatermark()); //水印
}
filterData.put("Quality", ConfigConstants.getofficeQuality()); //图片压缩
filterData.put("MaxImageResolution", ConfigConstants.getofficeMaxImageResolution()); //DPI
if(ConfigConstants.getofficeExportBookmarks()){
filterData.put("Quality", ConfigConstants.getOfficeQuality()); //图片压缩
filterData.put("MaxImageResolution", ConfigConstants.getOfficeMaxImageResolution()); //DPI
if(ConfigConstants.getOfficeExportBookmarks()){
filterData.put("ExportBookmarks", true); //导出书签
}
if(ConfigConstants.getofficeExportNotes()){
if(ConfigConstants.getOfficeExportNotes()){
filterData.put("ExportNotes", true); //批注作为PDF的注释
}
if(!ConfigConstants.getofficeDocumentOpenPasswords()){
if(!ConfigConstants.getOfficeDocumentOpenPasswords()){
filterData.put("DocumentOpenPassword", fileAttribute.getFilePassword()); //给PDF添加密码
}
Map<String, Object> customProperties = new HashMap<>();