wechat/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-10-31 02:28:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 #1785 公众号 spring boot starter 模块增加接口自定义主机地址和redis sentinel的配置

Browse Source
This commit is contained in:
Dream2Land
2020-09-27 17:25:32 +08:00
committed by GitHub
parent 1d7344309a
commit 7e3e16da10
5 changed files with 155 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-starters/wx-java-mp-spring-boot-starter/README.md
View File

@ -20,12 +20,19 @@
wx.mp.config-storage.key-prefix = wx # 相关redis前缀配置: wx(默认) wx.mp.config-storage.key-prefix = wx # 相关redis前缀配置: wx(默认)
wx.mp.config-storage.redis.host = 127.0.0.1 wx.mp.config-storage.redis.host = 127.0.0.1
wx.mp.config-storage.redis.port = 6379 wx.mp.config-storage.redis.port = 6379
#单机和sentinel同时存在时，优先使用sentinel配置
#wx.mp.config-storage.redis.sentinel-ips=127.0.0.1:16379,127.0.0.1:26379
#wx.mp.config-storage.redis.sentinel-name=mymaster
# http客户端配置 # http客户端配置
wx.mp.config-storage.http-client-type=httpclient # http客户端类型: HttpClient(默认), OkHttp, JoddHttp wx.mp.config-storage.http-client-type=httpclient # http客户端类型: HttpClient(默认), OkHttp, JoddHttp
wx.mp.config-storage.http-proxy-host= wx.mp.config-storage.http-proxy-host=
wx.mp.config-storage.http-proxy-port= wx.mp.config-storage.http-proxy-port=
wx.mp.config-storage.http-proxy-username= wx.mp.config-storage.http-proxy-username=
wx.mp.config-storage.http-proxy-password= wx.mp.config-storage.http-proxy-password=
# 公众号地址host配置
#wx.mp.hosts.api-host=http://proxy.com/
#wx.mp.hosts.open-host=http://proxy.com/
#wx.mp.hosts.mp-host=http://proxy.com/
``` ```
3. 自动注入的类型 3. 自动注入的类型
- `WxMpService`以及~~相关的服务类, 比如: `wxMpService.getXxxService`。~~ - `WxMpService`以及~~相关的服务类, 比如: `wxMpService.getXxxService`。~~

208
spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java
View File

