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

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

@@ -20,12 +20,19 @@
     wx.mp.config-storage.key-prefix = wx                  # 相关redis前缀配置: wx(默认)
     wx.mp.config-storage.redis.host = 127.0.0.1
     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客户端配置
     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-port=
     wx.mp.config-storage.http-proxy-username=
     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. 自动注入的类型
 - `WxMpService`以及~~相关的服务类, 比如: `wxMpService.getXxxService`。~~

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

@@ -1,15 +1,7 @@
 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.springframework.beans.factory.annotation.Value;
 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.Configuration;
 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.JedisPoolAbstract;
 import redis.clients.jedis.JedisPoolConfig;
+import redis.clients.jedis.JedisSentinelPool;
 
 /**
  * 微信公众号存储策略自动配置.
@@ -54,6 +62,14 @@ public class WxMpStorageAutoConfiguration {
 			config = defaultConfigStorage();
 			break;
 		}
+		// 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;
 	}
 
@@ -64,14 +80,15 @@ public class WxMpStorageAutoConfiguration {
 	}
 
 	private WxMpConfigStorage jedisConfigStorage() {
-    JedisPool jedisPool;
+		JedisPoolAbstract jedisPool;
 		if (StringUtils.isNotEmpty(redisHost) || StringUtils.isNotEmpty(redisHost2)) {
 			jedisPool = getJedisPool();
 		} else {
 			jedisPool = applicationContext.getBean(JedisPool.class);
 		}
 		WxRedisOps redisOps = new JedisWxRedisOps(jedisPool);
-    WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, wxMpProperties.getConfigStorage().getKeyPrefix());
+		WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps,
+				wxMpProperties.getConfigStorage().getKeyPrefix());
 		setWxMpInfo(wxMpRedisConfig);
 		return wxMpRedisConfig;
 	}
@@ -79,7 +96,8 @@ public class WxMpStorageAutoConfiguration {
 	private WxMpConfigStorage redisTemplateConfigStorage() {
 		StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class);
 		WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate);
-    WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, wxMpProperties.getConfigStorage().getKeyPrefix());
+		WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps,
+				wxMpProperties.getConfigStorage().getKeyPrefix());
 		setWxMpInfo(wxMpRedisConfig);
 		return wxMpRedisConfig;
 	}
@@ -100,7 +118,7 @@ public class WxMpStorageAutoConfiguration {
 		}
 	}
 
-  private JedisPool getJedisPool() {
+	private JedisPoolAbstract getJedisPool() {
 		WxMpProperties.ConfigStorage storage = wxMpProperties.getConfigStorage();
 		RedisProperties redis = storage.getRedis();
 
@@ -119,6 +137,10 @@ public class WxMpStorageAutoConfiguration {
 		}
 		config.setTestOnBorrow(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(),
 				redis.getDatabase());

spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/HostConfig.java

@@ -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;
+	  
+}

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

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

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

@@ -41,6 +41,11 @@ public class WxMpProperties {
    */
   private String aesKey;
   
+  /**
+   * 自定义host配置
+   */
+  private HostConfig hosts;
+
   /**
    * 存储策略
    */