From ca825fdfe67223b2eb8a3f9c14b4e60e2339efc6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 九月 2024 11:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
index 5fcab95..f589d48 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
@@ -207,12 +207,12 @@
 		alipayConfig.setSignType(SignType.RSA2.getType());
 		//判断加签方式
 		String signType = aliProperties.getSignType();
-		if(SignType.CERT.getType().equals(signType)){
+		if(SignType.SECRET_KEY.getType().equals(signType)){
 			alipayConfig.setPrivateKey(aliProperties.getPrivateKey());
 			alipayConfig.setAlipayPublicKey(aliProperties.getAlipayPublicKey());
 			return alipayConfig;
 		}
-		if(SignType.SECRET_KEY.getType().equals(signType)){
+		if(SignType.CERT.getType().equals(signType)){
 			alipayConfig.setAppCertPath(aliProperties.getAppCertPath());
 			alipayConfig.setAlipayPublicCertPath(aliProperties.getAlipayPublicCertPath());
 			alipayConfig.setRootCertPath(aliProperties.getRootCertPath());

--
Gitblit v1.7.1