Merge branch 'feature-2022.07.29' of https://git.flowbb.cn/RK-Dev/fqgz-server into feature-2022.07.29

eladmin-system/pom.xml

@@ -31,7 +31,7 @@
 		<cfca.SealSADK7.version>5.8.2.1</cfca.SealSADK7.version>
 		<cfca.SealSADK.version>3.1.4.0</cfca.SealSADK.version>
 		<cfca.timestampAPI.version>4.2.2.0</cfca.timestampAPI.version>
-		<anxinqian.version>1.0.4</anxinqian.version>
+		<anxinqian.version>1.0.5</anxinqian.version>
 		<zefer.fonts.version>1.0</zefer.fonts.version>
 		<zefer.pd4ml.version>370fx2pro</zefer.pd4ml.version>
 		<zefer.ss_css.version>1.0</zefer.ss_css.version>

eladmin-system/src/main/java/me/zhengjie/base/util/HtmlConvertPdf.java

@@ -77,7 +77,7 @@ public class HtmlConvertPdf {
 		int topValue = 20;
 		int leftValue = 10;
 		int rightValue = 10;
-		int bottomValue = 10;
+		int bottomValue = 25;
 
 		pdf.setPageInsetsMM(new Insets(topValue, leftValue, bottomValue, rightValue));
 		// 设置页面的标准

eladmin-system/src/main/resources/cfca.properties

@@ -3,7 +3,7 @@ readTimeout = 30000
 isSSL = true
 alias = anxinsign
 #????
-#platID = E8C3D9D8233742BEE053335B210A9F68
+#platID = E96620D49426837BE053345B210A8F01
 #cfcaURL = https://cs.anxinsign.com/FEP/
 #channel = prod
 #jksPath = anxinqian.jks

eladmin-system/src/main/resources/template/note/notary-model.html

@@ -12,6 +12,10 @@
       margin: 0 auto;
     }
 
+    p {
+      text-align: justify;
+    }
+
     table {
       display: table;
       border-collapse: separate;