From 3463a933d0a65133eb5508fc0a3ed59baca89edc Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 27 Mar 2024 17:00:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=2083128=20=E5=9C=A8=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF--=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2-=E4=B8=8B=E8=BD=BD=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E6=89=B9=E5=A4=8D=E6=96=87=E4=BB=B6=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApprovalDocumentNumberService.java        |  32 +++++-------------
 .../src/main/resources/application-dev.yml    |  11 +++++-
 .../approvalTemplate.pdf                      | Bin
 .../template => template}/simfang.ttf         | Bin
 4 files changed, 19 insertions(+), 24 deletions(-)
 rename {jero-boot-single-startup/src/main/resources/template => template}/approvalTemplate.pdf (100%)
 rename {jero-boot-single-startup/src/main/resources/template => template}/simfang.ttf (100%)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/approvalDocumentNumber/service/ApprovalDocumentNumberService.java b/jero-boot-incoming-payment/src/main/java/com/jero/approvalDocumentNumber/service/ApprovalDocumentNumberService.java
index 9754485b..cff9bd88 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/approvalDocumentNumber/service/ApprovalDocumentNumberService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/approvalDocumentNumber/service/ApprovalDocumentNumberService.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -37,11 +38,11 @@ public class ApprovalDocumentNumberService extends ServiceImpl<ApprovalDocumentN
     ApprovalDocumentNumberMapper approvalMapper;
     @Resource
     private MemberInfoMapper memberInfoMapper;
-    ////pdf模板文件路径
-    //@Value("${template.path.pdf}")
-    //private String templatePath;
-    //@Value("${template.path.font}")
-    //private String fontPath;
+    //pdf模板文件路径
+    @Value("${template.path.pdf}")
+    private String templatePath;
+    @Value("${template.path.font}")
+    private String fontPath;
 
     /**
      * 这一年是否已经存在批准文号
@@ -66,24 +67,9 @@ public class ApprovalDocumentNumberService extends ServiceImpl<ApprovalDocumentN
         if (approval == null){
             throw new JeroBootException(year+"年批复文号为空");
         }
-        ClassLoader classLoader = ApprovalDocumentNumberService.class.getClassLoader();
-        String fontPath = classLoader.getResource("template/simfang.ttf").getPath();
-        if (fontPath.startsWith("/")){
-            fontPath = fontPath.substring(1);
-        }
-        String templatePath = classLoader.getResource("template/approvalTemplate.pdf").getPath();
-        if (templatePath.startsWith("/")){
-            templatePath = templatePath.substring(1);
-        }
-        /* 使用中文字体 */
-        BaseFont baseFont = null;
         try {
-            baseFont = BaseFont.createFont(fontPath, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
-            //模板路径
-            if (templatePath == null) {
-                log.error("会员批复文件pdf模板为空");
-                return;
-            }
+            /* 使用中文字体 */
+            BaseFont baseFont = BaseFont.createFont(fontPath, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
             PdfReader pdfReader = new PdfReader(templatePath);
 
             pdfStamper = new PdfStamper(pdfReader, bos);
@@ -101,7 +87,7 @@ public class ApprovalDocumentNumberService extends ServiceImpl<ApprovalDocumentN
             pdfStamper.close();
             pdfReader.close();
         } catch (DocumentException | IOException e) {
-            e.printStackTrace();
+            log.error("error",e);
         }
     }
 
diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml
index 6921dfde..7be23548 100644
--- a/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -352,4 +352,13 @@ kuaidi:
   key: glrUQsMV4692
   customer: 580BE140491CA19C3FED37DB5845413E
 
-needPassword: false
\ No newline at end of file
+needPassword: false
+
+#模板路径
+template:
+  path :
+    font: D:\\hzwl\\income_payments\\income_payments_managerment\\template\\simfang.ttf
+    #批复文件pdf
+    pdf: D:\\hzwl\\income_payments\\income_payments_managerment\\template\\approvalTemplate.pdf
+    #入会申请表word
+    applicationWord: E:\\biao_zhun_suo\\template\\applicationWord.docx
\ No newline at end of file
diff --git a/jero-boot-single-startup/src/main/resources/template/approvalTemplate.pdf b/template/approvalTemplate.pdf
similarity index 100%
rename from jero-boot-single-startup/src/main/resources/template/approvalTemplate.pdf
rename to template/approvalTemplate.pdf
diff --git a/jero-boot-single-startup/src/main/resources/template/simfang.ttf b/template/simfang.ttf
similarity index 100%
rename from jero-boot-single-startup/src/main/resources/template/simfang.ttf
rename to template/simfang.ttf