Skip to content

Commit 6a87c67

Browse files
MolzxMolzx
committed
Merge branch 'develop' of github.com:Wechat-Group/WxJava into source-develop
* 'develop' of github.com:Wechat-Group/WxJava: 🎨 完善部分代码注释，修复 yaml 未自动提示 hosts 配置问题 🆕 binarywang#3347 【开放平台】新增小程序备案相关接口 🎨 binarywang#3343 【小程序】媒资管理新增字段status以支持审核状态展示 🎨 binarywang#3333 【企业微信】设置应用在用户工作台展示的webview型数据时，支持enable_webview_click参数设置 🆕 binarywang#3340【微信支付】增加直连商户付款码支付和撤销支付订单的V3版接口实现 🆕 binarywang#3339 【企业微信】增加上传临时素材的重载方法 🎨 binarywang#3337 【视频号小店】 订单详情字段补充、售后新特性补充 🎨 Bump org.bouncycastle:bcpkix-jdk18on & bcprov-jdk18on from 1.78 to 1.78.1 🔖 发布 4.6.3.B 测试版本
2 parents b85535f + 39a152b commit 6a87c67

File tree

46 files changed

+2060
-21
lines changed

Some content is hidden

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

46 files changed

+2060
-21
lines changed

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.github.binarywang</groupId>
55
<artifactId>wx-java</artifactId>
6-
<version>4.6.2.B</version>
6+
<version>4.6.3.B</version>
77
<packaging>pom</packaging>
88
<name>WxJava - Weixin/Wechat Java SDK</name>
99
<description>微信开发Java SDK</description>

‎spring-boot-starters/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>wx-java</artifactId>
9-
<version>4.6.2.B</version>
9+
<version>4.6.3.B</version>
1010
</parent>
1111
<packaging>pom</packaging>
1212
<artifactId>wx-java-spring-boot-starters</artifactId>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>wx-java-spring-boot-starters</artifactId>
55
<groupId>com.github.binarywang</groupId>
6-
<version>4.6.2.B</version>
6+
<version>4.6.3.B</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>wx-java-spring-boot-starters</artifactId>
66
<groupId>com.github.binarywang</groupId>
7-
<version>4.6.2.B</version>
7+
<version>4.6.3.B</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>wx-java-spring-boot-starters</artifactId>
66
<groupId>com.github.binarywang</groupId>
7-
<version>4.6.2.B</version>
7+
<version>4.6.3.B</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>wx-java-spring-boot-starters</artifactId>
66
<groupId>com.github.binarywang</groupId>
7-
<version>4.6.2.B</version>
7+
<version>4.6.3.B</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-spring-boot-starters</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.6.2.B</version>
8+
<version>4.6.3.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

+9
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,19 @@ public class WxMpMultiProperties implements Serializable {
3737
public static class HostConfig implements Serializable {
3838
private static final long serialVersionUID = -4172767630740346001L;
3939

40+
/**
41+
* 对应于：https://api.weixin.qq.com
42+
*/
4043
private String apiHost;
4144

45+
/**
46+
* 对应于：https://open.weixin.qq.com
47+
*/
4248
private String openHost;
4349

50+
/**
51+
* 对应于：https://mp.weixin.qq.com
52+
*/
4453
private String mpHost;
4554
}
4655

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-spring-boot-starters</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.6.2.B</version>
8+
<version>4.6.3.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

+9
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,19 @@ public class HostConfig implements Serializable {
99

1010
private static final long serialVersionUID = -4172767630740346001L;
1111

12+
/**
13+
* 对应于：https://api.weixin.qq.com
14+
*/
1215
private String apiHost;
1316

17+
/**
18+
* 对应于：https://open.weixin.qq.com
19+
*/
1420
private String openHost;
1521

22+
/**
23+
* 对应于：https://mp.weixin.qq.com
24+
*/
1625
private String mpHost;
1726

1827
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class WxMpProperties {
4040
* 设置微信公众号的EncodingAESKey.
4141
*/
4242
private String aesKey;
43-
43+
4444
/**
4545
* 是否使用稳定版 Access Token
4646
*/
@@ -49,6 +49,7 @@ public class WxMpProperties {
4949
/**
5050
* 自定义host配置
5151
*/
52+
@NestedConfigurationProperty
5253
private HostConfig hosts;
5354

5455
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-spring-boot-starters</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.6.2.B</version>
8+
<version>4.6.3.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-spring-boot-starters</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.6.2.B</version>
8+
<version>4.6.3.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>wx-java-spring-boot-starters</artifactId>
55
<groupId>com.github.binarywang</groupId>
6-
<version>4.6.2.B</version>
6+
<version>4.6.3.B</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎weixin-graal/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>wx-java</artifactId>
9-
<version>4.6.2.B</version>
9+
<version>4.6.3.B</version>
1010
</parent>
1111

1212
<artifactId>weixin-graal</artifactId>

‎weixin-java-channel/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>wx-java</artifactId>
9-
<version>4.6.2.B</version>
9+
<version>4.6.3.B</version>
1010
</parent>
1111

1212
<artifactId>weixin-java-channel</artifactId>

‎weixin-java-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>wx-java</artifactId>
9-
<version>4.6.2.B</version>
9+
<version>4.6.3.B</version>
1010
</parent>
1111

1212
<artifactId>weixin-java-common</artifactId>

‎weixin-java-cp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>wx-java</artifactId>
10-
<version>4.6.2.B</version>
10+
<version>4.6.3.B</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-cp</artifactId>

‎weixin-java-miniapp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>wx-java</artifactId>
10-
<version>4.6.2.B</version>
10+
<version>4.6.3.B</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-miniapp</artifactId>

‎weixin-java-mp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>wx-java</artifactId>
10-
<version>4.6.2.B</version>
10+
<version>4.6.3.B</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-mp</artifactId>

‎weixin-java-open/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>wx-java</artifactId>
10-
<version>4.6.2.B</version>
10+
<version>4.6.3.B</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-open</artifactId>

0 commit comments

Comments
 (0)