From ef57094e91072ebe05bb3781e028d6d7ad8a0c45 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期一, 17 二月 2025 11:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-20250116' into dev-20250116
---
exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 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 0c92d97..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
@@ -77,6 +77,9 @@
@Value("${finance.uploadXmlUrl}")
private String uploadXmlUrl;
+// @Value(("${finance.path}"))
+// private String path;
+
/**
* 请求开票，发起支付
* @param payReqData
@@ -354,28 +357,28 @@
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,9 +416,9 @@
//签名
public SignResult sign(byte[] strData) {
SignResult result = null;
- String certId = "rsa";
+ String certId = "11650000MB1957293J";
try {
- AdvanceSignClient client = new AdvanceSignClient("cssconfig.properties");
+ AdvanceSignClient client = new AdvanceSignClient("F:\\text\\cssconfig.properties");
result = client.sign(certId,strData);
log.info("***签名成功***");
byte[] signData = result.getSignData();
@@ -433,12 +436,12 @@
/**
* 验签名
*/
- public VerifyResult verify(byte[] strData,String signData){
+ public VerifyResult verify(byte[] strData,byte[] signData){
VerifyResult verify = null;
try {
- AdvanceSignClient client = new AdvanceSignClient("src/main/resources/cssconfig.properties");
+ SignClient client = new SignClient("F:\\text\\cssconfig.properties");
byte[] plain = strData;
- byte[] sign = signData.getBytes();
+ byte[] sign = signData;
verify = client.verify(sign, plain);
log.info("验签成功");
@@ -459,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) {
@@ -484,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