Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-22 b4b44f2021dbf083b7057fb7e192b72d08b4bf17

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java

@@ -9,7 +9,7 @@
import com.alipay.api.response.*;
import com.ruoyi.payment.ali.config.AliProperties;
import com.ruoyi.payment.ali.config.SignType;
import com.ruoyi.payment.ali.v2.model.*;
import com.ruoyi.payment.api.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -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());