Skip to content

Commit a8dfccc

Browse files
author
ecoolper
committed
Merge branch 'develop' of https://github.com/Wechat-Group/weixin-java-tools into develop
# Conflicts: # weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/apache/WxCpServiceImpl.java # weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/jodd/WxCpServiceImpl.java # weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/okhttp/WxCpServiceImpl.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/apache/WxMpServiceImpl.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/jodd/WxMpServiceImpl.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/okhttp/WxMpServiceImpl.java
2 parents 4f900f8 + f45ef9a commit a8dfccc

File tree

11 files changed

+1190
-102
lines changed

11 files changed

+1190
-102
lines changed

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpJedisConfigStorage.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
55
import redis.clients.jedis.Jedis;
66
import redis.clients.jedis.JedisPool;
7+
import redis.clients.jedis.JedisPoolConfig;
78

89
import java.io.File;
910

@@ -38,6 +39,15 @@ public WxCpJedisConfigStorage(String host, int port) {
3839
this.jedisPool = new JedisPool(host, port);
3940
}
4041

42+
43+
public WxCpJedisConfigStorage(JedisPoolConfig poolConfig, String host, int port) {
44+
this.jedisPool = new JedisPool(poolConfig, host, port);
45+
}
46+
47+
public WxCpJedisConfigStorage(JedisPoolConfig poolConfig, String host, int port, int timeout, final String password) {
48+
this.jedisPool = new JedisPool(poolConfig, host, port, timeout, password);
49+
}
50+
4151
/**
4252
* This method will be destroy jedis pool
4353
*/

0 commit comments

Comments
 (0)