diff --git a/src/main/java/cn/van/business/util/WXUtil.java b/src/main/java/cn/van/business/util/WXUtil.java index 26b1fef..2385b91 100644 --- a/src/main/java/cn/van/business/util/WXUtil.java +++ b/src/main/java/cn/van/business/util/WXUtil.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpRequest; import cn.van.business.enums.WXReqType; import cn.van.business.mq.MessageProducerService; +import cn.van.business.repository.OrderRowRepository; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; @@ -14,8 +15,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.core.env.Environment; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.*; /** @@ -25,7 +28,6 @@ import java.util.*; * @description: */ @Component -@Lazy public class WXUtil { private static final Logger logger = LoggerFactory.getLogger(WXUtil.class); @@ -33,8 +35,8 @@ public class WXUtil { public static Map super_admins = new HashMap<>(); public static Map jdidToWxidMap = new HashMap<>(); - @Autowired - private WxtsUtil wxTsUtil; + private final WxtsUtil wxTsUtil; + private final MessageProducerService messageProducerService; @Data @AllArgsConstructor @@ -48,15 +50,21 @@ public class WXUtil { private String secretKey; } + // 通过构造函数注入所有依赖项,Spring将自动注入这些依赖 + @Autowired // @Autowired 在构造函数上可以省略,如果类只有一个构造函数 + public WXUtil(WxtsUtil wxTsUtil, MessageProducerService messageProducerService) { + this.messageProducerService = messageProducerService; + this.wxTsUtil = wxTsUtil; + } + + // 初始化超级管理员 public void initSuperAdmins() { - SuperAdmin admin1 = new SuperAdmin("wxid_ytpc72mdoskt22", "凡", "2014264913", - "98e21c89ae5610240ec3f5f575f86a59", "3dcb6b23a1104639ac433fd07adb6dfb"); + SuperAdmin admin1 = new SuperAdmin("wxid_ytpc72mdoskt22", "凡", "2014264913", "98e21c89ae5610240ec3f5f575f86a59", "3dcb6b23a1104639ac433fd07adb6dfb"); super_admins.put(admin1.getWxid(), admin1); jdidToWxidMap.put(admin1.getUnionId(), admin1.getWxid()); - SuperAdmin admin2 = new SuperAdmin("wxid_yneqf1implxu12", "源", "2025353364" - , "e3c161242c8a1416fada5b5564d7ee70", "41ae9aabf03b41e6ba309682e36b323e"); + SuperAdmin admin2 = new SuperAdmin("wxid_yneqf1implxu12", "源", "2025353364", "e3c161242c8a1416fada5b5564d7ee70", "41ae9aabf03b41e6ba309682e36b323e"); super_admins.put(admin2.getWxid(), admin2); jdidToWxidMap.put(admin2.getUnionId(), admin2.getWxid()); wxTsUtil.sendNotify("initSuperAdmins 初始化完成"); @@ -101,8 +109,7 @@ public class WXUtil { */ public static String WX_BASE_URL; private Environment env; - @Autowired - private MessageProducerService messageProducerService; + @Autowired public WXUtil(Environment env) {