Skip to content

Commit 3b1645d

Browse files
binarywangbinarywang
authored
Merge pull request binarywang#391 from Wechat-Group/develop
合并 Develop
2 parents 3be1048 + 919a534 commit 3b1645d

File tree

365 files changed

+5018
-12569
lines changed

Some content is hidden

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

365 files changed

+5018
-12569
lines changed

‎pom.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>weixin-java-parent</artifactId>
9-
<version>2.8.0</version>
9+
<version>2.9.0</version>
1010
<packaging>pom</packaging>
1111
<name>WeiXin Java Tools - Parent</name>
1212
<description>微信公众号、企业号上级POM</description>
@@ -80,6 +80,11 @@
8080
<email>crskyp@gmail.com</email>
8181
<url>https://github.com/crskyp</url>
8282
</developer>
83+
<developer>
84+
<name>007</name>
85+
<email>007gzs@gmail.com</email>
86+
<url>https://github.com/007gzs</url>
87+
</developer>
8388
</developers>
8489

8590
<scm>
@@ -94,6 +99,7 @@
9499
<module>weixin-java-mp</module>
95100
<module>weixin-java-pay</module>
96101
<module>weixin-java-miniapp</module>
102+
<module>weixin-java-open</module>
97103
<!--module>weixin-java-osgi</module-->
98104
</modules>
99105

@@ -225,6 +231,12 @@
225231
<version>2.9.0</version>
226232
<scope>provided</scope>
227233
</dependency>
234+
<dependency>
235+
<groupId>org.projectlombok</groupId>
236+
<artifactId>lombok</artifactId>
237+
<version>1.16.18</version>
238+
<scope>compile</scope>
239+
</dependency>
228240
</dependencies>
229241
</dependencyManagement>
230242

‎quality-checks/google_checks.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<property name="allowNonPrintableEscapes" value="true"/>
4141
</module>
4242
<module name="LineLength">
43-
<property name="max" value="100"/>
43+
<property name="max" value="120"/>
4444
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
4545
</module>
4646
<module name="AvoidStarImport"/>
@@ -52,7 +52,7 @@
5252
</module>
5353
<module name="NeedBraces"/>
5454
<module name="LeftCurly">
55-
<property name="maxLineLength" value="100"/>
55+
<property name="maxLineLength" value="120"/>
5656
</module>
5757
<module name="RightCurly">
5858
<property name="id" value="RightCurlySame"/>
@@ -163,9 +163,12 @@
163163
<module name="OverloadMethodsDeclarationOrder"/>
164164
<module name="VariableDeclarationUsageDistance"/>
165165
<module name="CustomImportOrder">
166+
<property name="customImportOrderRules"
167+
value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
168+
<property name="specialImportsRegExp" value="^javax\."/>
169+
<property name="standardPackageRegExp" value="^java\."/>
166170
<property name="sortImportsInGroupAlphabetically" value="true"/>
167-
<property name="separateLineBetweenGroups" value="true"/>
168-
<property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
171+
<property name="separateLineBetweenGroups" value="false"/>
169172
</module>
170173
<module name="MethodParamPad"/>
171174
<module name="ParenPad"/>

‎weixin-java-common/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>weixin-java-parent</artifactId>
10-
<version>2.8.0</version>
10+
<version>2.9.0</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-common</artifactId>
@@ -74,6 +74,10 @@
7474
<groupId>com.google.guava</groupId>
7575
<artifactId>guava</artifactId>
7676
</dependency>
77+
<dependency>
78+
<groupId>org.projectlombok</groupId>
79+
<artifactId>lombok</artifactId>
80+
</dependency>
7781

7882
<dependency>
7983
<groupId>ch.qos.logback</groupId>

0 commit comments

Comments
 (0)