From 2884c375993b7682fc085b5d99219e459ae64272 Mon Sep 17 00:00:00 2001 From: ageer Date: Sat, 24 May 2025 23:07:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-common/ruoyi-common-pay/pom.xml | 6 --- .../java/org/ruoyi/common/config/PayInit.java | 2 - .../common/config/WxPayConfiguration.java | 47 ------------------- .../common/listener/ConfigChangeListener.java | 37 --------------- 4 files changed, 92 deletions(-) delete mode 100644 ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/WxPayConfiguration.java delete mode 100644 ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/listener/ConfigChangeListener.java diff --git a/ruoyi-common/ruoyi-common-pay/pom.xml b/ruoyi-common/ruoyi-common-pay/pom.xml index f0f2511f..d4e2cd94 100644 --- a/ruoyi-common/ruoyi-common-pay/pom.xml +++ b/ruoyi-common/ruoyi-common-pay/pom.xml @@ -32,12 +32,6 @@ ${zxing.version} - - - com.stripe - stripe-java - ${stripe.version} - diff --git a/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/PayInit.java b/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/PayInit.java index 16b29693..74ca9804 100644 --- a/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/PayInit.java +++ b/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/PayInit.java @@ -5,8 +5,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Scope; -import org.springframework.scheduling.annotation.Scheduled; /** * 支付配置信息 diff --git a/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/WxPayConfiguration.java b/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/WxPayConfiguration.java deleted file mode 100644 index cbe33cd0..00000000 --- a/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/WxPayConfiguration.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.ruoyi.common.config; - -import com.github.binarywang.wxpay.config.WxPayConfig; -import com.github.binarywang.wxpay.service.WxPayService; -import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl; - -import org.ruoyi.common.core.service.ConfigService; -import jakarta.annotation.PostConstruct; -import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @author Binary Wang - */ -@Configuration -@RequiredArgsConstructor -public class WxPayConfiguration { - - private final ConfigService configService; - - private WxPayService wxPayService; - - @PostConstruct - public void init() { - WxPayConfig payConfig = new WxPayConfig(); - payConfig.setAppId(StringUtils.trimToNull(getKey("appId"))); - payConfig.setMchId(StringUtils.trimToNull(getKey("mchId"))); - payConfig.setMchKey(StringUtils.trimToNull(getKey("appSecret"))); - payConfig.setUseSandboxEnv(false); - wxPayService = new WxPayServiceImpl(); - wxPayService.setConfig(payConfig); - } - - @Bean - @ConditionalOnMissingBean - public WxPayService wxService() { - return wxPayService; - } - - public String getKey(String key) { - return configService.getConfigValue("weixin", key); - } - -} diff --git a/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/listener/ConfigChangeListener.java b/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/listener/ConfigChangeListener.java deleted file mode 100644 index 06dcc3de..00000000 --- a/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/listener/ConfigChangeListener.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.ruoyi.common.listener; - -import com.github.binarywang.wxpay.config.WxPayConfig; -import com.github.binarywang.wxpay.service.WxPayService; -import org.ruoyi.common.core.event.ConfigChangeEvent; -import org.ruoyi.common.core.service.ConfigService; -import org.ruoyi.common.core.utils.StringUtils; -import org.jetbrains.annotations.NotNull; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -/** - * 创建一个监听器,用于处理配置变化事件 - * - * @author ageerle@163.com - * date 2024/5/19 - */ -@Component -public class ConfigChangeListener implements ApplicationListener { - private final WxPayService wxPayService; - private final ConfigService configService; - - public ConfigChangeListener(WxPayService wxPayService, ConfigService configService) { - this.wxPayService = wxPayService; - this.configService = configService; - } - - @Override - public void onApplicationEvent(@NotNull ConfigChangeEvent event) { - WxPayConfig newConfig = new WxPayConfig(); - newConfig.setAppId(StringUtils.trimToNull(configService.getConfigValue("weixin", "appId"))); - newConfig.setMchId(StringUtils.trimToNull(configService.getConfigValue("weixin", "mchId"))); - newConfig.setMchKey(StringUtils.trimToNull(configService.getConfigValue("weixin", "mchKey"))); - newConfig.setUseSandboxEnv(false); - wxPayService.setConfig(newConfig); - } -}