Skip to content

Commit 7feca8d

Browse files
lkqmlkqm
authored
🎨 binarywang#1521 微信小程序 spring-boot-starter 增加一些新特性
1 parent 340f341 commit 7feca8d

File tree

16 files changed

+477
-63
lines changed

16 files changed

+477
-63
lines changed

‎pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,14 @@
253253
<groupId>org.redisson</groupId>
254254
<artifactId>redisson</artifactId>
255255
<version>3.12.0</version>
256+
<optional>true</optional>
257+
<scope>provided</scope>
258+
</dependency>
259+
<dependency>
260+
<groupId>org.springframework.data</groupId>
261+
<artifactId>spring-data-redis</artifactId>
262+
<version>1.8.23.RELEASE</version>
263+
<optional>true</optional>
256264
<scope>provided</scope>
257265
</dependency>
258266
<dependency>

‎spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@
1919
<artifactId>weixin-java-miniapp</artifactId>
2020
<version>${project.version}</version>
2121
</dependency>
22+
<dependency>
23+
<groupId>redis.clients</groupId>
24+
<artifactId>jedis</artifactId>
25+
<scope>provided</scope>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.springframework.data</groupId>
29+
<artifactId>spring-data-redis</artifactId>
30+
<version>${spring.boot.version}</version>
31+
<scope>provided</scope>
32+
</dependency>
2233
</dependencies>
2334

2435
<build>

‎spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/config/WxMaAutoConfiguration.java‎

Lines changed: 91 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,23 @@
44
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
55
import cn.binarywang.wx.miniapp.config.WxMaConfig;
66
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
7+
import cn.binarywang.wx.miniapp.config.impl.WxMaRedisBetterConfigImpl;
78
import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
89
import lombok.AllArgsConstructor;
10+
import me.chanjar.weixin.common.redis.JedisWxRedisOps;
11+
import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
12+
import me.chanjar.weixin.common.redis.WxRedisOps;
913
import org.apache.commons.lang3.StringUtils;
1014
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
1115
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
1216
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
1317
import org.springframework.boot.context.properties.EnableConfigurationProperties;
18+
import org.springframework.context.ApplicationContext;
1419
import org.springframework.context.annotation.Bean;
1520
import org.springframework.context.annotation.Configuration;
21+
import org.springframework.data.redis.core.StringRedisTemplate;
22+
import redis.clients.jedis.JedisPool;
23+
import redis.clients.jedis.JedisPoolConfig;
1624

