From 3c88ed137df2428dd43a405336cbd79011345efd Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 28 六月 2022 16:22:02 +0800
Subject: [PATCH] 支付配置
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java
index 5c372dc..82721bf 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java
@@ -14,30 +14,30 @@
/**
* @author Binary Wang
*/
-//@Configuration
-//@ConditionalOnClass(WxPayService.class)
-//@EnableConfigurationProperties(WxPayProperties.class)
-//@AllArgsConstructor
-//public class WxPayConfiguration {
-// private WxPayProperties properties;
-//
-// @Bean
-// @ConditionalOnMissingBean
-// public WxPayService wxService() {
-// WxPayConfig payConfig = new WxPayConfig();
-// payConfig.setAppId(StringUtils.trimToNull(this.properties.getAppId()));
-// payConfig.setMchId(StringUtils.trimToNull(this.properties.getMchId()));
-// payConfig.setMchKey(StringUtils.trimToNull(this.properties.getMchKey()));
-// payConfig.setSubAppId(StringUtils.trimToNull(this.properties.getSubAppId()));
-// payConfig.setSubMchId(StringUtils.trimToNull(this.properties.getSubMchId()));
-// payConfig.setKeyPath(StringUtils.trimToNull(this.properties.getKeyPath()));
-//
-// // 鍙互鎸囧畾鏄惁浣跨敤娌欑鐜
-// payConfig.setUseSandboxEnv(false);
-//
-// WxPayService wxPayService = new WxPayServiceImpl();
+@Configuration
+@ConditionalOnClass(WxPayService.class)
+@EnableConfigurationProperties(WxPayProperties.class)
+@AllArgsConstructor
+public class WxPayConfiguration {
+ private WxPayProperties properties;
+
+ @Bean
+ @ConditionalOnMissingBean
+ public WxPayService wxService() {
+ WxPayConfig payConfig = new WxPayConfig();
+ payConfig.setAppId(StringUtils.trimToNull(this.properties.getAppId()));
+ payConfig.setMchId(StringUtils.trimToNull(this.properties.getMchId()));
+ payConfig.setMchKey(StringUtils.trimToNull(this.properties.getMchKey()));
+ payConfig.setSubAppId(StringUtils.trimToNull(this.properties.getSubAppId()));
+ payConfig.setSubMchId(StringUtils.trimToNull(this.properties.getSubMchId()));
+ payConfig.setKeyPath(StringUtils.trimToNull(this.properties.getKeyPath()));
+
+ // 鍙互鎸囧畾鏄惁浣跨敤娌欑鐜
+ payConfig.setUseSandboxEnv(false);
+
+ WxPayService wxPayService = new WxPayServiceImpl();
// wxPayService.setConfig(payConfig);
-// return wxPayService;
-// }
-//
-//}
+ return wxPayService;
+ }
+
+}
--
Gitblit v1.9.3