'密码读取'

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringContractServiceImpl.java

@@ -596,7 +596,7 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         signResultPDF = tmpPathPDF + practitionerNO + "-signedYD.pdf";
         signResultPDF = tmpPathPDF + practitionerNO + "-signedYD.pdf";
 
 
         String password = "UC645YlB";
         String password = "UC645YlB";
-        password = CommonUtil.readFileTxt(PDFConfiguration.getProperty("pdf.keyPasswordFile"));
+        password = PDFConfiguration.getProperty("pdf.keyPassword");
 
 
         String keyStorePath = "D:\\pcs12\\4929078_m.zuihuibi.cn.pfx";
         String keyStorePath = "D:\\pcs12\\4929078_m.zuihuibi.cn.pfx";
         keyStorePath = PDFConfiguration.getProperty("pdf.keyStorePath");
         keyStorePath = PDFConfiguration.getProperty("pdf.keyStorePath");
@@ -617,6 +617,6 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
             e.printStackTrace();
             e.printStackTrace();
         }
         }
 
 
-        return templateResultPDF;
+        return signResultPDF;
     }
     }
 }
 }

yd-api/src/main/resources/pdfconfiguration.properties

 pdf.template=/opt/tomcat8/conf/ydpdf/pdfres/templatePractitionerContract.pdf
 pdf.template=/opt/tomcat8/conf/ydpdf/pdfres/templatePractitionerContract.pdf
 pdf.signImage=/opt/tomcat8/conf/ydpdf/pdfres/yindunsign.png
 pdf.signImage=/opt/tomcat8/conf/ydpdf/pdfres/yindunsign.png
 pdf.keyStorePath=/opt/tomcat8/conf/ydpdf/pdfres/4929078_m.zuihuibi.cn.pfx
 pdf.keyStorePath=/opt/tomcat8/conf/ydpdf/pdfres/4929078_m.zuihuibi.cn.pfx
-pdf.keyPasswordFile=/opt/tomcat8/conf/ydpdf/pdfres/jks-password.txt
+pdf.keyPassword=UC645YlB
 
 
 pdf.check=/opt/tomcat8/conf/ydpdf/pdfres/check.png
 pdf.check=/opt/tomcat8/conf/ydpdf/pdfres/check.png
 pdf.uncheck=/opt/tomcat8/conf/ydpdf/pdfres/uncheck.png
 pdf.uncheck=/opt/tomcat8/conf/ydpdf/pdfres/uncheck.png