From 8399270e3f12301ddf143c87bec9ca1be7b54ff0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 八月 2025 11:05:18 +0800
Subject: [PATCH] 合并代码

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
index d5273b2..26666c6 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
@@ -34,6 +34,18 @@
 	 * 签名证书序列号
 	 */
 	private String signNo;
+	/**
+	 * 证书
+	 */
+	private String cer;
+	/**
+	 * 证书
+	 */
+	private String sm2;
+	/**
+	 *
+	 */
+	private String password;
 	
 	/**
 	 * 获取不同环境的配置
@@ -44,22 +56,31 @@
 			this.url = "https://gatewaytest.zqpay.com";
 			this.appid = "F9BFEEA567196A92E053376010ACF004";
 			this.merchNo = "B00000871";
-			this.encrpNo = "123456";
-			this.signNo = "123456";
+			this.encrpNo = "1055490595";
+			this.signNo = "1066348524";
+			this.cer = "C:\\Users\\39373\\Desktop\\黔云通\\UAT-demo-公用\\1055490595.cer";
+			this.sm2 = "C:\\Users\\39373\\Desktop\\黔云通\\UAT-demo-公用\\871_111111.sm2";
+			this.password = "111111";
 		}
 		if("test".equals(activeProfile)){
 			this.url = "https://gatewaytest.zqpay.com";
 			this.appid = "F9BFEEA567196A92E053376010ACF004";
 			this.merchNo = "B00000871";
-			this.encrpNo = "123456";
-			this.signNo = "123456";
+			this.encrpNo = "1055490595";
+			this.signNo = "1066348524";
+			this.cer = "/etraffic/server/1055490595.cer";
+			this.sm2 = "/etraffic/server/871_111111.sm2";
+			this.password = "111111";
 		}
 		if("prod".equals(activeProfile)){
 			this.url = "https://gateway.zqpay.com";
-			this.appid = "";
-			this.merchNo = "";
-			this.encrpNo = "";
-			this.signNo = "";
+			this.appid = "3e06da1751ec1626b30f7703a088f298";
+			this.merchNo = "B00000402";
+			this.encrpNo = "1342935640";
+			this.signNo = "1471742568";
+			this.cer = "/etraffic/server/1342935640.cer";
+			this.sm2 = "/etraffic/server/1342935640.sm2";
+			this.password = "31028Mky";
 		}
 		return this;
 	}

--
Gitblit v1.7.1