javier/Stirling-PDF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

introduces custom settings file (#1158)

Browse Source 
* Introducing a custom settings file

* formats

* chnages

* Update README.md
This commit is contained in:
Anthony Stirling
2024-05-03 20:43:48 +01:00
committed by GitHub
parent fbbc71d7e6
commit 890163053b
13 changed files with 272 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java
View File

@@ -74,7 +74,7 @@ public class ConvertImgPDFController {
}
if (singleImage) {
String docName = filename + "." + imageFormat;
String docName = filename + "." + imageFormat;
MediaType mediaType = MediaType.parseMediaType(getMediaType(imageFormat));
return WebResponseUtils.bytesToWebResponse(result, docName, mediaType);
} else {

4
src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java
View File

@@ -6,7 +6,6 @@ import java.util.Map;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.UserDetails;
@@ -39,7 +38,8 @@ public class AccountWebController {
return "redirect:/";
}
model.addAttribute("oAuth2Enabled", applicationProperties.getSecurity().getOAUTH2().getEnabled());
model.addAttribute(
"oAuth2Enabled", applicationProperties.getSecurity().getOAUTH2().getEnabled());
model.addAttribute("currentPage", "login");