1725
/**
1826
* 自动配置.
@@ -26,7 +34,9 @@
2634
@EnableConfigurationProperties(WxMaProperties.class)
2735
@ConditionalOnProperty(prefix = "wx.miniapp", value = "enabled", matchIfMissing = true)
2836
public class WxMaAutoConfiguration {
29-
private WxMaProperties properties;
37+
38+
private final WxMaProperties wxMaProperties;
39+
private final ApplicationContext applicationContext;
3040

3141
/**
3242
* 小程序service.
@@ -35,16 +45,87 @@ public class WxMaAutoConfiguration {
3545
*/
3646
@Bean
3747
@ConditionalOnMissingBean(WxMaService.class)
38-
public WxMaService service() {
39-
WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
40-
config.setAppid(StringUtils.trimToNull(this.properties.getAppid()));
41-
config.setSecret(StringUtils.trimToNull(this.properties.getSecret()));
42-
config.setToken(StringUtils.trimToNull(this.properties.getToken()));
43-
config.setAesKey(StringUtils.trimToNull(this.properties.getAesKey()));
44-
config.setMsgDataFormat(StringUtils.trimToNull(this.properties.getMsgDataFormat()));
45-
48+
public WxMaService service(WxMaConfig wxMaConfig) {
4649
final WxMaServiceImpl service = new WxMaServiceImpl();
47-
service.setWxMaConfig(config);
50+
service.setWxMaConfig(wxMaConfig);
4851
return service;
4952
}
53+
54+
@Bean
55+
@ConditionalOnMissingBean(WxMaConfig.class)
56+
public WxMaConfig wxMaConfig() {
57+
WxMaProperties.StorageType type = wxMaProperties.getConfigStorage().getType();
58+
WxMaDefaultConfigImpl config;
59+
if (type == WxMaProperties.StorageType.jedis) {
60+
config = wxMaInJedisConfigStorage();
61+
} else if (type == WxMaProperties.StorageType.redistemplate) {
62+
config = wxMaInRedisTemplateConfigStorage();
63+
} else {
64+
config = wxMaInMemoryConfigStorage();
65+
}
66+
67+
config.setAppid(StringUtils.trimToNull(this.wxMaProperties.getAppid()));
68+
config.setSecret(StringUtils.trimToNull(this.wxMaProperties.getSecret()));
69+
config.setToken(StringUtils.trimToNull(this.wxMaProperties.getToken()));
70+
config.setAesKey(StringUtils.trimToNull(this.wxMaProperties.getAesKey()));
71+
config.setMsgDataFormat(StringUtils.trimToNull(this.wxMaProperties.getMsgDataFormat()));
72+
73+
WxMaProperties.ConfigStorage configStorageProperties = wxMaProperties.getConfigStorage();
74+
config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
75+
config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
76+
config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
77+
if (configStorageProperties.getHttpProxyPort() != null) {
78+
config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
79+
}
80+
return config;
81+
}
82+
83+
private WxMaDefaultConfigImpl wxMaInMemoryConfigStorage() {
84+
WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
85+
return config;
86+
}
87+
88+
private WxMaDefaultConfigImpl wxMaInJedisConfigStorage() {
89+
WxMaProperties.RedisProperties redisProperties = wxMaProperties.getConfigStorage().getRedis();
90+
JedisPool jedisPool;
91+
if (redisProperties != null && StringUtils.isNotEmpty(redisProperties.getHost())) {
92+
jedisPool = getJedisPool();
93+
} else {
94+
jedisPool = applicationContext.getBean(JedisPool.class);
95+
}
96+
WxRedisOps redisOps = new JedisWxRedisOps(jedisPool);
97+
WxMaRedisBetterConfigImpl wxMaRedisConfig = new WxMaRedisBetterConfigImpl(redisOps, wxMaProperties.getConfigStorage().getKeyPrefix());
98+
return wxMaRedisConfig;
99+
}
100+
101+
private WxMaDefaultConfigImpl wxMaInRedisTemplateConfigStorage() {
102+
StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class);
103+
WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate);
104+
WxMaRedisBetterConfigImpl wxMaRedisConfig = new WxMaRedisBetterConfigImpl(redisOps, wxMaProperties.getConfigStorage().getKeyPrefix());
105+
return wxMaRedisConfig;
106+
}
107+
108+
private JedisPool getJedisPool() {
109+
WxMaProperties.ConfigStorage storage = wxMaProperties.getConfigStorage();
110+
WxMaProperties.RedisProperties redis = storage.getRedis();
111+
112+
JedisPoolConfig config = new JedisPoolConfig();
113+
if (redis.getMaxActive() != null) {
114+
config.setMaxTotal(redis.getMaxActive());
115+
}
116+
if (redis.getMaxIdle() != null) {
117+
config.setMaxIdle(redis.getMaxIdle());
118+
}
119+
if (redis.getMaxWaitMillis() != null) {
120+
config.setMaxWaitMillis(redis.getMaxWaitMillis());
121+
}
122+
if (redis.getMinIdle() != null) {
123+
config.setMinIdle(redis.getMinIdle());
124+
}
125+
config.setTestOnBorrow(true);
126+
config.setTestWhileIdle(true);
127+
128+
return new JedisPool(config, redis.getHost(), redis.getPort(), redis.getTimeout(), redis.getPassword(),
129+
redis.getDatabase());
130+
}
50131
}

‎spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/properties/WxMaProperties.java‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import lombok.Data;
44
import org.springframework.boot.context.properties.ConfigurationProperties;
55

6+
import java.io.Serializable;
7+
68
/**
79
* 属性配置类.
810
*
@@ -36,4 +38,112 @@ public class WxMaProperties {
3638
* 消息格式，XML或者JSON.
3739
*/
3840
private String msgDataFormat;
41+
42+
/**
43+
* 存储策略
44+
*/
45+
private ConfigStorage configStorage = new ConfigStorage();
46+
47+
@Data
48+
public static class ConfigStorage implements Serializable {
49+
private static final long serialVersionUID = 4815731027000065434L;
50+
51+
/**
52+
* 存储类型.
53+
*/
54+
private StorageType type = StorageType.memory;
55+
56+
/**
57+
* 指定key前缀.
58+
*/
59+
private String keyPrefix = "wa";
60+
61+
/**
62+
* redis连接配置.
63+
*/
64+
private RedisProperties redis;
65+
66+
/**
67+
* http客户端类型.
68+
*/
69+
private HttpClientType httpClientType = HttpClientType.httpclient;
70+
71+
/**
72+
* http代理主机.
73+
*/
74+
private String httpProxyHost;
75+
76+
/**
77+
* http代理端口.
78+
*/
79+
private Integer httpProxyPort;
80+
81+
/**
82+
* http代理用户名.
83+
*/
84+
private String httpProxyUsername;
85+
86+
/**
87+
* http代理密码.
88+
*/
89+
private String httpProxyPassword;
90+
91+
}
92+
93+
public enum StorageType {
94+
/**
95+
* 内存.
96+
*/
97+
memory,
98+
/**
99+
* redis(JedisClient).
100+
*/
101+
jedis,
102+
/**
103+
* redis(RedisTemplate).
104+
*/
105+
redistemplate
106+
}
107+
108+
public enum HttpClientType {
109+
/**
110+
* HttpClient.
111+
*/
112+
httpclient
113+
}
114+
115+
@Data
116+
public static class RedisProperties implements Serializable {
117+
private static final long serialVersionUID = -5924815351660074401L;
118+
119+
/**
120+
* 主机地址.
121+
*/
122+
private String host;
123+
124+
/**
125+
* 端口号.
126+
*/
127+
private int port = 6379;
128+
129+
/**
130+
* 密码.
131+
*/
132+
private String password;
133+
134+
/**
135+
* 超时.
136+
*/
137+
private int timeout = 2000;
138+
139+
/**
140+
* 数据库.
141+
*/
142+
private int database = 0;
143+
144+
private Integer maxActive;
145+
private Integer maxIdle;
146+
private Integer maxWaitMillis;
147+
private Integer minIdle;
148+
}
39149
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.binarywang.spring.starter.wxjava.mp.config;
22

