From a22ed1e5a817bb1b37954f2504afa77b3327f755 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 26 Mar 2019 17:56:26 +0800 Subject: [PATCH] =?UTF-8?q?[TOKEN][=E4=BF=AE=E6=94=B9]:token=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wechat/WxOpenInRedisDBConfigStorage.java | 24 ++++++------------- .../service/wechat/WxOpenService.java | 10 +++++++- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenInRedisDBConfigStorage.java b/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenInRedisDBConfigStorage.java index 79afd44..8b1bade 100644 --- a/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenInRedisDBConfigStorage.java +++ b/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenInRedisDBConfigStorage.java @@ -17,7 +17,6 @@ import redis.clients.util.Pool; import java.util.Date; -@Component public class WxOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { private final static String COMPONENT_VERIFY_TICKET_KEY = "wechat_component_verify_ticket:"; private final static String COMPONENT_ACCESS_TOKEN_KEY = "wechat_component_access_token:"; @@ -28,6 +27,10 @@ public class WxOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { private final static String CARD_API_TICKET_KEY = "wechat_card_api_ticket:"; protected final Pool jedisPool; + private WxComponentVerifyTicketMapper wxComponentVerifyTicketMapper; + private WxAuthorizerInfoMapper wxAuthorizerInfoMapper; + + /** * redis 存储的 key 的前缀,可为空 */ @@ -41,24 +44,9 @@ public class WxOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired - private WxComponentVerifyTicketMapper wxComponentVerifyTicketMapper; - - @Autowired - private WxAuthorizerInfoMapper wxAuthorizerInfoMapper; - - public WxOpenInRedisDBConfigStorage() { - this.jedisPool = null; - } public WxOpenInRedisDBConfigStorage(Pool jedisPool) { this.jedisPool = jedisPool; - if(wxAuthorizerInfoMapper == null) { - logger.info("wxAuthorizerInfoMapper is null"); - } - if(wxComponentVerifyTicketMapper == null) { - logger.info("wxComponentVerifyTicketMapper is null"); - } } public WxOpenInRedisDBConfigStorage(Pool jedisPool, String keyPrefix) { @@ -66,8 +54,10 @@ public class WxOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { this.keyPrefix = keyPrefix; } - public WxOpenInRedisDBConfigStorage(JedisPool jedisPool) { + public WxOpenInRedisDBConfigStorage(JedisPool jedisPool, WxComponentVerifyTicketMapper componentVerifyTicketMapper, WxAuthorizerInfoMapper authorizerInfoMapper) { this.jedisPool = jedisPool; + this.wxComponentVerifyTicketMapper = componentVerifyTicketMapper; + this.wxAuthorizerInfoMapper = authorizerInfoMapper; } @Override diff --git a/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenService.java b/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenService.java index 6acc364..36aea95 100644 --- a/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenService.java +++ b/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenService.java @@ -2,6 +2,8 @@ package com.iformall.service.wechat; import com.iformall.config.RedisProperies; import com.iformall.config.WechatOpenProperties; +import com.iformall.mapper.WxAuthorizerInfoMapper; +import com.iformall.mapper.WxComponentVerifyTicketMapper; import me.chanjar.weixin.open.api.impl.WxOpenMessageRouter; import me.chanjar.weixin.open.api.impl.WxOpenServiceImpl; import org.slf4j.Logger; @@ -25,12 +27,18 @@ public class WxOpenService extends WxOpenServiceImpl { @Autowired private RedisProperies redisProperies; + @Autowired + private WxComponentVerifyTicketMapper componentVerifyTicketMapper; + + @Autowired + private WxAuthorizerInfoMapper authorizerInfoMapper; + private static JedisPool pool; private WxOpenMessageRouter wxOpenMessageRouter; @PostConstruct public void init() { - WxOpenInRedisDBConfigStorage configStorage = new WxOpenInRedisDBConfigStorage(getJedisPool()); + WxOpenInRedisDBConfigStorage configStorage = new WxOpenInRedisDBConfigStorage(getJedisPool(), componentVerifyTicketMapper, authorizerInfoMapper); configStorage.setComponentAppId(wechatProperties.getComponentAppId()); configStorage.setComponentAppSecret(wechatProperties.getComponentSecret()); configStorage.setComponentToken(wechatProperties.getComponentToken());