修改部分问题

conf/jdbc.properties

@@ -48,12 +48,12 @@ db.driverClassName=oracle.jdbc.driver.OracleDriver
 #db.url = jdbc:oracle:thin:@10.1.163.147:1521/orcl
 
 # 现场测试 start -------------------------------------
-#db.url = jdbc:oracle:thin:@192.168.1.244:1521/orcl
-#db.username = zsb1016
-#db.password = 123456
-db.url = jdbc:oracle:thin:@192.168.30.140:1521:orcl
-db.username = zsb1
+db.url = jdbc:oracle:thin:@192.168.1.244:1521/orcl
+db.username = zsb1016
 db.password = 123456
+#db.url = jdbc:oracle:thin:@192.168.30.140:1521:orcl
+#db.username = zsb1
+#db.password = 123456
 #db.username = zsb2107
 #db.password = 123456
 ##db.username = zsb01

conf/system.properties

@@ -149,5 +149,4 @@ fs-pjdm:32010122
 fs-version:1.0.1
 
 #非税开票
-InvoicingPartySignature:MIIE3gYKKoEcz1UGAQQCAqCCBM4wggTKAgEBMQ4wDAYIKoEcz1UBgxEFADAMBgoqgRzPVQYBBAIBoIIDnzCCA5swggNAoAMCAQICCAMzARAAIHFnMAwGCCqBHM9VAYN1BQAwgY0xCzAJBgNVBAYTAkNOMQ8wDQYDVQQIDAbmsZ/oi48xDzANBgNVBAcMBuWNl+S6rDEqMCgGA1UECgwh5rGf6IuP55yB55S15a2Q5pS/5Yqh5pWw5a2X6K+B5LmmMTAwLgYDVQQDDCfmsZ/oi4/nnIHnlLXlrZDmlL/liqHor4HkuaborqTor4HkuK3lv4MwHhcNMjEwNDA3MDIwNTUyWhcNMjQwNDA3MDIwNTUyWjCB3zELMAkGA1UEBhMCQ04xEzARBgNVBAcMCk5KUkEtMTNMUkExGzAZBgNVBAoMEuWNl+S6rOW4gui0ouaUv+WxgDEgMB4GCSqGSIb3DQEJARYRMTIyNjg3NDcwNEBxcS5jb20xKzApBgNVBCkMIk5KMTMyMDIxMDQwNzExMDc0OTAxYWEwMzNlNTEwMDI5NzExFzAVBgNVBAwMDjMyMDEwMDcwODAwMjAxMTYwNAYDVQQDDC3ljZfkuqzluILln47luILlu7rorr7otLnnlKjlvoHmlLbmnI3liqHkuK3lv4MwWTATBgcqhkjOPQIBBggqgRzPVQGCLQNCAASfwXxttKn5HFG0EgMo0NL0NwnE4cHagal/8c+9pTce0Vvp1ulLRFBDDvU496QpMnQR3QTFe12Ssg0tCl/1L26co4IBMjCCAS4wHAYDVR0RBBUwE4ERMTIyNjg3NDcwNEBxcS5jb20wMQYDVR0fBCowKDAmoCSgIoYgaHR0cDovLzE3Mi4xNjguMy4zL0pTWldDQVNNMi5jcmwwHwYDVR0jBBgwFoAUKgST2kzDi0ImBVVubsQgxVn3YP0wHQYDVR0OBBYEFPlThU8YR1MQfKAj8AcsgF/tp7UNMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMEBTADAQEAMCIGCCqBHNAUBAEBBBagFBMSMTIzMjAxMDA0MjU4MDM4MDJRMDwGCCsGAQUFBwEBBDAwLjAsBggrBgEFBQcwAoYgaHR0cDovLzE3Mi4xNjguMy4zL0pTWldDQVNNMi5jZXIwGwYJKwYBBAGCNxQCBA4MDOWNleS9jeivgeS5pjAMBggqgRzPVQGDdQUAA0cAMEQCIMtfLq+L+qJjJAN9vI+ArRKB/yq2/MhwiZ1euwdnNSurAiC6ne34R+r2TwHIYfcTZeG7nMvxMogHClt76WghaAyAvjGCAQIwgf8CAQEwgZowgY0xCzAJBgNVBAYTAkNOMQ8wDQYDVQQIDAbmsZ/oi48xDzANBgNVBAcMBuWNl+S6rDEqMCgGA1UECgwh5rGf6IuP55yB55S15a2Q5pS/5Yqh5pWw5a2X6K+B5LmmMTAwLgYDVQQDDCfmsZ/oi4/nnIHnlLXlrZDmlL/liqHor4HkuaborqTor4HkuK3lv4MCCAMzARAAIHFnMAwGCCqBHM9VAYMRBQAwDQYJKoEcz1UBgi0BBQAEQAI3KV2nBo2ZYtcSGFNbDGN7SqSGzlgTuxyWyvAadiLphalq/OzTtriggza2waDIbNqGi3MOxQcr+PbB8zWZl9Q=
 EInvoiceContent:<Header><EInvoiceTag>CZ-EI-32</EInvoiceTag><EInvoiceID>0986189200-02101023</EInvoiceID><Version>1.1.0</Version></Header><EInvoiceData><Main><EInvoiceName>江苏省非税收入统一票据（电子）</EInvoiceName><EInvoiceCode>32010120</EInvoiceCode><EInvoiceNumber>{{pjdm}}</EInvoiceNumber><RandomNumber>{{random}}</RandomNumber><EInvoiceSpecimenCode>3201012010</EInvoiceSpecimenCode><SupervisorAreaCode>320100</SupervisorAreaCode><TotalAmount>{{yjje}}</TotalAmount><IssueDate>{{kprq}}</IssueDate><IssueTime>{{kpsj}}</IssueTime><InvoicingParty><InvoicingPartyCode>708002</InvoicingPartyCode><InvoicingPartyName>南京市城市建设费用征收服务中心</InvoicingPartyName><RecName>南京市城市建设费用征收服务中心</RecName><RecAcct>10105901040000062</RecAcct><RecOpBk>南京农行鼓楼支行</RecOpBk></InvoicingParty><PayerParty><PayerPartyType>2</PayerPartyType><PayerPartyCode/><PayerPartyName>{{jkr}}</PayerPartyName><PayerAcct/><PayerOpBk/></PayerParty><PayMode/><BizCode>{{lsh}}</BizCode><CurrencyType/><ExchangeRate/><Remark>{{beizhu}}</Remark><HandlingPerson>南京市城市建设费用征收服务中心</HandlingPerson><Checker/><SupervisorRemark/><InvoicingPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></InvoicingPartySeal><SupervisorPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></SupervisorPartySeal><MainExt><RelatedInvoiceCode/><RelatedInvoiceNumber/><PayCode>{{jkm}}</PayCode><BusinessNumber/><BusinessDate/><Gender/><Age/><Address/><School/><Faculty/><Major/><Classes/><StudentID/><MedicalType/><MedicalDate/><CaseNumber/><PatientNumber/><HospitalizationNumber/><DepartmentName/><InHospitalDate/><OutHospitalDate/><PrepayAmount/><RechargeAmount/><RefundAmount/><OrgType/><MedicalInsuranceType/><MedicalInsuranceID/><FundPayAmount/><OtherPayAmount/><AccountPayAmount/><OwnPayAmount/><SelfpaymentAmount/><SelfpaymentCost/><Custom1/><Custom2/><Custom3/><Custom4/><Custom5/><Custom6/><Custom7/><Custom8/><Custom9/><Custom10/><Custom11/><Custom12/></MainExt></Main><Details><Item><ItemCode>103015601</ItemCode><ItemName>城市基础设施配套费-城区</ItemName><ItemQuantity>{{yjmj}}</ItemQuantity><ItemUnit>元</ItemUnit><ItemStd>150.00</ItemStd><ItemAmount>{{yjje}}</ItemAmount><ItemRemark/><ItemExt><ItemDetailName/></ItemExt></Item></Details></EInvoiceData>
