Skip to content

Commit e7f2bd6

Browse files
fanxiayang12fanxiayang12
authored
🆕 binarywang#1952 增加腾讯企点子模块，用于对接企点开放平台。
1 parent a8232f6 commit e7f2bd6

File tree

54 files changed

+3928
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+3928
-12
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
.bash
2+
.history
3+
14
*.class
25
test-output
36

‎pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0"?>
2-
<project
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
5-
xmlns="http://maven.apache.org/POM/4.0.0">
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
63
<modelVersion>4.0.0</modelVersion>
74
<groupId>com.github.binarywang</groupId>
85
<artifactId>wx-java</artifactId>
@@ -111,6 +108,7 @@
111108
<module>weixin-java-pay</module>
112109
<module>weixin-java-miniapp</module>
113110
<module>weixin-java-open</module>
111+
<module>weixin-java-qidian</module>
114112
<module>spring-boot-starters</module>
115113
<!--module>weixin-java-osgi</module-->
116114
</modules>

‎spring-boot-starters/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0"?>
2-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0">
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
53
<modelVersion>4.0.0</modelVersion>
64
<parent>
75
<groupId>com.github.binarywang</groupId>
@@ -22,6 +20,7 @@
2220
<module>wx-java-mp-spring-boot-starter</module>
2321
<module>wx-java-pay-spring-boot-starter</module>
2422
<module>wx-java-open-spring-boot-starter</module>
23+
<module>wx-java-qidian-spring-boot-starter</module>
2524
</modules>
2625

2726
<dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
*/
1313
@Configuration
1414
@EnableConfigurationProperties(WxMpProperties.class)
15-
@Import({WxMpStorageAutoConfiguration.class, WxMpServiceAutoConfiguration.class})
15+
@Import({ WxMpStorageAutoConfiguration.class, WxMpServiceAutoConfiguration.class })
1616
public class WxMpAutoConfiguration {
1717
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private WxMpConfigStorage jedisConfigStorage() {
8888
}
8989
WxRedisOps redisOps = new JedisWxRedisOps(jedisPool);
9090
WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps,
91-
wxMpProperties.getConfigStorage().getKeyPrefix());
91+
wxMpProperties.getConfigStorage().getKeyPrefix());
9292
setWxMpInfo(wxMpRedisConfig);
9393
return wxMpRedisConfig;
9494
}
@@ -114,7 +114,7 @@ private WxMpConfigStorage redisTemplateConfigStorage() {
114114

115115
WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate);
116116
WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps,
117-
wxMpProperties.getConfigStorage().getKeyPrefix());
117+
wxMpProperties.getConfigStorage().getKeyPrefix());
118118

119119
setWxMpInfo(wxMpRedisConfig);
120120
return wxMpRedisConfig;
@@ -160,6 +160,6 @@ private JedisPoolAbstract getJedisPool() {
160160
}
161161

162162
return new JedisPool(config, redis.getHost(), redis.getPort(), redis.getTimeout(), redis.getPassword(),
163-
redis.getDatabase());
163+
redis.getDatabase());
164164
}
165165
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import static com.binarywang.spring.starter.wxjava.mp.enums.StorageType.Memory;
1212
import static com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties.PREFIX;
1313

