From a8ee6e862461f8a24827fccc622c530d41f4898c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sun, 14 Jun 2026 16:47:14 +0800
Subject: [PATCH] refactor(service): 重构XcxProperties依赖注入方式
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 4 ++--
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/pay/util/WeixinServiceUtil.java | 5 +++--
src/main/java/cc/mrbird/febs/pay/service/impl/WxFaPiaoServiceImpl.java | 4 +---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 2 +-
8 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
index 6ca7a53..53dd3b0 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
@@ -62,7 +62,7 @@
private final MallElectronicFenceMapper mallElectronicFenceMapper;
private final IMallElectronicFenceService iMallElectronicFenceService;
private final SpringContextHolder springContextHolder;
- private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
+ private final XcxProperties xcxProperties;
@Override
public IPage<AdminMallTeamLeaderVo> getLeaderListInPage(MallTeamLeader mallTeamLeader, QueryRequest request) {
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 4d3e4e5..9b9e8b8 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -302,7 +302,7 @@
}
- private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
+ private final XcxProperties xcxProperties;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index b7d279d..491f7a4 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -822,7 +822,7 @@
@Autowired
private WeixinServiceUtil weixinServiceUtil;
- private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
+ private final XcxProperties xcxProperties;
@Override
@Transactional
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index c4ce447..95760f9 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -61,7 +61,7 @@
private WeixinServiceUtil weixinServiceUtil;
@Autowired
private FiuuUtil fiuuUtil;
- private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
+ private final XcxProperties xcxProperties;
private final IMallMoneyFlowService mallMoneyFlowService;
private final IApiMallMemberWalletService memberWalletService;
private final MallLeaderAchieveMapper mallLeaderAchieveMapper;
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
index 5629e7b..1e36db2 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -4,7 +4,6 @@
import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.mall.dto.RechargeWalletMessageSendDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
@@ -81,7 +80,8 @@
@Autowired
private WxFaPiaoService wxFaPiaoService;
- private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
+ @Autowired
+ private XcxProperties xcxProperties;
/**
* 微信充值回调接口
*/
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/WxFaPiaoServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/WxFaPiaoServiceImpl.java
index 935ab4a..44e0fba 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/WxFaPiaoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/WxFaPiaoServiceImpl.java
@@ -2,7 +2,6 @@
import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.AppContants;
-import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.mall.entity.MallInvoice;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.entity.MallOrderItem;
@@ -60,8 +59,7 @@
private final MallOrderInfoMapper mallOrderInfoMapper;
private final MallOrderItemMapper mallOrderItemMapper;
private final MallInvoiceMapper mallInvoiceMapper;
-
- private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
+ private final XcxProperties xcxProperties;
@Override
public String createAuthorization(String method, String canonicalUrl, String body, PrivateKey keyPair) throws UnsupportedEncodingException, NoSuchAlgorithmException {
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
index 0751acb..c6e2152 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
@@ -69,7 +69,7 @@
private final SpringContextHolder springContextHolder;
- private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
+ private final XcxProperties xcxProperties;
@Override
public BrandWCPayRequestData startRechargeWallet(ApiRechargeWalletDto apiRechargeWalletDto) throws Exception {
diff --git a/src/main/java/cc/mrbird/febs/pay/util/WeixinServiceUtil.java b/src/main/java/cc/mrbird/febs/pay/util/WeixinServiceUtil.java
index 2ab1e5c..c5d8b1b 100644
--- a/src/main/java/cc/mrbird/febs/pay/util/WeixinServiceUtil.java
+++ b/src/main/java/cc/mrbird/febs/pay/util/WeixinServiceUtil.java
@@ -2,13 +2,13 @@
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.properties.XcxProperties;
-import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.pay.model.*;
import cc.mrbird.febs.pay.service.impl.JsApiPayComService;
import cc.mrbird.febs.pay.service.impl.RefundService;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
@@ -21,7 +21,8 @@
@Service(value="weixinServiceUtil")
public class WeixinServiceUtil {
- private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
+ @Autowired
+ private XcxProperties xcxProperties;
/**
* 支付"175.9.82.254"
--
Gitblit v1.9.1