\ No newline at end of file

njzsb.iml

@@ -31,5 +31,8 @@
     <orderEntry type="library" exported="" name="lib" level="project" />
     <orderEntry type="library" exported="" name="fr-applet-8.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="TomEE 8.5.47" level="application_server_libraries" />
+    <orderEntry type="library" name="netsign" level="project" />
+    <orderEntry type="library" name="crypto" level="project" />
+    <orderEntry type="library" name="ISFJ_v2_0_139_7_BAISC_JDK14" level="project" />
   </component>
 </module>
\ No newline at end of file

src/com/jshx/fstzs/fsutil/FsRequest.java

@@ -150,7 +150,7 @@ public class FsRequest {
         List<Map<String,String>> payCodeInfo = new ArrayList<>();
         Map<String,String> payCodeInfoMap = new HashMap<>();
         payCodeInfoMap.put("pay_code",fstzs.getJkm());
-        payCodeInfoMap.put("pay_code",fstzs.getYjje());
+        payCodeInfoMap.put("amount",fstzs.getYjje());
         payCodeInfo.add(payCodeInfoMap);
         map.put("pay_code_info",payCodeInfo);// 多张缴款书缴款完成后，开具电子票据需要传1张对应的缴款码
         String xml = getProp("EInvoiceContent");
@@ -158,7 +158,7 @@ public class FsRequest {
         xml = xml.replaceAll("\\{\\{random}}",new Random().nextInt(100000) + "");
         xml = xml.replaceAll("\\{\\{yjje}}",fstzs.getYjje());
         xml = xml.replaceAll("\\{\\{kprq}}",new SimpleDateFormat("yyyyMMdd").format(new Date()));
-        xml = xml.replaceAll("\\{\\{kprqsj}}",new SimpleDateFormat("HH:mm:ss").format(new Date()));
+        xml = xml.replaceAll("\\{\\{kpsj}}",new SimpleDateFormat("HH:mm:ss").format(new Date()));
         xml = xml.replaceAll("\\{\\{jkr}}",jbr);
         xml = xml.replaceAll("\\{\\{lsh}}",fstzs.getLsh());
         xml = xml.replaceAll("\\{\\{beizhu}}",fstzs.getFstzsXm().getBeizhu());
@@ -169,10 +169,10 @@ public class FsRequest {
         map.put("invoice_data",xml);// 电子票据头部、票面信息进行base64编码后内容。
 
         Map<String,String> signInfo = new HashMap<>();
-        signInfo.put("value",getProp("InvoicingPartySignature"));//对电子票据头部、票面信息的签名值（签名原文为电子票据数据 Header和EInvoiceData内容），base64格式。
+        signInfo.put("value",Base64.getEncoder().encodeToString(xml.getBytes()));//对电子票据头部、票面信息的签名值（签名原文为电子票据数据 Header和EInvoiceData内容），base64格式。
         signInfo.put("format","DETACH");//签名格式类型，目前固定 DETACH
         signInfo.put("algorithm","SM2");//摘要算法，默认SM2
-        signInfo.put("time","???");//签名时间
+        signInfo.put("time",new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));//签名时间
         map.put("sign_info",signInfo);// 签名信息节点A-3
 
         String request = request("invoice.e.issue.withsign.do", map);

src/com/jshx/fstzs/fsutil/SignUtil.java

+package com.jshx.fstzs.fsutil;
+
+
+import cn.com.infosec.netsign.agent.NetSignAgent;
+import cn.com.infosec.netsign.agent.NetSignResult;
+import cn.com.infosec.netsign.agent.exception.NetSignAgentException;
+import cn.com.infosec.netsign.agent.exception.ServerProcessException;
+
+import java.security.cert.X509Certificate;
+
+public class SignUtil {
+
+    public static void init() {
+        try {
+            NetSignAgent.initialize();
+        } catch (NetSignAgentException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public static String sign(String text) {
+        try {
+            //签名原文
+            byte[] laintext = text.getBytes() ;
+            //签名证书DN，null表示用服务器默认证书进行签名
+            String subject = null ;
+            //摘要算法，null表示用服务器默认的摘要算法
+            String digestAlg = null ;
+            //是否做TSA签名
+            boolean useTSA = false ;
+            //签名
+            NetSignResult result = NetSignAgent.detachedSignature(laintext, subject , digestAlg , useTSA ) ;
+            //获取byte形式的签名结果
+            byte[] signedText = result.getByteArrayResult( NetSignResult.SIGN_TEXT ) ;
+            //获取base64编码后的签名结果
+            String signedTextB64 = result.getStringResult( NetSignResult.SIGN_TEXT ) ;
+            return signedTextB64;
+        } catch ( NetSignAgentException e ) {
+            e.printStackTrace();
+            System.out.println( "errorCode:" + e.getErrorCode() );
+            System.out.println( "errorMsg:" + e.getMessage() );
+        } catch (ServerProcessException e ) {
+            e.printStackTrace();
+            System.out.println( "errorCode:" + e.getErrorCode() );
+            System.out.println( "errorMsg:" + e.getMessage() );
+        }
+        return  null;
+    }
+
+
+    public static void checkSign(String text) {
+        try {
+            // 签名原文
+            byte[] laintext = text.getBytes();
+            // base64编码的签名
+            String signedText = "…....";
+            // base64编码的TSA
+            String tsaText = "….....";
+            // 是否需要返回签名证书
+            boolean needCert = false;
+            // 验签名
+            NetSignResult result = NetSignAgent.detachedVerify( laintext ,signedText , tsaText , needCert );
+            // 签名证书主题
+            result.getStringResult( NetSignResult.SIGN_SUBJECT );
+            // 签名证书颁发者主题为
+            result.getStringResult( NetSignResult.SIGN_ISSUER_SUBJECT );
+            // 签名证书序列号为
+            result.getStringResult( NetSignResult.SIGN_SER_NUMBER );
+            // 签名证书起始时间为
+            result.getStringResult( NetSignResult.SIGN_START_TIME );
+            // 签名证书终止时间为
+            result.getStringResult( NetSignResult.SIGN_END_TIME );
+            // 签名证书
+            X509Certificate cert = ( X509Certificate ) result
+                    .getResult( NetSignResult.SIGN_CERT );
+        } catch ( NetSignAgentException e ) {
+            e.printStackTrace();
+            System.out.println( "errorCode:" + e.getErrorCode() );
+            System.out.println( "errorMsg:" + e.getMessage() );
+        } catch ( ServerProcessException e ) {
+            e.printStackTrace();
+            System.out.println( "errorCode:" + e.getErrorCode() );
+            System.out.println( "errorMsg:" + e.getMessage() );
+        }
+    }
+
+
+    public static void main(String[] args) {
+        System.out.println(sign("Hello"));
+    }
+}

src/com/jshx/fstzs/fsutil/netsignagent.properties

+######server ip######
+#ServerIP=192.168.2.248,192.168.2.248
+ServerIP=172.16.250.115
+#ServerPort=40019,5555
+ServerPort=18005
+Timeout=30000,30000
+
+#�Ƿ��Զ������������
+servicetestistest=yes
+#�Զ������������ʱ����
+servicetestinterval=10000
+#���ӷ���ģʽ
+#1:��̬���з��䣨HA����ռ��
+#2:��̬ƽ�����䣨���أ���С�������ȣ�
+#3:��̬���з��䣨HA������ռ��
+#4:��̬��ѯ�����أ���ѯ��
+connectionmode=1
+
+######Server ���ܹ�Կ֤��,der�����cer�ļ�
+#ServerEncCert=/opt/infosec/NetSignServer20/NetSignServer/cert/rootcert/sheca.cer
+
+######�ͻ���ID######
+#ClientID=12345678
+
+#0-���� 1-������
+CommunicateMode=1
+
+######�Ƿ�ʹ��Socket��######
+UsedConnectionPool=false
+
+######Socket�����������######
+MaxConnections=5
+
+#######ѹ��ѡ��######
+#true-�����ݽ���ѹ�� false-�����ݲ�����ѹ��
+ZipMode=false
+
+#��Ҫѹ�������ݵķ�Χ����Сֵ��
+#��KΪ��λ������200�ͱ�ʾ
+#���ݴ�200K��ʼ��Ҫ����ѹ������
+#��ZIPModeΪtrue��ʱ�򣬴�������Ч
+#����û������ã���Ĭ��ֵ��200
+MinZipSize=200
+
+#�������ͣ����ڶ�֤�������Ͱ䷢��������б��룬�����server�˱��뷽ʽ����һ�£�
+#������ʱʹ��ϵͳĬ�ϱ���
+encoding=GBK
+
+#����DN��˳��0����Ȼ˳��1:CN����ǰ��2��CN�����
+orderdn=0
+
+gc=0
+
+#����֤�����кŵ���ʽ��0:16�����ַ�����1:��һλ��0��16�����ַ�����2:10������
+snmode=1