Merge pull request binarywang#391 from Wechat-Group/develop

合并 Develop

Author: binarywang

pom.xml

@@ -6,7 +6,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.github.binarywang</groupId>
  <artifactId>weixin-java-parent</artifactId>
- <version>2.8.0</version>
+ <version>2.9.0</version>
  <packaging>pom</packaging>
  <name>WeiXin Java Tools - Parent</name>
  <description>微信公众号、企业号上级POM</description>
@@ -80,6 +80,11 @@
  <email>crskyp@gmail.com</email>
  <url>https://github.com/crskyp</url>
  </developer>
+ <developer>
+ <name>007</name>
+ <email>007gzs@gmail.com</email>
+ <url>https://github.com/007gzs</url>
+ </developer>
  </developers>
 
  <scm>
@@ -94,6 +99,7 @@
  <module>weixin-java-mp</module>
  <module>weixin-java-pay</module>
  <module>weixin-java-miniapp</module>
+ <module>weixin-java-open</module>
  <!--module>weixin-java-osgi</module-->
  </modules>
 
@@ -225,6 +231,12 @@
  <version>2.9.0</version>
  <scope>provided</scope>
  </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.16.18</version>
+ <scope>compile</scope>
+ </dependency>
  </dependencies>
  </dependencyManagement>
 

quality-checks/google_checks.xml

@@ -40,7 +40,7 @@
  <property name="allowNonPrintableEscapes" value="true"/>
  </module>
  <module name="LineLength">
- <property name="max" value="100"/>
+ <property name="max" value="120"/>
  <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
  </module>
  <module name="AvoidStarImport"/>
@@ -52,7 +52,7 @@
  </module>
  <module name="NeedBraces"/>
  <module name="LeftCurly">
- <property name="maxLineLength" value="100"/>
+ <property name="maxLineLength" value="120"/>
  </module>
  <module name="RightCurly">
  <property name="id" value="RightCurlySame"/>
@@ -163,9 +163,12 @@
  <module name="OverloadMethodsDeclarationOrder"/>
  <module name="VariableDeclarationUsageDistance"/>
  <module name="CustomImportOrder">
+ <property name="customImportOrderRules"
+ value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
+ <property name="specialImportsRegExp" value="^javax\."/>
+ <property name="standardPackageRegExp" value="^java\."/>
  <property name="sortImportsInGroupAlphabetically" value="true"/>
- <property name="separateLineBetweenGroups" value="true"/>
- <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+ <property name="separateLineBetweenGroups" value="false"/>
  </module>
  <module name="MethodParamPad"/>
  <module name="ParenPad"/>

weixin-java-common/pom.xml

@@ -7,7 +7,7 @@
  <parent>
  <groupId>com.github.binarywang</groupId>
  <artifactId>weixin-java-parent</artifactId>
- <version>2.8.0</version>
+ <version>2.9.0</version>
  </parent>
 
  <artifactId>weixin-java-common</artifactId>
@@ -74,6 +74,10 @@
  <groupId>com.google.guava</groupId>
  <artifactId>guava</artifactId>
  </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
 
  <dependency>
  <groupId>ch.qos.logback</groupId>