14-
1514
/**
1615
* 微信接入相关配置属性.
1716
*

‎spring-boot-starters/wx-java-qidian-spring-boot-starter/README.md‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# wx-java-qidian-spring-boot-starter
2+
3+
## 快速开始
4+
5+
1. 引入依赖
6+
```xml
7+
<dependency>
8+
<groupId>com.github.binarywang</groupId>
9+
<artifactId>wx-java-qidian-spring-boot-starter</artifactId>
10+
<version>${version}</version>
11+
</dependency>
12+
```
13+
2. 添加配置(application.properties)
14+
```properties
15+
# 公众号配置(必填)
16+
wx.mp.appId = appId
17+
wx.mp.secret = @secret
18+
wx.mp.token = @token
19+
wx.mp.aesKey = @aesKey
20+
# 存储配置redis(可选)
21+
wx.mp.config-storage.type = Jedis # 配置类型: Memory(默认), Jedis, RedisTemplate
22+
wx.mp.config-storage.key-prefix = wx # 相关redis前缀配置: wx(默认)
23+
wx.mp.config-storage.redis.host = 127.0.0.1
24+
wx.mp.config-storage.redis.port = 6379
25+
#单机和sentinel同时存在时，优先使用sentinel配置
26+
#wx.mp.config-storage.redis.sentinel-ips=127.0.0.1:16379,127.0.0.1:26379
27+
#wx.mp.config-storage.redis.sentinel-name=mymaster
28+
# http客户端配置
29+
wx.mp.config-storage.http-client-type=httpclient # http客户端类型: HttpClient(默认), OkHttp, JoddHttp
30+
wx.mp.config-storage.http-proxy-host=
31+
wx.mp.config-storage.http-proxy-port=
32+
wx.mp.config-storage.http-proxy-username=
33+
wx.mp.config-storage.http-proxy-password=
34+
# 公众号地址host配置
35+
#wx.mp.hosts.api-host=http://proxy.com/
36+
#wx.mp.hosts.open-host=http://proxy.com/
37+
#wx.mp.hosts.mp-host=http://proxy.com/
38+
```
39+
3. 自动注入的类型
40+
41+
- `WxMpService`
42+
- `WxMpConfigStorage`
43+
44+
4、参考 demo：
45+
https://github.com/binarywang/wx-java-mp-demo

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<parent>
4+
<artifactId>wx-java-spring-boot-starters</artifactId>
5+
<groupId>com.github.binarywang</groupId>
6+
<version>4.0.1.B</version>
7+
</parent>
8+
<modelVersion>4.0.0</modelVersion>
9+
10+
<artifactId>wx-java-qidian-spring-boot-starter</artifactId>
11+
<name>WxJava - Spring Boot Starter for QiDian</name>
12+
<description>腾讯企点的 Spring Boot Starter</description>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>com.github.binarywang</groupId>
17+
<artifactId>weixin-java-qidian</artifactId>
18+
<version>${project.version}</version>
19+
</dependency>
20+
<dependency>
21+
<groupId>redis.clients</groupId>
22+
<artifactId>jedis</artifactId>
23+
<scope>compile</scope>
24+
</dependency>
25+
<dependency>
26+
<groupId>org.springframework.data</groupId>
27+
<artifactId>spring-data-redis</artifactId>
28+
<version>${spring.boot.version}</version>
29+
<scope>provided</scope>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.jodd</groupId>
33+
<artifactId>jodd-http</artifactId>
34+
<scope>provided</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>com.squareup.okhttp3</groupId>
38+
<artifactId>okhttp</artifactId>
39+
<scope>provided</scope>
40+
</dependency>
41+
</dependencies>
42+
43+
<build>
44+
<plugins>
45+
<plugin>
46+
<groupId>org.springframework.boot</groupId>
47+
<artifactId>spring-boot-maven-plugin</artifactId>
48+
<version>${spring.boot.version}</version>
49+
</plugin>
50+
<plugin>
51+
<groupId>org.apache.maven.plugins</groupId>
52+
<artifactId>maven-source-plugin</artifactId>
53+
<version>2.2.1</version>
54+
<executions>
55+
<execution>
56+
<id>attach-sources</id>
57+
<goals>
58+
<goal>jar-no-fork</goal>
59+
</goals>
60+
</execution>
61+
</executions>
62+
</plugin>
63+
</plugins>
64+
</build>
65+
66+
</project>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.binarywang.spring.starter.wxjava.qidian.config;
2+
3+
import com.binarywang.spring.starter.wxjava.qidian.properties.WxQidianProperties;
4+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
5+
import org.springframework.context.annotation.Configuration;
6+
import org.springframework.context.annotation.Import;
7+
8+
/**
9+
* .
10+
*
11+
* @author someone
12+
*/
13+
@Configuration
14+
@EnableConfigurationProperties(WxQidianProperties.class)
15+
@Import({ WxQidianStorageAutoConfiguration.class, WxQidianServiceAutoConfiguration.class })
16+
public class WxQidianAutoConfiguration {
17+
}

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
package com.binarywang.spring.starter.wxjava.qidian.config;
2+
3+
import com.binarywang.spring.starter.wxjava.qidian.enums.HttpClientType;
4+
import com.binarywang.spring.starter.wxjava.qidian.properties.WxQidianProperties;
5+
import me.chanjar.weixin.qidian.api.WxQidianService;
6+
import me.chanjar.weixin.qidian.api.impl.WxQidianServiceHttpClientImpl;
7+
import me.chanjar.weixin.qidian.api.impl.WxQidianServiceImpl;
8+
import me.chanjar.weixin.qidian.api.impl.WxQidianServiceJoddHttpImpl;
9+
import me.chanjar.weixin.qidian.api.impl.WxQidianServiceOkHttpImpl;
10+
import me.chanjar.weixin.qidian.config.WxQidianConfigStorage;
11+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
12+
import org.springframework.context.annotation.Bean;
13+
import org.springframework.context.annotation.Configuration;
14+
15+
/**
16+
* 腾讯企点相关服务自动注册.
17+
*
18+
* @author alegria
19+
*/
20+
@Configuration
21+
public class WxQidianServiceAutoConfiguration {
22+
23+
@Bean
24+
@ConditionalOnMissingBean
25+
public WxQidianService wxQidianService(WxQidianConfigStorage configStorage, WxQidianProperties wxQidianProperties) {
26+
HttpClientType httpClientType = wxQidianProperties.getConfigStorage().getHttpClientType();
27+
WxQidianService wxQidianService;
28+
switch (httpClientType) {
29+
case OkHttp:
30+
wxQidianService = newWxQidianServiceOkHttpImpl();
31+
break;
32+
case JoddHttp:
33+
wxQidianService = newWxQidianServiceJoddHttpImpl();
34+
break;
35+
case HttpClient:
36+
wxQidianService = newWxQidianServiceHttpClientImpl();
37+
break;
38+
default:
39+
wxQidianService = newWxQidianServiceImpl();
40+
break;
41+
}
42+
43+
wxQidianService.setWxMpConfigStorage(configStorage);
44+
return wxQidianService;
45+
}
46+
47+
private WxQidianService newWxQidianServiceImpl() {
48+
return new WxQidianServiceImpl();
49+
}
50+
51+
private WxQidianService newWxQidianServiceHttpClientImpl() {
52+
return new WxQidianServiceHttpClientImpl();
53+
}
54+
55+
private WxQidianService newWxQidianServiceOkHttpImpl() {
56+
return new WxQidianServiceOkHttpImpl();
57+
}
58+
59+
private WxQidianService newWxQidianServiceJoddHttpImpl() {
60+
return new WxQidianServiceJoddHttpImpl();
61+
}
62+
63+
}

0 commit comments

Comments
 (0)