3-
import com.binarywang.spring.starter.wxjava.mp.extend.RedisTemplateWxMpRedisOps;
43
import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
54
import lombok.RequiredArgsConstructor;
5+
import me.chanjar.weixin.common.redis.JedisWxRedisOps;
6+
import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
7+
import me.chanjar.weixin.common.redis.WxRedisOps;
68
import me.chanjar.weixin.mp.config.WxMpConfigStorage;
79
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
810
import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl;
9-
import me.chanjar.weixin.mp.config.redis.JedisWxMpRedisOps;
10-
import me.chanjar.weixin.mp.config.redis.WxMpRedisOps;
1111
import org.apache.commons.lang3.StringUtils;
1212
import org.springframework.beans.factory.annotation.Value;
1313
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -65,15 +65,15 @@ private WxMpConfigStorage wxMpInJedisConfigStorage() {
6565
} else {
6666
jedisPool = applicationContext.getBean(JedisPool.class);
6767
}
68-
WxMpRedisOps redisOps = new JedisWxMpRedisOps(jedisPool);
68+
WxRedisOps redisOps = new JedisWxRedisOps(jedisPool);
6969
WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, wxMpProperties.getConfigStorage().getKeyPrefix());
7070
setWxMpInfo(wxMpRedisConfig);
7171
return wxMpRedisConfig;
7272
}
7373

7474
private WxMpConfigStorage wxMpInRedisTemplateConfigStorage() {
7575
StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class);
76-
WxMpRedisOps redisOps = new RedisTemplateWxMpRedisOps(redisTemplate);
76+
WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate);
7777
WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, wxMpProperties.getConfigStorage().getKeyPrefix());
7878
setWxMpInfo(wxMpRedisConfig);
7979
return wxMpRedisConfig;

‎weixin-java-common/pom.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,18 @@
122122
<groupId>redis.clients</groupId>
123123
<artifactId>jedis</artifactId>
124124
</dependency>
125-
126125
<dependency>
127126
<groupId>com.github.jedis-lock</groupId>
128127
<artifactId>jedis-lock</artifactId>
129128
</dependency>
129+
<dependency>
130+
<groupId>org.redisson</groupId>
131+
<artifactId>redisson</artifactId>
132+
</dependency>
133+
<dependency>
134+
<groupId>org.springframework.data</groupId>
135+
<artifactId>spring-data-redis</artifactId>
136+
</dependency>
130137
</dependencies>
131138

132139
<build>

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/BaseWxMpRedisOps.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/BaseWxRedisOps.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package me.chanjar.weixin.mp.config.redis;
1+
package me.chanjar.weixin.common.redis;
22

33
import java.util.concurrent.TimeUnit;
44
import java.util.concurrent.locks.Lock;
55

66
/**
7-
* 微信公众号redis操作基本类
7+
* 微信redis操作基本类
88
* <p>
99
* 非内置实现redis相关操作, 请实现该类
1010
*/
11-
public class BaseWxMpRedisOps implements WxMpRedisOps {
11+
public abstract class BaseWxRedisOps implements WxRedisOps {
1212

1313
@Override
1414
public String getValue(String key) {

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/JedisWxMpRedisOps.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
package me.chanjar.weixin.mp.config.redis;
1+
package me.chanjar.weixin.common.redis;
22

3-
import lombok.AllArgsConstructor;
3+
import lombok.RequiredArgsConstructor;
44
import me.chanjar.weixin.common.util.locks.JedisDistributedLock;
55
import redis.clients.jedis.Jedis;
66
import redis.clients.jedis.JedisPool;
77

88
import java.util.concurrent.TimeUnit;
99
import java.util.concurrent.locks.Lock;
1010

11-
/**
12-
* Jedis实现相关操作
13-
*/
14-
@AllArgsConstructor
15-
public class JedisWxMpRedisOps implements WxMpRedisOps {
11+
@RequiredArgsConstructor
12+
public class JedisWxRedisOps implements WxRedisOps {
1613

17-
private JedisPool jedisPool;
14+
private final JedisPool jedisPool;
1815

1916
@Override
2017
public String getValue(String key) {

0 commit comments

Comments
 (0)