@ -1,15 +1,7 @@
package com.binarywang.spring.starter.wxjava.mp.config; package com.binarywang.spring.starter.wxjava.mp.config;
import com.binarywang.spring.starter.wxjava.mp.properties.RedisProperties; import java.util.Set;
import com.binarywang.spring.starter.wxjava.mp.enums.StorageType;
import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
import lombok.RequiredArgsConstructor;
import me.chanjar.weixin.common.redis.JedisWxRedisOps;
import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
import me.chanjar.weixin.common.redis.WxRedisOps;
import me.chanjar.weixin.mp.config.WxMpConfigStorage;
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@ -17,8 +9,24 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import com.binarywang.spring.starter.wxjava.mp.enums.StorageType;
import com.binarywang.spring.starter.wxjava.mp.properties.RedisProperties;
import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
import com.google.common.collect.Sets;
import lombok.RequiredArgsConstructor;
import me.chanjar.weixin.common.redis.JedisWxRedisOps;
import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
import me.chanjar.weixin.common.redis.WxRedisOps;
import me.chanjar.weixin.mp.bean.WxMpHostConfig;
import me.chanjar.weixin.mp.config.WxMpConfigStorage;
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl;
import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolAbstract;
import redis.clients.jedis.JedisPoolConfig; import redis.clients.jedis.JedisPoolConfig;
import redis.clients.jedis.JedisSentinelPool;
/** /**
* 微信公众号存储策略自动配置. * 微信公众号存储策略自动配置.
@ -28,99 +36,113 @@ import redis.clients.jedis.JedisPoolConfig;
@Configuration @Configuration
@RequiredArgsConstructor @RequiredArgsConstructor
public class WxMpStorageAutoConfiguration { public class WxMpStorageAutoConfiguration {
private final ApplicationContext applicationContext; private final ApplicationContext applicationContext;
private final WxMpProperties wxMpProperties; private final WxMpProperties wxMpProperties;
@Value("${wx.mp.config-storage.redis.host:") @Value("${wx.mp.config-storage.redis.host:")
private String redisHost; private String redisHost;
@Value("${wx.mp.configStorage.redis.host:") @Value("${wx.mp.configStorage.redis.host:")
private String redisHost2; private String redisHost2;
@Bean @Bean
@ConditionalOnMissingBean(WxMpConfigStorage.class) @ConditionalOnMissingBean(WxMpConfigStorage.class)
public WxMpConfigStorage wxMpConfigStorage() { public WxMpConfigStorage wxMpConfigStorage() {
StorageType type = wxMpProperties.getConfigStorage().getType(); StorageType type = wxMpProperties.getConfigStorage().getType();
WxMpConfigStorage config; WxMpConfigStorage config;
switch (type) { switch (type) {
case Jedis: case Jedis:
config = jedisConfigStorage(); config = jedisConfigStorage();
break; break;
case RedisTemplate: case RedisTemplate:
config = redisTemplateConfigStorage(); config = redisTemplateConfigStorage();
break; break;
default: default:
config = defaultConfigStorage(); config = defaultConfigStorage();
break; break;
} }
return config; // wx host config
} if (null != wxMpProperties.getHosts() && StringUtils.isNotEmpty(wxMpProperties.getHosts().getApiHost())) {
WxMpHostConfig hostConfig = new WxMpHostConfig();
hostConfig.setApiHost(wxMpProperties.getHosts().getApiHost());
hostConfig.setMpHost(wxMpProperties.getHosts().getMpHost());
hostConfig.setOpenHost(wxMpProperties.getHosts().getOpenHost());
config.setHostConfig(hostConfig);
}
return config;
}
private WxMpConfigStorage defaultConfigStorage() { private WxMpConfigStorage defaultConfigStorage() {
WxMpDefaultConfigImpl config = new WxMpDefaultConfigImpl(); WxMpDefaultConfigImpl config = new WxMpDefaultConfigImpl();
setWxMpInfo(config); setWxMpInfo(config);
return config; return config;
} }
private WxMpConfigStorage jedisConfigStorage() { private WxMpConfigStorage jedisConfigStorage() {
JedisPool jedisPool; JedisPoolAbstract jedisPool;
if (StringUtils.isNotEmpty(redisHost) || StringUtils.isNotEmpty(redisHost2)) { if (StringUtils.isNotEmpty(redisHost) || StringUtils.isNotEmpty(redisHost2)) {
jedisPool = getJedisPool(); jedisPool = getJedisPool();
} else { } else {
jedisPool = applicationContext.getBean(JedisPool.class); jedisPool = applicationContext.getBean(JedisPool.class);
} }
WxRedisOps redisOps = new JedisWxRedisOps(jedisPool); WxRedisOps redisOps = new JedisWxRedisOps(jedisPool);
WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, wxMpProperties.getConfigStorage().getKeyPrefix()); WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps,
setWxMpInfo(wxMpRedisConfig); wxMpProperties.getConfigStorage().getKeyPrefix());
return wxMpRedisConfig; setWxMpInfo(wxMpRedisConfig);
} return wxMpRedisConfig;
}
private WxMpConfigStorage redisTemplateConfigStorage() { private WxMpConfigStorage redisTemplateConfigStorage() {
StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class); StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class);
WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate); WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate);
WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, wxMpProperties.getConfigStorage().getKeyPrefix()); WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps,
setWxMpInfo(wxMpRedisConfig); wxMpProperties.getConfigStorage().getKeyPrefix());
return wxMpRedisConfig; setWxMpInfo(wxMpRedisConfig);
} return wxMpRedisConfig;
}
private void setWxMpInfo(WxMpDefaultConfigImpl config) { private void setWxMpInfo(WxMpDefaultConfigImpl config) {
WxMpProperties properties = wxMpProperties; WxMpProperties properties = wxMpProperties;
WxMpProperties.ConfigStorage configStorageProperties = properties.getConfigStorage(); WxMpProperties.ConfigStorage configStorageProperties = properties.getConfigStorage();
config.setAppId(properties.getAppId()); config.setAppId(properties.getAppId());
config.setSecret(properties.getSecret()); config.setSecret(properties.getSecret());
config.setToken(properties.getToken()); config.setToken(properties.getToken());
config.setAesKey(properties.getAesKey()); config.setAesKey(properties.getAesKey());
config.setHttpProxyHost(configStorageProperties.getHttpProxyHost()); config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername()); config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword()); config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
if (configStorageProperties.getHttpProxyPort() != null) { if (configStorageProperties.getHttpProxyPort() != null) {
config.setHttpProxyPort(configStorageProperties.getHttpProxyPort()); config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
} }
} }
private JedisPool getJedisPool() { private JedisPoolAbstract getJedisPool() {
WxMpProperties.ConfigStorage storage = wxMpProperties.getConfigStorage(); WxMpProperties.ConfigStorage storage = wxMpProperties.getConfigStorage();
RedisProperties redis = storage.getRedis(); RedisProperties redis = storage.getRedis();
JedisPoolConfig config = new JedisPoolConfig(); JedisPoolConfig config = new JedisPoolConfig();
if (redis.getMaxActive() != null) { if (redis.getMaxActive() != null) {
config.setMaxTotal(redis.getMaxActive()); config.setMaxTotal(redis.getMaxActive());
} }
if (redis.getMaxIdle() != null) { if (redis.getMaxIdle() != null) {
config.setMaxIdle(redis.getMaxIdle()); config.setMaxIdle(redis.getMaxIdle());
} }
if (redis.getMaxWaitMillis() != null) { if (redis.getMaxWaitMillis() != null) {
config.setMaxWaitMillis(redis.getMaxWaitMillis()); config.setMaxWaitMillis(redis.getMaxWaitMillis());
} }
if (redis.getMinIdle() != null) { if (redis.getMinIdle() != null) {
config.setMinIdle(redis.getMinIdle()); config.setMinIdle(redis.getMinIdle());
} }
config.setTestOnBorrow(true); config.setTestOnBorrow(true);
config.setTestWhileIdle(true); config.setTestWhileIdle(true);
if (StringUtils.isNotEmpty(redis.getSentinelIps())) {
Set<String> sentinels = Sets.newHashSet(redis.getSentinelIps().split(","));
return new JedisSentinelPool(redis.getSentinelName(), sentinels);
}
return new JedisPool(config, redis.getHost(), redis.getPort(), redis.getTimeout(), redis.getPassword(), return new JedisPool(config, redis.getHost(), redis.getPort(), redis.getTimeout(), redis.getPassword(),
redis.getDatabase()); redis.getDatabase());
} }
} }

18
spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/HostConfig.java Normal file
View File

@ -0,0 +1,18 @@
package com.binarywang.spring.starter.wxjava.mp.properties;
import java.io.Serializable;
import lombok.Data;
@Data
public class HostConfig implements Serializable {
private static final long serialVersionUID = -4172767630740346001L;
private String apiHost;
private String openHost;
private String mpHost;
}

10
spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java
View File

@ -38,6 +38,16 @@ public class RedisProperties implements Serializable {
* 数据库. * 数据库.
*/ */
private int database = 0; private int database = 0;
/**
* sentinel ips
*/
private String sentinelIps;
/**
* sentinel name
*/
private String sentinelName;
private Integer maxActive; private Integer maxActive;
private Integer maxIdle; private Integer maxIdle;

5
spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java
View File

@ -40,6 +40,11 @@ public class WxMpProperties {
* 设置微信公众号的EncodingAESKey. * 设置微信公众号的EncodingAESKey.
*/ */
private String aesKey; private String aesKey;
/**
* 自定义host配置
*/
private HostConfig hosts;
/** /**
* 存储策略 * 存储策略