diff --git a/giftBook-admin/src/main/resources/application-dev.yml b/giftBook-admin/src/main/resources/application-dev.yml index df3110d..2105d3a 100644 --- a/giftBook-admin/src/main/resources/application-dev.yml +++ b/giftBook-admin/src/main/resources/application-dev.yml @@ -245,3 +245,7 @@ justauth: client-id: 10**********6 client-secret: 1f7d08**********5b7**********29e redirect-uri: ${justauth.address}/social-callback?source=gitlab + +# 字体文件路径 +ttfFile: + path: E:\giftBook\MicrosoftYaHei.ttf diff --git a/giftBook-admin/src/main/resources/application-prod.yml b/giftBook-admin/src/main/resources/application-prod.yml index 0465d95..2926376 100644 --- a/giftBook-admin/src/main/resources/application-prod.yml +++ b/giftBook-admin/src/main/resources/application-prod.yml @@ -247,3 +247,7 @@ justauth: client-id: 10**********6 client-secret: 1f7d08**********5b7**********29e redirect-uri: ${justauth.address}/social-callback?source=gitlab + +# 字体文件路径 +ttfFile: + path: /usr/local/project/giftBook/jar/fonts/MicrosoftYaHei.ttf diff --git a/giftBook-admin/src/main/resources/fonts/MicrosoftYaHei.ttf b/giftBook-admin/src/main/resources/fonts/MicrosoftYaHei.ttf deleted file mode 100644 index 865c35b..0000000 Binary files a/giftBook-admin/src/main/resources/fonts/MicrosoftYaHei.ttf and /dev/null differ diff --git a/giftBook-modules/giftBook-main/src/main/java/cn/xxzhx/giftBook/main/service/impl/TGiftBookDetailsServiceImpl.java b/giftBook-modules/giftBook-main/src/main/java/cn/xxzhx/giftBook/main/service/impl/TGiftBookDetailsServiceImpl.java index c5febd2..905bd29 100644 --- a/giftBook-modules/giftBook-main/src/main/java/cn/xxzhx/giftBook/main/service/impl/TGiftBookDetailsServiceImpl.java +++ b/giftBook-modules/giftBook-main/src/main/java/cn/xxzhx/giftBook/main/service/impl/TGiftBookDetailsServiceImpl.java @@ -39,9 +39,11 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; +import java.io.File; import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; @@ -62,6 +64,10 @@ public class TGiftBookDetailsServiceImpl implements ITGiftBookDetailsService { private final ITGiftBookService giftBookService; + @Value("ttfFile.path") + private String ttfPath; + + /** * 查询礼薄详情 * @@ -237,8 +243,8 @@ public class TGiftBookDetailsServiceImpl implements ITGiftBookDetailsService { Document document = new Document(pdfDoc, PageSize.A4, false); // 设置字体 - ClassPathResource fontResource = new ClassPathResource("/fonts/MicrosoftYaHei.ttf"); - PdfFont font = PdfFontFactory.createFont(fontResource.getFile().getAbsolutePath(), PdfEncodings.IDENTITY_H); + File file = new File(ttfPath); + PdfFont font = PdfFontFactory.createFont(file.getAbsolutePath(), PdfEncodings.IDENTITY_H); document.setFont(font); pdfDoc.addNewPage();