mirror of
https://gitee.com/binary/weixin-java-tools.git
synced 2025-06-28 13:16:19 +08:00
🎨 重构小程序模块自动注入代码
This commit is contained in:
parent
3eabfedd9c
commit
942cb07f41
@ -22,11 +22,18 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>redis.clients</groupId>
|
<groupId>redis.clients</groupId>
|
||||||
<artifactId>jedis</artifactId>
|
<artifactId>jedis</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.redisson</groupId>
|
||||||
|
<artifactId>redisson</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.data</groupId>
|
<groupId>org.springframework.data</groupId>
|
||||||
<artifactId>spring-data-redis</artifactId>
|
<artifactId>spring-data-redis</artifactId>
|
||||||
<version>${spring.boot.version}</version>
|
<version>${spring.boot.version}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
@ -1,31 +1,9 @@
|
|||||||
package com.binarywang.spring.starter.wxjava.miniapp.config;
|
package com.binarywang.spring.starter.wxjava.miniapp.config;
|
||||||
|
|
||||||
import cn.binarywang.wx.miniapp.api.WxMaService;
|
|
||||||
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceHttpClientImpl;
|
|
||||||
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
|
|
||||||
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceJoddHttpImpl;
|
|
||||||
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceOkHttpImpl;
|
|
||||||
import cn.binarywang.wx.miniapp.config.WxMaConfig;
|
|
||||||
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
|
|
||||||
import cn.binarywang.wx.miniapp.config.impl.WxMaRedisBetterConfigImpl;
|
|
||||||
import com.binarywang.spring.starter.wxjava.miniapp.enums.HttpClientType;
|
|
||||||
import com.binarywang.spring.starter.wxjava.miniapp.properties.RedisProperties;
|
|
||||||
import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
|
import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import me.chanjar.weixin.common.redis.JedisWxRedisOps;
|
|
||||||
import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
|
|
||||||
import me.chanjar.weixin.common.redis.WxRedisOps;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.context.ApplicationContext;
|
|
||||||
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.context.annotation.Import;
|
||||||
import redis.clients.jedis.JedisPool;
|
|
||||||
import redis.clients.jedis.JedisPoolConfig;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 自动配置.
|
* 自动配置.
|
||||||
@ -33,116 +11,11 @@ import redis.clients.jedis.JedisPoolConfig;
|
|||||||
* @author <a href="https://github.com/binarywang">Binary Wang</a>
|
* @author <a href="https://github.com/binarywang">Binary Wang</a>
|
||||||
* @date 2019-08-10
|
* @date 2019-08-10
|
||||||
*/
|
*/
|
||||||
@AllArgsConstructor
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@ConditionalOnClass(WxMaService.class)
|
|
||||||
@EnableConfigurationProperties(WxMaProperties.class)
|
@EnableConfigurationProperties(WxMaProperties.class)
|
||||||
@ConditionalOnProperty(prefix = "wx.miniapp", value = "enabled", matchIfMissing = true)
|
@Import({
|
||||||
|
WxMaStorageAutoConfiguration.class,
|
||||||
|
WxMaServiceAutoConfiguration.class
|
||||||
|
})
|
||||||
public class WxMaAutoConfiguration {
|
public class WxMaAutoConfiguration {
|
||||||
|
|
||||||
private final WxMaProperties wxMaProperties;
|
|
||||||
private final ApplicationContext applicationContext;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 小程序service.
|
|
||||||
*
|
|
||||||
* @return 小程序service
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
@ConditionalOnMissingBean(WxMaService.class)
|
|
||||||
public WxMaService service(WxMaConfig wxMaConfig) {
|
|
||||||
HttpClientType httpClientType = wxMaProperties.getConfigStorage().getHttpClientType();
|
|
||||||
WxMaService wxMaService;
|
|
||||||
switch (httpClientType) {
|
|
||||||
case OkHttp:
|
|
||||||
wxMaService = new WxMaServiceOkHttpImpl();
|
|
||||||
break;
|
|
||||||
case JoddHttp:
|
|
||||||
wxMaService = new WxMaServiceJoddHttpImpl();
|
|
||||||
break;
|
|
||||||
case HttpClient:
|
|
||||||
wxMaService = new WxMaServiceHttpClientImpl();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
wxMaService = new WxMaServiceImpl();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
wxMaService.setWxMaConfig(wxMaConfig);
|
|
||||||
return wxMaService;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
@ConditionalOnMissingBean(WxMaConfig.class)
|
|
||||||
public WxMaConfig wxMaConfig() {
|
|
||||||
WxMaDefaultConfigImpl config;
|
|
||||||
switch (wxMaProperties.getConfigStorage().getType()) {
|
|
||||||
case Jedis:
|
|
||||||
config = WxMaRedisBetterConfig.config(wxMaProperties, applicationContext);
|
|
||||||
break;
|
|
||||||
case RedisTemplate:
|
|
||||||
config = wxMaRedisTemplateConfigStorage();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
config = wxMaDefaultConfigStorage();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
config.setAppid(StringUtils.trimToNull(this.wxMaProperties.getAppid()));
|
|
||||||
config.setSecret(StringUtils.trimToNull(this.wxMaProperties.getSecret()));
|
|
||||||
config.setToken(StringUtils.trimToNull(this.wxMaProperties.getToken()));
|
|
||||||
config.setAesKey(StringUtils.trimToNull(this.wxMaProperties.getAesKey()));
|
|
||||||
config.setMsgDataFormat(StringUtils.trimToNull(this.wxMaProperties.getMsgDataFormat()));
|
|
||||||
|
|
||||||
WxMaProperties.ConfigStorage configStorageProperties = wxMaProperties.getConfigStorage();
|
|
||||||
config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
|
|
||||||
config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
|
|
||||||
config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
|
|
||||||
if (configStorageProperties.getHttpProxyPort() != null) {
|
|
||||||
config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
|
|
||||||
}
|
|
||||||
return config;
|
|
||||||
}
|
|
||||||
|
|
||||||
private WxMaDefaultConfigImpl wxMaDefaultConfigStorage() {
|
|
||||||
return new WxMaDefaultConfigImpl();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class WxMaRedisBetterConfig {
|
|
||||||
|
|
||||||
private static WxMaDefaultConfigImpl config(WxMaProperties wxMaProperties, ApplicationContext context) {
|
|
||||||
RedisProperties redisProperties = wxMaProperties.getConfigStorage().getRedis();
|
|
||||||
JedisPool jedisPool;
|
|
||||||
if (StringUtils.isNotEmpty(redisProperties.getHost())) {
|
|
||||||
JedisPoolConfig config = new JedisPoolConfig();
|
|
||||||
if (redisProperties.getMaxActive() != null) {
|
|
||||||
config.setMaxTotal(redisProperties.getMaxActive());
|
|
||||||
}
|
|
||||||
if (redisProperties.getMaxIdle() != null) {
|
|
||||||
config.setMaxIdle(redisProperties.getMaxIdle());
|
|
||||||
}
|
|
||||||
if (redisProperties.getMaxWaitMillis() != null) {
|
|
||||||
config.setMaxWaitMillis(redisProperties.getMaxWaitMillis());
|
|
||||||
}
|
|
||||||
if (redisProperties.getMinIdle() != null) {
|
|
||||||
config.setMinIdle(redisProperties.getMinIdle());
|
|
||||||
}
|
|
||||||
config.setTestOnBorrow(true);
|
|
||||||
config.setTestWhileIdle(true);
|
|
||||||
|
|
||||||
jedisPool = new JedisPool(config, redisProperties.getHost(), redisProperties.getPort(),
|
|
||||||
redisProperties.getTimeout(), redisProperties.getPassword(), redisProperties.getDatabase());
|
|
||||||
} else {
|
|
||||||
jedisPool = context.getBean(JedisPool.class);
|
|
||||||
}
|
|
||||||
WxRedisOps redisOps = new JedisWxRedisOps(jedisPool);
|
|
||||||
return new WxMaRedisBetterConfigImpl(redisOps, wxMaProperties.getConfigStorage().getKeyPrefix());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private WxMaDefaultConfigImpl wxMaRedisTemplateConfigStorage() {
|
|
||||||
StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class);
|
|
||||||
WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate);
|
|
||||||
return new WxMaRedisBetterConfigImpl(redisOps, wxMaProperties.getConfigStorage().getKeyPrefix());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,56 @@
|
|||||||
|
package com.binarywang.spring.starter.wxjava.miniapp.config;
|
||||||
|
|
||||||
|
import cn.binarywang.wx.miniapp.api.WxMaService;
|
||||||
|
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceHttpClientImpl;
|
||||||
|
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
|
||||||
|
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceJoddHttpImpl;
|
||||||
|
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceOkHttpImpl;
|
||||||
|
import cn.binarywang.wx.miniapp.config.WxMaConfig;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.enums.HttpClientType;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 微信小程序平台相关服务自动注册.
|
||||||
|
*
|
||||||
|
* @author someone TaoYu
|
||||||
|
*/
|
||||||
|
@Configuration
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class WxMaServiceAutoConfiguration {
|
||||||
|
|
||||||
|
private final WxMaProperties wxMaProperties;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 小程序service.
|
||||||
|
*
|
||||||
|
* @return 小程序service
|
||||||
|
*/
|
||||||
|
@Bean
|
||||||
|
@ConditionalOnMissingBean(WxMaService.class)
|
||||||
|
@ConditionalOnBean(WxMaConfig.class)
|
||||||
|
public WxMaService wxMaService(WxMaConfig wxMaConfig) {
|
||||||
|
HttpClientType httpClientType = wxMaProperties.getConfigStorage().getHttpClientType();
|
||||||
|
WxMaService wxMaService;
|
||||||
|
switch (httpClientType) {
|
||||||
|
case OkHttp:
|
||||||
|
wxMaService = new WxMaServiceOkHttpImpl();
|
||||||
|
break;
|
||||||
|
case JoddHttp:
|
||||||
|
wxMaService = new WxMaServiceJoddHttpImpl();
|
||||||
|
break;
|
||||||
|
case HttpClient:
|
||||||
|
wxMaService = new WxMaServiceHttpClientImpl();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
wxMaService = new WxMaServiceImpl();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
wxMaService.setWxMaConfig(wxMaConfig);
|
||||||
|
return wxMaService;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,23 @@
|
|||||||
|
package com.binarywang.spring.starter.wxjava.miniapp.config;
|
||||||
|
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.config.storage.WxMaInJedisConfigStorageConfiguration;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.config.storage.WxMaInMemoryConfigStorageConfiguration;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.config.storage.WxMaInRedisTemplateConfigStorageConfiguration;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.config.storage.WxMaInRedissonConfigStorageConfiguration;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.context.annotation.Import;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 微信小程序存储策略自动配置.
|
||||||
|
*
|
||||||
|
* @author someone TaoYu
|
||||||
|
*/
|
||||||
|
@Configuration
|
||||||
|
@Import({
|
||||||
|
WxMaInMemoryConfigStorageConfiguration.class,
|
||||||
|
WxMaInJedisConfigStorageConfiguration.class,
|
||||||
|
WxMaInRedisTemplateConfigStorageConfiguration.class,
|
||||||
|
WxMaInRedissonConfigStorageConfiguration.class
|
||||||
|
})
|
||||||
|
public class WxMaStorageAutoConfiguration {
|
||||||
|
}
|
@ -0,0 +1,39 @@
|
|||||||
|
package com.binarywang.spring.starter.wxjava.miniapp.config.storage;
|
||||||
|
|
||||||
|
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author yl TaoYu
|
||||||
|
*/
|
||||||
|
public abstract class AbstractWxMaConfigStorageConfiguration {
|
||||||
|
|
||||||
|
protected WxMaDefaultConfigImpl config(WxMaDefaultConfigImpl config, WxMaProperties properties) {
|
||||||
|
config.setAppid(StringUtils.trimToNull(properties.getAppid()));
|
||||||
|
config.setSecret(StringUtils.trimToNull(properties.getSecret()));
|
||||||
|
config.setToken(StringUtils.trimToNull(properties.getToken()));
|
||||||
|
config.setAesKey(StringUtils.trimToNull(properties.getAesKey()));
|
||||||
|
config.setMsgDataFormat(StringUtils.trimToNull(properties.getMsgDataFormat()));
|
||||||
|
|
||||||
|
WxMaProperties.ConfigStorage configStorageProperties = properties.getConfigStorage();
|
||||||
|
config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
|
||||||
|
config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
|
||||||
|
config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
|
||||||
|
if (configStorageProperties.getHttpProxyPort() != null) {
|
||||||
|
config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
|
||||||
|
}
|
||||||
|
|
||||||
|
int maxRetryTimes = configStorageProperties.getMaxRetryTimes();
|
||||||
|
if (configStorageProperties.getMaxRetryTimes() < 0) {
|
||||||
|
maxRetryTimes = 0;
|
||||||
|
}
|
||||||
|
int retrySleepMillis = configStorageProperties.getRetrySleepMillis();
|
||||||
|
if (retrySleepMillis < 0) {
|
||||||
|
retrySleepMillis = 1000;
|
||||||
|
}
|
||||||
|
config.setRetrySleepMillis(retrySleepMillis);
|
||||||
|
config.setMaxRetryTimes(maxRetryTimes);
|
||||||
|
return config;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,72 @@
|
|||||||
|
package com.binarywang.spring.starter.wxjava.miniapp.config.storage;
|
||||||
|
|
||||||
|
import cn.binarywang.wx.miniapp.config.WxMaConfig;
|
||||||
|
import cn.binarywang.wx.miniapp.config.impl.WxMaRedisBetterConfigImpl;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.properties.RedisProperties;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import me.chanjar.weixin.common.redis.JedisWxRedisOps;
|
||||||
|
import me.chanjar.weixin.common.redis.WxRedisOps;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
|
import org.springframework.context.ApplicationContext;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import redis.clients.jedis.JedisPool;
|
||||||
|
import redis.clients.jedis.JedisPoolConfig;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author yl TaoYu
|
||||||
|
*/
|
||||||
|
@Configuration
|
||||||
|
@ConditionalOnProperty(prefix = WxMaProperties.PREFIX + ".config-storage", name = "type", havingValue = "jedis")
|
||||||
|
@ConditionalOnClass({JedisPool.class, JedisPoolConfig.class})
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class WxMaInJedisConfigStorageConfiguration extends AbstractWxMaConfigStorageConfiguration {
|
||||||
|
private final WxMaProperties properties;
|
||||||
|
private final ApplicationContext applicationContext;
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
@ConditionalOnMissingBean(WxMaConfig.class)
|
||||||
|
public WxMaConfig wxMaConfig() {
|
||||||
|
WxMaRedisBetterConfigImpl config = getWxMaRedisBetterConfigImpl();
|
||||||
|
return this.config(config, properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
private WxMaRedisBetterConfigImpl getWxMaRedisBetterConfigImpl() {
|
||||||
|
RedisProperties redisProperties = properties.getConfigStorage().getRedis();
|
||||||
|
JedisPool jedisPool;
|
||||||
|
if (redisProperties != null && StringUtils.isNotEmpty(redisProperties.getHost())) {
|
||||||
|
jedisPool = getJedisPool();
|
||||||
|
} else {
|
||||||
|
jedisPool = applicationContext.getBean(JedisPool.class);
|
||||||
|
}
|
||||||
|
WxRedisOps redisOps = new JedisWxRedisOps(jedisPool);
|
||||||
|
return new WxMaRedisBetterConfigImpl(redisOps, properties.getConfigStorage().getKeyPrefix());
|
||||||
|
}
|
||||||
|
|
||||||
|
private JedisPool getJedisPool() {
|
||||||
|
WxMaProperties.ConfigStorage storage = properties.getConfigStorage();
|
||||||
|
RedisProperties redis = storage.getRedis();
|
||||||
|
|
||||||
|
JedisPoolConfig config = new JedisPoolConfig();
|
||||||
|
if (redis.getMaxActive() != null) {
|
||||||
|
config.setMaxTotal(redis.getMaxActive());
|
||||||
|
}
|
||||||
|
if (redis.getMaxIdle() != null) {
|
||||||
|
config.setMaxIdle(redis.getMaxIdle());
|
||||||
|
}
|
||||||
|
if (redis.getMaxWaitMillis() != null) {
|
||||||
|
config.setMaxWaitMillis(redis.getMaxWaitMillis());
|
||||||
|
}
|
||||||
|
if (redis.getMinIdle() != null) {
|
||||||
|
config.setMinIdle(redis.getMinIdle());
|
||||||
|
}
|
||||||
|
config.setTestOnBorrow(true);
|
||||||
|
config.setTestWhileIdle(true);
|
||||||
|
|
||||||
|
return new JedisPool(config, redis.getHost(), redis.getPort(), redis.getTimeout(), redis.getPassword(), redis.getDatabase());
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,28 @@
|
|||||||
|
package com.binarywang.spring.starter.wxjava.miniapp.config.storage;
|
||||||
|
|
||||||
|
import cn.binarywang.wx.miniapp.config.WxMaConfig;
|
||||||
|
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author yl TaoYu
|
||||||
|
*/
|
||||||
|
@Configuration
|
||||||
|
@ConditionalOnProperty(prefix = WxMaProperties.PREFIX + ".config-storage", name = "type",
|
||||||
|
matchIfMissing = true, havingValue = "memory")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class WxMaInMemoryConfigStorageConfiguration extends AbstractWxMaConfigStorageConfiguration {
|
||||||
|
private final WxMaProperties properties;
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
@ConditionalOnMissingBean(WxMaConfig.class)
|
||||||
|
public WxMaConfig wxMaConfig() {
|
||||||
|
WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
|
||||||
|
return this.config(config, properties);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,40 @@
|
|||||||
|
package com.binarywang.spring.starter.wxjava.miniapp.config.storage;
|
||||||
|
|
||||||
|
import cn.binarywang.wx.miniapp.config.WxMaConfig;
|
||||||
|
import cn.binarywang.wx.miniapp.config.impl.WxMaRedisBetterConfigImpl;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
|
||||||
|
import me.chanjar.weixin.common.redis.WxRedisOps;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
|
import org.springframework.context.ApplicationContext;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author yl TaoYu
|
||||||
|
*/
|
||||||
|
@Configuration
|
||||||
|
@ConditionalOnProperty(prefix = WxMaProperties.PREFIX + ".config-storage", name = "type", havingValue = "redistemplate")
|
||||||
|
@ConditionalOnClass(StringRedisTemplate.class)
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class WxMaInRedisTemplateConfigStorageConfiguration extends AbstractWxMaConfigStorageConfiguration {
|
||||||
|
private final WxMaProperties properties;
|
||||||
|
private final ApplicationContext applicationContext;
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
@ConditionalOnMissingBean(WxMaConfig.class)
|
||||||
|
public WxMaConfig wxMaConfig() {
|
||||||
|
WxMaRedisBetterConfigImpl config = getWxMaInRedisTemplateConfigStorage();
|
||||||
|
return this.config(config, properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
private WxMaRedisBetterConfigImpl getWxMaInRedisTemplateConfigStorage() {
|
||||||
|
StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class);
|
||||||
|
WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate);
|
||||||
|
return new WxMaRedisBetterConfigImpl(redisOps, properties.getConfigStorage().getKeyPrefix());
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,61 @@
|
|||||||
|
package com.binarywang.spring.starter.wxjava.miniapp.config.storage;
|
||||||
|
|
||||||
|
import cn.binarywang.wx.miniapp.config.WxMaConfig;
|
||||||
|
import cn.binarywang.wx.miniapp.config.impl.WxMaRedissonConfigImpl;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.properties.RedisProperties;
|
||||||
|
import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.redisson.Redisson;
|
||||||
|
import org.redisson.api.RedissonClient;
|
||||||
|
import org.redisson.config.Config;
|
||||||
|
import org.redisson.config.TransportMode;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
|
import org.springframework.context.ApplicationContext;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author yl TaoYu
|
||||||
|
*/
|
||||||
|
@Configuration
|
||||||
|
@ConditionalOnProperty(prefix = WxMaProperties.PREFIX + ".config-storage", name = "type", havingValue = "redisson")
|
||||||
|
@ConditionalOnClass({Redisson.class, RedissonClient.class})
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class WxMaInRedissonConfigStorageConfiguration extends AbstractWxMaConfigStorageConfiguration {
|
||||||
|
private final WxMaProperties properties;
|
||||||
|
private final ApplicationContext applicationContext;
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
@ConditionalOnMissingBean(WxMaConfig.class)
|
||||||
|
public WxMaConfig wxMaConfig() {
|
||||||
|
WxMaRedissonConfigImpl config = getWxMaInRedissonConfigStorage();
|
||||||
|
return this.config(config, properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
private WxMaRedissonConfigImpl getWxMaInRedissonConfigStorage() {
|
||||||
|
RedisProperties redisProperties = properties.getConfigStorage().getRedis();
|
||||||
|
RedissonClient redissonClient;
|
||||||
|
if (redisProperties != null && StringUtils.isNotEmpty(redisProperties.getHost())) {
|
||||||
|
redissonClient = getRedissonClient();
|
||||||
|
} else {
|
||||||
|
redissonClient = applicationContext.getBean(RedissonClient.class);
|
||||||
|
}
|
||||||
|
return new WxMaRedissonConfigImpl(redissonClient, properties.getConfigStorage().getKeyPrefix());
|
||||||
|
}
|
||||||
|
|
||||||
|
private RedissonClient getRedissonClient() {
|
||||||
|
WxMaProperties.ConfigStorage storage = properties.getConfigStorage();
|
||||||
|
RedisProperties redis = storage.getRedis();
|
||||||
|
|
||||||
|
Config config = new Config();
|
||||||
|
config.useSingleServer()
|
||||||
|
.setAddress("redis://" + redis.getHost() + ":" + redis.getPort())
|
||||||
|
.setDatabase(redis.getDatabase())
|
||||||
|
.setPassword(redis.getPassword());
|
||||||
|
config.setTransportMode(TransportMode.NIO);
|
||||||
|
return Redisson.create(config);
|
||||||
|
}
|
||||||
|
}
|
@ -6,6 +6,8 @@ import lombok.Data;
|
|||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
import org.springframework.boot.context.properties.NestedConfigurationProperty;
|
import org.springframework.boot.context.properties.NestedConfigurationProperty;
|
||||||
|
|
||||||
|
import static com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties.PREFIX;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 属性配置类.
|
* 属性配置类.
|
||||||
*
|
*
|
||||||
@ -13,8 +15,10 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty;
|
|||||||
* @date 2019-08-10
|
* @date 2019-08-10
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@ConfigurationProperties(prefix = "wx.miniapp")
|
@ConfigurationProperties(prefix = PREFIX)
|
||||||
public class WxMaProperties {
|
public class WxMaProperties {
|
||||||
|
public static final String PREFIX = "wx.miniapp";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设置微信小程序的appid.
|
* 设置微信小程序的appid.
|
||||||
*/
|
*/
|
||||||
@ -88,6 +92,21 @@ public class WxMaProperties {
|
|||||||
* http代理密码.
|
* http代理密码.
|
||||||
*/
|
*/
|
||||||
private String httpProxyPassword;
|
private String httpProxyPassword;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* http 请求重试间隔
|
||||||
|
* <pre>
|
||||||
|
* {@link cn.binarywang.wx.miniapp.api.impl.BaseWxMaServiceImpl#setRetrySleepMillis(int)}
|
||||||
|
* </pre>
|
||||||
|
*/
|
||||||
|
private int retrySleepMillis = 1000;
|
||||||
|
/**
|
||||||
|
* http 请求最大重试次数
|
||||||
|
* <pre>
|
||||||
|
* {@link cn.binarywang.wx.miniapp.api.impl.BaseWxMaServiceImpl#setMaxRetryTimes(int)}
|
||||||
|
* </pre>
|
||||||
|
*/
|
||||||
|
private int maxRetryTimes = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
package cn.binarywang.wx.miniapp.config.impl;
|
package cn.binarywang.wx.miniapp.config.impl;
|
||||||
|
|
||||||
import me.chanjar.weixin.common.enums.TicketType;
|
import me.chanjar.weixin.common.enums.TicketType;
|
||||||
import me.chanjar.weixin.common.redis.JedisWxRedisOps;
|
|
||||||
import me.chanjar.weixin.common.redis.WxRedisOps;
|
import me.chanjar.weixin.common.redis.WxRedisOps;
|
||||||
import redis.clients.jedis.JedisPool;
|
|
||||||
|
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user