diff --git a/giftBook-admin/src/main/resources/application-dev.yml b/giftBook-admin/src/main/resources/application-dev.yml index 2105d3a..df3110d 100644 --- a/giftBook-admin/src/main/resources/application-dev.yml +++ b/giftBook-admin/src/main/resources/application-dev.yml @@ -245,7 +245,3 @@ 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 2926376..0465d95 100644 --- a/giftBook-admin/src/main/resources/application-prod.yml +++ b/giftBook-admin/src/main/resources/application-prod.yml @@ -247,7 +247,3 @@ 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/application.yml b/giftBook-admin/src/main/resources/application.yml index a74c732..a43927d 100644 --- a/giftBook-admin/src/main/resources/application.yml +++ b/giftBook-admin/src/main/resources/application.yml @@ -279,3 +279,7 @@ warm-flow: - 255,205,23 ## 已办理 - 157,255,0 + +# 字体文件名称 +ttfFile: + name: simhei.ttf diff --git a/giftBook-admin/src/main/resources/font/simhei.ttf b/giftBook-admin/src/main/resources/font/simhei.ttf new file mode 100644 index 0000000..5bd4687 Binary files /dev/null and b/giftBook-admin/src/main/resources/font/simhei.ttf 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 682b4f4..fa2b30c 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 @@ -64,8 +64,8 @@ public class TGiftBookDetailsServiceImpl implements ITGiftBookDetailsService { private final ITGiftBookService giftBookService; - @Value("${ttfFile.path}") - private String ttfPath; + @Value("${ttfFile.name}") + private String ttfName; /** @@ -243,7 +243,8 @@ public class TGiftBookDetailsServiceImpl implements ITGiftBookDetailsService { Document document = new Document(pdfDoc, PageSize.A4, false); // 设置字体 - PdfFont font = PdfFontFactory.createFont(ttfPath, PdfEncodings.IDENTITY_H); + ClassPathResource classPathResource = new ClassPathResource("font/" + ttfName); + PdfFont font = PdfFontFactory.createFont(classPathResource.getPath(), PdfEncodings.IDENTITY_H); document.setFont(font); pdfDoc.addNewPage();