From 5b8607464905c4a585fb8e859985730e1ee61f40 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期五, 21 二月 2025 10:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-20250116_1' into dev-20250116_1
---
exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 06802cc..0ee6e5f 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
@@ -408,15 +408,15 @@
String reqdatastr = JSONObject.toJSONString(payReqData);
- String mac = this.getMD5("A1749891493E4CDDBFE4506357B1F0AB||" + this.getBase64(reqdatastr));
+ String mac = this.getMD5(appId + this.getBase64(reqdatastr));
JSONObject jsonObject = new JSONObject();
- jsonObject.put("appid", "A1749891493E4CDDBFE4506357B1F0AB");
+ jsonObject.put("appid", appId);
jsonObject.put("mac", mac);
jsonObject.put("reqdata", this.getBase64(reqdatastr));
Map<String, String> header = new HashMap();
header.put("Accept", "application/json;charset=utf-8");
header.put("Content-Type", "application/json;charset=utf-8");
- String resultStr = HttpUtil.post("http://finpt.xjcz.gov.cn/fs-service/fs-pay/invoice.do ", jsonObject);
+ String resultStr = HttpUtil.post(orderUrl, jsonObject);
System.out.println("发起入参===" + jsonObject);
JSONObject result = JSONObject.parseObject(resultStr);
ResultVo resultVo = JSONObject.parseObject(resultStr, ResultVo.class);
@@ -559,7 +559,7 @@
Map<String, Object> mmp = new HashMap();
try {
- String filePath = "F:/cssconfig.properties";
+ String filePath = "/www/wwwroot/exam/cssconfig.properties";
System.out.println("配置文件路径：" + filePath);
MOFClient client = new MOFClient(filePath);
System.out.println("证书标识为：" + certId);
@@ -591,7 +591,7 @@
public Boolean uploadXmlV2(String orderNo, String signFile) {
log.info("上传验签开始");
log.info("上传验签参数订单号：" + orderNo + "签名文件:" + signFile);
- ResponseDataVo<?> res = ClientFactory.sdkConfig("A1749891493E4CDDBFE4506357B1F0AB", "http://finpt.xjcz.gov.cn/fs-service", "http://finpt.xjcz.gov.cn/fs-service");
+ ResponseDataVo<?> res = ClientFactory.sdkConfig(appId, "http://finpt.xjcz.gov.cn/fs-service", "http://finpt.xjcz.gov.cn/fs-service");
SignatureFileVo signatureFile = new SignatureFileVo();
signatureFile.setFileData(signFile);
signatureFile.setOrderNo(orderNo);
--
Gitblit v1.9.2