mirror of
https://github.com/Frooodle/Stirling-PDF.git
synced 2025-08-02 13:48:15 +02:00
changes
This commit is contained in:
parent
3baacd4cd9
commit
4ce1c906c0
@ -27,6 +27,7 @@ import org.springframework.stereotype.Component;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
@ -171,13 +172,20 @@ public class ApplicationProperties {
|
|||||||
private Boolean autoCreateUser = false;
|
private Boolean autoCreateUser = false;
|
||||||
private Boolean blockRegistration = false;
|
private Boolean blockRegistration = false;
|
||||||
private String registrationId = "stirling";
|
private String registrationId = "stirling";
|
||||||
@ToString.Exclude private String idpMetadataUri;
|
@ToString.Exclude
|
||||||
|
@JsonProperty("idpMetadataUri")
|
||||||
|
private String idpMetadataUri;
|
||||||
private String idpSingleLogoutUrl;
|
private String idpSingleLogoutUrl;
|
||||||
private String idpSingleLoginUrl;
|
private String idpSingleLoginUrl;
|
||||||
private String idpIssuer;
|
private String idpIssuer;
|
||||||
|
@JsonProperty("idpCert")
|
||||||
private String idpCert;
|
private String idpCert;
|
||||||
@ToString.Exclude private String privateKey;
|
@ToString.Exclude
|
||||||
@ToString.Exclude private String spCert;
|
@JsonProperty("privateKey")
|
||||||
|
private String privateKey;
|
||||||
|
@ToString.Exclude
|
||||||
|
@JsonProperty("spCert")
|
||||||
|
private String spCert;
|
||||||
|
|
||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
public InputStream getIdpMetadataUri() throws IOException {
|
public InputStream getIdpMetadataUri() throws IOException {
|
||||||
@ -327,7 +335,9 @@ public class ApplicationProperties {
|
|||||||
|
|
||||||
@Data
|
@Data
|
||||||
public static class TempFileManagement {
|
public static class TempFileManagement {
|
||||||
|
@JsonProperty("baseTmpDir")
|
||||||
private String baseTmpDir = "";
|
private String baseTmpDir = "";
|
||||||
|
@JsonProperty("libreofficeDir")
|
||||||
private String libreofficeDir = "";
|
private String libreofficeDir = "";
|
||||||
private String systemTempDir = "";
|
private String systemTempDir = "";
|
||||||
private String prefix = "stirling-pdf-";
|
private String prefix = "stirling-pdf-";
|
||||||
@ -545,7 +555,6 @@ public class ApplicationProperties {
|
|||||||
private TimeoutMinutes timeoutMinutes = new TimeoutMinutes();
|
private TimeoutMinutes timeoutMinutes = new TimeoutMinutes();
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE)
|
|
||||||
public static class SessionLimit {
|
public static class SessionLimit {
|
||||||
private int libreOfficeSessionLimit;
|
private int libreOfficeSessionLimit;
|
||||||
private int pdfToHtmlSessionLimit;
|
private int pdfToHtmlSessionLimit;
|
||||||
@ -558,117 +567,102 @@ public class ApplicationProperties {
|
|||||||
private int ghostscriptSessionLimit;
|
private int ghostscriptSessionLimit;
|
||||||
private int ocrMyPdfSessionLimit;
|
private int ocrMyPdfSessionLimit;
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public int getQpdfSessionLimit() {
|
public int getQpdfSessionLimit() {
|
||||||
return qpdfSessionLimit > 0 ? qpdfSessionLimit : 2;
|
return qpdfSessionLimit > 0 ? qpdfSessionLimit : 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public int getTesseractSessionLimit() {
|
public int getTesseractSessionLimit() {
|
||||||
return tesseractSessionLimit > 0 ? tesseractSessionLimit : 1;
|
return tesseractSessionLimit > 0 ? tesseractSessionLimit : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public int getLibreOfficeSessionLimit() {
|
public int getLibreOfficeSessionLimit() {
|
||||||
return libreOfficeSessionLimit > 0 ? libreOfficeSessionLimit : 1;
|
return libreOfficeSessionLimit > 0 ? libreOfficeSessionLimit : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public int getPdfToHtmlSessionLimit() {
|
public int getPdfToHtmlSessionLimit() {
|
||||||
return pdfToHtmlSessionLimit > 0 ? pdfToHtmlSessionLimit : 1;
|
return pdfToHtmlSessionLimit > 0 ? pdfToHtmlSessionLimit : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public int getPythonOpenCvSessionLimit() {
|
public int getPythonOpenCvSessionLimit() {
|
||||||
return pythonOpenCvSessionLimit > 0 ? pythonOpenCvSessionLimit : 8;
|
return pythonOpenCvSessionLimit > 0 ? pythonOpenCvSessionLimit : 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public int getWeasyPrintSessionLimit() {
|
public int getWeasyPrintSessionLimit() {
|
||||||
return weasyPrintSessionLimit > 0 ? weasyPrintSessionLimit : 16;
|
return weasyPrintSessionLimit > 0 ? weasyPrintSessionLimit : 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public int getInstallAppSessionLimit() {
|
public int getInstallAppSessionLimit() {
|
||||||
return installAppSessionLimit > 0 ? installAppSessionLimit : 1;
|
return installAppSessionLimit > 0 ? installAppSessionLimit : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public int getCalibreSessionLimit() {
|
public int getCalibreSessionLimit() {
|
||||||
return calibreSessionLimit > 0 ? calibreSessionLimit : 1;
|
return calibreSessionLimit > 0 ? calibreSessionLimit : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public int getGhostscriptSessionLimit() {
|
public int getGhostscriptSessionLimit() {
|
||||||
return ghostscriptSessionLimit > 0 ? ghostscriptSessionLimit : 8;
|
return ghostscriptSessionLimit > 0 ? ghostscriptSessionLimit : 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public int getOcrMyPdfSessionLimit() {
|
public int getOcrMyPdfSessionLimit() {
|
||||||
return ocrMyPdfSessionLimit > 0 ? ocrMyPdfSessionLimit : 2;
|
return ocrMyPdfSessionLimit > 0 ? ocrMyPdfSessionLimit : 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE)
|
|
||||||
public static class TimeoutMinutes {
|
public static class TimeoutMinutes {
|
||||||
|
@JsonProperty("libreOfficetimeoutMinutes")
|
||||||
private long libreOfficeTimeoutMinutes;
|
private long libreOfficeTimeoutMinutes;
|
||||||
|
@JsonProperty("pdfToHtmltimeoutMinutes")
|
||||||
private long pdfToHtmlTimeoutMinutes;
|
private long pdfToHtmlTimeoutMinutes;
|
||||||
|
@JsonProperty("pythonOpenCvtimeoutMinutes")
|
||||||
private long pythonOpenCvTimeoutMinutes;
|
private long pythonOpenCvTimeoutMinutes;
|
||||||
|
@JsonProperty("weasyPrinttimeoutMinutes")
|
||||||
private long weasyPrintTimeoutMinutes;
|
private long weasyPrintTimeoutMinutes;
|
||||||
|
@JsonProperty("installApptimeoutMinutes")
|
||||||
private long installAppTimeoutMinutes;
|
private long installAppTimeoutMinutes;
|
||||||
|
@JsonProperty("calibretimeoutMinutes")
|
||||||
private long calibreTimeoutMinutes;
|
private long calibreTimeoutMinutes;
|
||||||
private long tesseractTimeoutMinutes;
|
private long tesseractTimeoutMinutes;
|
||||||
private long qpdfTimeoutMinutes;
|
private long qpdfTimeoutMinutes;
|
||||||
private long ghostscriptTimeoutMinutes;
|
private long ghostscriptTimeoutMinutes;
|
||||||
private long ocrMyPdfTimeoutMinutes;
|
private long ocrMyPdfTimeoutMinutes;
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public long getTesseractTimeoutMinutes() {
|
public long getTesseractTimeoutMinutes() {
|
||||||
return tesseractTimeoutMinutes > 0 ? tesseractTimeoutMinutes : 30;
|
return tesseractTimeoutMinutes > 0 ? tesseractTimeoutMinutes : 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public long getQpdfTimeoutMinutes() {
|
public long getQpdfTimeoutMinutes() {
|
||||||
return qpdfTimeoutMinutes > 0 ? qpdfTimeoutMinutes : 30;
|
return qpdfTimeoutMinutes > 0 ? qpdfTimeoutMinutes : 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public long getLibreOfficeTimeoutMinutes() {
|
public long getLibreOfficeTimeoutMinutes() {
|
||||||
return libreOfficeTimeoutMinutes > 0 ? libreOfficeTimeoutMinutes : 30;
|
return libreOfficeTimeoutMinutes > 0 ? libreOfficeTimeoutMinutes : 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public long getPdfToHtmlTimeoutMinutes() {
|
public long getPdfToHtmlTimeoutMinutes() {
|
||||||
return pdfToHtmlTimeoutMinutes > 0 ? pdfToHtmlTimeoutMinutes : 20;
|
return pdfToHtmlTimeoutMinutes > 0 ? pdfToHtmlTimeoutMinutes : 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public long getPythonOpenCvTimeoutMinutes() {
|
public long getPythonOpenCvTimeoutMinutes() {
|
||||||
return pythonOpenCvTimeoutMinutes > 0 ? pythonOpenCvTimeoutMinutes : 30;
|
return pythonOpenCvTimeoutMinutes > 0 ? pythonOpenCvTimeoutMinutes : 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public long getWeasyPrintTimeoutMinutes() {
|
public long getWeasyPrintTimeoutMinutes() {
|
||||||
return weasyPrintTimeoutMinutes > 0 ? weasyPrintTimeoutMinutes : 30;
|
return weasyPrintTimeoutMinutes > 0 ? weasyPrintTimeoutMinutes : 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public long getInstallAppTimeoutMinutes() {
|
public long getInstallAppTimeoutMinutes() {
|
||||||
return installAppTimeoutMinutes > 0 ? installAppTimeoutMinutes : 60;
|
return installAppTimeoutMinutes > 0 ? installAppTimeoutMinutes : 60;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public long getCalibreTimeoutMinutes() {
|
public long getCalibreTimeoutMinutes() {
|
||||||
return calibreTimeoutMinutes > 0 ? calibreTimeoutMinutes : 30;
|
return calibreTimeoutMinutes > 0 ? calibreTimeoutMinutes : 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public long getGhostscriptTimeoutMinutes() {
|
public long getGhostscriptTimeoutMinutes() {
|
||||||
return ghostscriptTimeoutMinutes > 0 ? ghostscriptTimeoutMinutes : 30;
|
return ghostscriptTimeoutMinutes > 0 ? ghostscriptTimeoutMinutes : 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public long getOcrMyPdfTimeoutMinutes() {
|
public long getOcrMyPdfTimeoutMinutes() {
|
||||||
return ocrMyPdfTimeoutMinutes > 0 ? ocrMyPdfTimeoutMinutes : 30;
|
return ocrMyPdfTimeoutMinutes > 0 ? ocrMyPdfTimeoutMinutes : 30;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user