diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java index 6f9eda2f..ea7b504d 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java @@ -38,7 +38,6 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -59,8 +58,6 @@ import java.util.Set; @Api(value = "支付宝支付接口", tags = "支付宝支付接口") public class AlipayPaymentController { - @Autowired - private Environment environment; @Autowired private IXhpcRechargeOrderService iXhpcRechargeOrderService; @Autowired @@ -188,7 +185,8 @@ public class AlipayPaymentController { if(xhpcRechargeOrder!=null){ XhpcSettingConfig xhpcSettingConfig = xhpcCommonPayment.getXhpcSettingConfigTenantId(UserTypeUtil.OPERATION_ALI_PAY_TYPE, xhpcRechargeOrder.getTenantId()); if(xhpcSettingConfig !=null){ - String publiccertpath = getAlipayPublicKey(environment.getProperty("PUBLICCERTPATH")); + //String publiccertpath = getAlipayPublicKey(environment.getProperty("PUBLICCERTPATH")); + String publiccertpath = getAlipayPublicKey(xhpcSettingConfig.getZfbAlipayCertPublicKeyRsa()); logger.info("<<<<<<<<<<<<支付宝公钥证书>>>>>>>>>"+publiccertpath); // 调用SDK验证签名 boolean signVerified = AlipaySignature.rsaCheckV1(params, publiccertpath, "utf-8", "RSA2"); diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml index dd58b32c..1bb05b2b 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml @@ -21,7 +21,7 @@ - +