From 01abd59918bfc5412e23f685997bc4a4bfdbfc50 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期一, 17 二月 2025 10:41:40 +0800
Subject: [PATCH] 煤矿缴费修改

---
 exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java b/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java
index f96042f..2d5d976 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java
@@ -43,10 +43,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
@@ -80,6 +77,9 @@
     @Value("${finance.uploadXmlUrl}")
     private String uploadXmlUrl;
 
+//    @Value(("${finance.path}"))
+//    private String path;
+
     /**
      * 请求开票,发起支付
      * @param payReqData
@@ -91,12 +91,13 @@
         Map<String, String> param = new HashMap<>();
 
         HttpPost httpPost = new HttpPost("http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/invoice.do");
-
+        log.info("请求地址:"+"http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/invoice.do");
         //请求参数转为json格式base64编码
         String reqData = Base64.getEncoder().encodeToString(JSONObject.toJSONString(payReqData).getBytes());
         String mac = "ED76A5F1703540BE977D34780B371FEB" + "||" + reqData;
         mac = DigestUtils.md5Hex(mac.getBytes());
         param.put("appid", "ED76A5F1703540BE977D34780B371FEB");
+        log.info("请求appid:"+"ED76A5F1703540BE977D34780B371FEB");
         param.put("reqdata", reqData);
         param.put("mac", mac);
 
@@ -353,31 +354,31 @@
     }
 
     //上传财政电子票据签名文件
-    public ResultVo uploadXml(String orderId, String plain) throws IOException {
+    public ResultVo uploadXml(String orderId, byte[] plain) throws IOException {
         Map<String, String> params = new HashMap<>();
 
-        Sign sign = new Sign();
-        SignResult sign1 = this.sign(plain);
-        log.info("签名结果为:"+ Arrays.toString(sign1.getSignData()));
-        VerifyResult verify = this.verify(plain, new String(sign1.getSignData()));
-        SignDto signDto = new SignDto("SM3", "Base64", new Date(), verify.getReturnData(), verify.getSerialNumber(), verify.getIssure());
-        Element signature = sign.getSignature(signDto);
+//        Sign sign = new Sign();
+//        SignResult sign1 = this.sign(plain);
+//        log.info("签名结果为:"+ Arrays.toString(sign1.getSignData()));
+//        VerifyResult verify = this.verify(plain, sign1.getSignData());
+//        SignDto signDto = new SignDto("SM3", "Base64", new Date(), verify.getReturnData(), verify.getSerialNumber(), verify.getIssure());
+//        Element signature = sign.getSignature(signDto);
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("orderNo",orderId);
-        jsonObject.put("fileData", Base64.getEncoder().encodeToString(convertElementToByteArray(signature)));
+        jsonObject.put("fileData", Base64.getEncoder().encodeToString(plain));
 
         String reqdata = Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes());
-        String mac = appId+"||" +reqdata;
+        String mac = "ED76A5F1703540BE977D34780B371FEB"+"||" +reqdata;
         mac = DigestUtils.md5Hex(mac.getBytes());
 
-        params.put("appid",appId);
+        params.put("appid","ED76A5F1703540BE977D34780B371FEB");
         params.put("reqdata",reqdata);
         params.put("mac",mac);
 
-        HttpPost httpPost = new HttpPost(uploadXmlUrl);
+        HttpPost httpPost = new HttpPost("http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/uploadXml.do");
         httpPost.setEntity(assemblyFormEntity(params,"utf-8"));
-        HttpClient httpClient = getHttpClient(uploadXmlUrl);
+        HttpClient httpClient = getHttpClient("http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/uploadXml.do");
         HttpResultVo execute = httpClient.execute(httpPost, getResponseHandler());
         String stringContent = execute.getStringContent();
         ResultVo resultVo = JSONObject.parseObject(stringContent, ResultVo.class);
@@ -413,12 +414,12 @@
 
 
     //签名
-    public SignResult sign(String strData) {
+    public SignResult sign(byte[] strData) {
         SignResult result = null;
-        String certId = "rsa";
+        String certId = "11650000MB1957293J";
         try {
-            AdvanceSignClient client = new AdvanceSignClient("cssconfig.properties");
-            result = client.sign(certId,strData.getBytes());
+            AdvanceSignClient client = new AdvanceSignClient("F:\\text\\cssconfig.properties");
+            result = client.sign(certId,strData);
             log.info("***签名成功***");
             byte[] signData = result.getSignData();
             String s = new String(Base64.getEncoder().encode(signData));
@@ -435,12 +436,12 @@
     /**
      * 验签名
      */
-    public VerifyResult verify(String strData,String signData){
+    public VerifyResult verify(byte[] strData,byte[] signData){
         VerifyResult verify = null;
         try {
-            AdvanceSignClient client = new AdvanceSignClient("cssconfig.properties");
-            byte[] plain = strData.getBytes();
-            byte[] sign = signData.getBytes();
+            SignClient client = new SignClient("F:\\text\\cssconfig.properties");
+            byte[] plain = strData;
+            byte[] sign = signData;
 
             verify = client.verify(sign, plain);
             log.info("验签成功");
@@ -461,17 +462,16 @@
     /**
      * 制作数字信封
      */
-    public EnvelopResult encryptEnvelop(String plain){
+    public EnvelopResult encryptEnvelop(byte[] plain){
         EnvelopResult envelopResult = null;
         try {
-            AdvanceSignClient client = new AdvanceSignClient("cssconfig.properties");
+            AdvanceSignClient client = new AdvanceSignClient("F:\\text\\cssconfig.properties");
             String certId = "rsa";
             CertIdParams certIdParams = new CertIdParams(certId);
             //将封装好的加密证书参数对象放入 数组中
             CertParams[] envelopCerts =  new CertIdParams[]{certIdParams};
-            byte[] bytes = plain.getBytes();
             /* 制作信封 */
-            envelopResult = client.encryptEnvelop(envelopCerts, bytes);
+            envelopResult = client.encryptEnvelop(envelopCerts, plain);
             byte[] envelopData = envelopResult.getEnvelopData();
             log.info("信封结果:["+envelopData+"]");
         } catch (NewCSSException e) {
@@ -486,7 +486,7 @@
     public DecryptResult decryptEnvelop(String signData){
         DecryptResult result = null;
         try {
-            AdvanceSignClient client = new AdvanceSignClient("cssconfig.properties");
+            AdvanceSignClient client = new AdvanceSignClient("F:\\text\\cssconfig.properties");
             byte[] enc_data = signData.getBytes();
             result = client.decryptEnvelop(enc_data);
             log.info("解密数字信封结果成功");

--
Gitblit v1.9.2