From fd97cde3d994a3aa6898ba862cd20d0c081012c3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 六月 2024 18:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/common/Configure.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/common/Configure.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/common/Configure.java
index e97fa94..4ca130b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/common/Configure.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/common/Configure.java
@@ -55,7 +55,7 @@
 	}	
 	
 	//HTTPS证书密码,默认密码等于商户号MCHID
-	private static String certPassword_2 = GmchID;
+	private static String certPassword_2 = mchID;
 	
 	//是否使用异步线程的方式来上报API测速,默认为异步模式
 	private static boolean useThreadToDoReport = true;
@@ -99,9 +99,9 @@
 		Configure.useThreadToDoReport = useThreadToDoReport;
 	}
 
-	public static String HttpsRequestClassName = "com.tencent.common.HttpsRequest";
+	public static String HttpsRequestClassName = "com.ruoyi.order.util.tencent.common.HttpsRequest";
 	
-	public static String HttpsRequestClassName_2 = "com.tencent.common.HttpsRequest_2";
+	public static String HttpsRequestClassName_2 = "com.ruoyi.order.util.tencent.common.HttpsRequest_2";
 
 	public static void setKey(String key) {
 		Configure.key = key;

--
Gitblit v1.7.1