From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/WxCpConfiguration.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/WxCpConfiguration.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/WxCpConfiguration.java
index 26c967c..1d57627 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/WxCpConfiguration.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/WxCpConfiguration.java
@@ -27,9 +27,8 @@
private WxCpProperties properties;
@Bean
- @ConditionalOnMissingBean
+ @ConditionalOnMissingBean(name = "wxService")
public WxCpService wxService() {
-
WxCpDefaultConfigImpl wxCpConfigStorage = new WxCpDefaultConfigImpl();
wxCpConfigStorage.setCorpId(properties.getCorpId());
wxCpConfigStorage.setAgentId(properties.getAgentId());
@@ -41,6 +40,20 @@
return wxService;
}
+ @Bean
+ @ConditionalOnMissingBean(name = "adWxService")
+ public WxCpService adWxService() {
+ WxCpDefaultConfigImpl wxAdCpConfigStorage = new WxCpDefaultConfigImpl();
+ wxAdCpConfigStorage.setCorpId(properties.getCorpId());
+ wxAdCpConfigStorage.setAgentId(properties.getAgentId());
+ wxAdCpConfigStorage.setCorpSecret(properties.getAddressSecret());
+ wxAdCpConfigStorage.setAesKey(properties.getEncodingAESKey());
+ wxAdCpConfigStorage.setToken(properties.getToken());
+ WxCpService adWxService = new WxCpServiceImpl();
+ adWxService.setWxCpConfigStorage(wxAdCpConfigStorage);
+ return adWxService;
+ }
+
@Bean
@ConditionalOnMissingBean
--
Gitblit v1.7.1