Merge remote-tracking branch 'origin/dev' into dev

yd-api/src/main/java/com/yd/api/practitioner/PractitionerPDFTest.java

@@ -195,7 +195,7 @@ public class PractitionerPDFTest {
         float y = 150;
         float y = 150;
         x = Float.parseFloat(PDFConfiguration.getProperty("pdf.position.x"));
         x = Float.parseFloat(PDFConfiguration.getProperty("pdf.position.x"));
         y = Float.parseFloat(PDFConfiguration.getProperty("pdf.position.y"));
         y = Float.parseFloat(PDFConfiguration.getProperty("pdf.position.y"));
-        PDFSign.sign(signResultPDF,password,keyStorePath,signSourcePDF,signImage,x,y);
+        PDFSign.sign(signResultPDF,password,keyStorePath,signSourcePDF,signImage,13,x,y);
     }
     }
 
 
     private static String readFileTxt(String filePath) {
     private static String readFileTxt(String filePath) {

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

@@ -621,7 +621,7 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         x = Float.parseFloat(PDFConfiguration.getProperty("pdf.position.x"));
         x = Float.parseFloat(PDFConfiguration.getProperty("pdf.position.x"));
         y = Float.parseFloat(PDFConfiguration.getProperty("pdf.position.y"));
         y = Float.parseFloat(PDFConfiguration.getProperty("pdf.position.y"));
         try {
         try {
-            PDFSign.sign(signResultPDF, password, keyStorePath, signSourcePDF, signImage, x, y);
+            PDFSign.sign(signResultPDF, password, keyStorePath, signSourcePDF, signImage,13, x, y);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }

yd-api/src/main/java/com/yd/api/practitioner/vo/PDFHiringTest.java

@@ -186,6 +186,6 @@ public class PDFHiringTest {
         String keyStorePath = "D:\\pcs12\\4929078_m.zuihuibi.cn.pfx";
         String keyStorePath = "D:\\pcs12\\4929078_m.zuihuibi.cn.pfx";
         float x = 450;
         float x = 450;
         float y = 150;
         float y = 150;
-        PDFSign.sign(signResultPDF, password, keyStorePath, signSourcePDF, signImage, x, y);
+        PDFSign.sign(signResultPDF, password, keyStorePath, signSourcePDF, signImage,13, x, y);
     }
     }
 }
 }