From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 8e8822b..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
@@ -58,8 +58,8 @@
 			this.merchNo = "B00000871";
 			this.encrpNo = "1055490595";
 			this.signNo = "1066348524";
-			this.cer = "C:\\Users\\Admin\\Desktop\\qyt\\1055490595.cer";
-			this.sm2 = "C:\\Users\\Admin\\Desktop\\qyt\\871_111111.sm2";
+			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)){
@@ -68,19 +68,19 @@
 			this.merchNo = "B00000871";
 			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.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.cer = "";
-			this.sm2 = "";
-			this.password = "";
+			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