From f8b251573040d2762507909a02f274a6cf4d751c Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期四, 23 一月 2025 14:40:27 +0800
Subject: [PATCH] 特种作业非煤缴费版本优化

---
 exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java |  120 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 69 insertions(+), 51 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 135fade..0c23d46 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
@@ -2,8 +2,12 @@
 
 import com.alibaba.fastjson2.JSONObject;
 import com.gkhy.exam.pay.entity.PayReqData;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.http.*;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.StatusLine;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.HttpResponseException;
@@ -25,8 +29,9 @@
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
@@ -40,32 +45,45 @@
 /**
  * 缴费相关接口
  */
+@Component
+@Slf4j
 public class PayUtils {
 
-    private final static String appid="ED76A5F1703540BE977D34780B371FEB";
+//    private final static String appid = "ED76A5F1703540BE977D34780B371FEB";
 
+    @Value("${finance.orderUrl}")
+    private String orderUrl;
 
-    public static ResultVo sendApiPost(PayReqData payReqData) throws IOException {
+    @Value("${finance.payNotifyUrl}")
+    private String payNotifyUrl;
+
+    @Value("${finance.payQueryUrl}")
+    private String payQueryUrl;
+
+    @Value("${finance.apiId}")
+    private String appId;
+
+    public ResultVo sendApiPost(PayReqData payReqData) throws IOException {
 
         //正式
-        String proUrl="http://finpt.xjcz.gov.cn/fs-service/fs-pay/invoice.do";
+        String proUrl = "http://finpt.xjcz.gov.cn/fs-service/fs-pay/invoice.do";
         //测试
-        String testUrl= "http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/invoice.do";
+        String testUrl = "http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/invoice.do";
 
         Map<String, String> param = new HashMap<>();
 
-        HttpPost httpPost = new HttpPost(testUrl);
+        HttpPost httpPost = new HttpPost(orderUrl);
 
         //请求参数转为json格式base64编码
         String reqData = Base64.getEncoder().encodeToString(JSONObject.toJSONString(payReqData).getBytes());
-        String mac = appid+"||"+reqData;
+        String mac = appId + "||" + reqData;
         mac = DigestUtils.md5Hex(mac.getBytes());
-        param.put("appid",appid);
-        param.put("reqdata",reqData);
-        param.put("mac",mac);
+        param.put("appid", appId);
+        param.put("reqdata", reqData);
+        param.put("mac", mac);
 
-        httpPost.setEntity(assemblyFormEntity(param,"utf-8"));
-        HttpClient httpClient = getHttpClient(testUrl);
+        httpPost.setEntity(assemblyFormEntity(param, "utf-8"));
+        HttpClient httpClient = getHttpClient(orderUrl);
         HttpResultVo execute = httpClient.execute(httpPost, getResponseHandler());
         String stringContent = execute.getStringContent();
         ResultVo resultVo = JSONObject.parseObject(stringContent, ResultVo.class);
@@ -117,13 +135,15 @@
                 }
 
                 @Override
-                public void checkClientTrusted(X509Certificate[] xcs, String str) {}
+                public void checkClientTrusted(X509Certificate[] xcs, String str) {
+                }
 
                 @Override
-                public void checkServerTrusted(X509Certificate[] xcs, String str) {}
+                public void checkServerTrusted(X509Certificate[] xcs, String str) {
+                }
             };
             SSLContext ctx = SSLContext.getInstance(SSLConnectionSocketFactory.TLS);
-            ctx.init(null, new TrustManager[] {trustManager}, null);
+            ctx.init(null, new TrustManager[]{trustManager}, null);
             SSLConnectionSocketFactory socketFactory =
                     new SSLConnectionSocketFactory(ctx, NoopHostnameVerifier.INSTANCE);
             // 创建Registry
@@ -210,81 +230,79 @@
 
 
     //缴费结果通知
-    public static Map<String,String> receive(JSONObject jsonObject) throws IOException {
+    public Map<String, String> receive(JSONObject jsonObject) throws IOException {
 
         Map<String, String> params = new HashMap<>();
         JSONObject reqdata = new JSONObject();
 
-        Map<String,String> result = (Map<String, String>) jsonObject.get("reqdata");
+        Map<String, String> result = (Map<String, String>) jsonObject.get("reqdata");
         String orderNo = result.get("orderNo");
 
         //确认是否成功
-        String  notarize= affirmPost(orderNo);
-        reqdata.put("orderNo",orderNo);
-        reqdata.put("status",notarize);
+        String notarize = affirmPost(orderNo);
+        reqdata.put("orderNo", orderNo);
+        reqdata.put("status", notarize);
 
         String req = Base64.getEncoder().encodeToString(reqdata.toJSONString().getBytes());
-        String mac = appid+"||"+req;
+        String mac = appId + "||" + req;
         mac = DigestUtils.md5Hex(mac.getBytes());
-        params.put("appid",appid);
-        params.put("reqdata",req);
-        params.put("mac",mac);
+        params.put("appid", appId);
+        params.put("reqdata", req);
+        params.put("mac", mac);
 
         return params;
     }
 
     //缴费结果确认查询
-    public static String affirmPost(String orderNo) throws IOException {
-        String porUrl="http://finpt.xjcz.gov.cn/fs-service/fs-pay/notifyConfirm.do";
-        String testUrl="http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/notifyConfirm.do";
+    public String affirmPost(String orderNo) throws IOException {
 
         HashMap<String, String> param = new HashMap<>();
 
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("orderNo",orderNo);
+        jsonObject.put("orderNo", orderNo);
         String reqdata = Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes());
-        String mac = appid+"||"+reqdata;
-        mac=DigestUtils.md5Hex(mac.getBytes());
-        param.put("appid",appid);
-        param.put("reqdata",reqdata);
-        param.put("mac",mac);
+        String mac = appId + "||" + reqdata;
+        mac = DigestUtils.md5Hex(mac.getBytes());
+        param.put("appid", appId);
+        param.put("reqdata", reqdata);
+        param.put("mac", mac);
 
-        HttpPost httppost = new HttpPost(testUrl);
-        httppost.setEntity(assemblyFormEntity(param,"utf-8"));
-        HttpClient httpClient = getHttpClient(testUrl);
+        HttpPost httppost = new HttpPost(payNotifyUrl);
+        httppost.setEntity(assemblyFormEntity(param, "utf-8"));
+        HttpClient httpClient = getHttpClient(payNotifyUrl);
         HttpResultVo execute = httpClient.execute(httppost, getResponseHandler());
         String stringContent = execute.getStringContent();
         ResultVo resultVo = JSONObject.parseObject(stringContent, ResultVo.class);
-        System.out.printf("请求结果为:"+resultVo);
-        if (resultVo.getRespcode().equals("BUS0000")){
+        log.info("请求结果为:" + resultVo);
+        if (resultVo.getRespcode().equals("BUS0000")) {
             return "success";
         }
         return "fail";
     }
 
     //缴费结果查询
-    public static JSONObject query(String orderNo) throws IOException {
-        String proUrl="http://finpt.xjcz.gov.cn/fs-service/fs-pay/query.do";
-        String testUrl="http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/query.do";
+    public JSONObject query(String orderNo) throws IOException {
+        String proUrl = "http://finpt.xjcz.gov.cn/fs-service/fs-pay/query.do";
+        String testUrl = "http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/query.do";
 
         HashMap<String, String> param = new HashMap<>();
 
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("orderNo",orderNo);
+        jsonObject.put("orderNo", orderNo);
         String reqdata = Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes());
-        String mac = appid+"||"+reqdata;
+        String mac = appId + "||" + reqdata;
         mac = DigestUtils.md5Hex(mac.getBytes());
-        param.put("appid",appid);
-        param.put("reqdata",reqdata);
-        param.put("mac",mac);
+        param.put("appid", appId);
+        param.put("reqdata", reqdata);
+        param.put("mac", mac);
 
-        HttpPost httppost = new HttpPost(testUrl);
-        httppost.setEntity(assemblyFormEntity(param,"utf-8"));
-        HttpClient httpClient = getHttpClient(testUrl);
+        HttpPost httppost = new HttpPost(payQueryUrl);
+        httppost.setEntity(assemblyFormEntity(param, "utf-8"));
+        HttpClient httpClient = getHttpClient(payQueryUrl);
         HttpResultVo execute = httpClient.execute(httppost, getResponseHandler());
         String stringContent = execute.getStringContent();
         JSONObject result = JSONObject.parseObject(stringContent);
-        System.out.printf("请求结果json为:"+result);
+        log.info("请求结果json为:" + result);
         return result;
     }
 }

--
Gitblit v1.9.2