Commit 3b1645d

authored

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

合并 Develop

2 parents 3be1048 + 919a534 commit 3b1645dCopy full SHA for 3b1645d

File tree

365 files changed

+5018

-12569

lines changed

pom.xml
quality-checks
- google_checks.xml
weixin-java-common
- pom.xml
- src
  - main/java/me/chanjar/weixin/common
  - test/java/me/chanjar/weixin/common
    - bean
      - WxErrorTest.java
    - util/crypto
      - SHA1Test.java
weixin-java-cp
- pom.xml
- src
  - main/java/me/chanjar/weixin/cp
  - test/java/me/chanjar/weixin/cp
    - api
    - bean
      - WxCpXmlMessageTest.java
weixin-java-miniapp
- pom.xml
- src
  - main/java/cn/binarywang/wx/miniapp
  - test/java/cn/binarywang/wx/miniapp
    - api/impl
      - WxMaMsgServiceImplTest.java
    - bean
    - demo
      - WxMaDemoServer.java
weixin-java-mp
- pom.xml
- src
  - main/java/me/chanjar/weixin/mp
  - test/java/me/chanjar/weixin/mp
weixin-java-open
weixin-java-pay
- pom.xml
- src
  - main/java/com/github/binarywang/wxpay
  - test/java/com/github/binarywang/wxpay
    - service/impl
      - WxPayServiceAbstractImplTest.java
    - util
      - SignUtilsTest.java

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 number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`<modelVersion>4.0.0</modelVersion>`
`7`	`7`	`<groupId>com.github.binarywang</groupId>`
`8`	`8`	`<artifactId>weixin-java-parent</artifactId>`
`9`		`- <version>2.8.0</version>`
	`9`	`+ <version>2.9.0</version>`
`10`	`10`	`<packaging>pom</packaging>`
`11`	`11`	`<name>WeiXin Java Tools - Parent</name>`
`12`	`12`	`<description>微信公众号、企业号上级POM</description>`
`@@ -80,6 +80,11 @@`
`80`	`80`	`<email>crskyp@gmail.com</email>`
`81`	`81`	`<url>https://github.com/crskyp</url>`
`82`	`82`	`</developer>`
	`83`	`+ <developer>`
	`84`	`+ <name>007</name>`
	`85`	`+ <email>007gzs@gmail.com</email>`
	`86`	`+ <url>https://github.com/007gzs</url>`
	`87`	`+ </developer>`
`83`	`88`	`</developers>`
`84`	`89`
`85`	`90`	`<scm>`
`@@ -94,6 +99,7 @@`
`94`	`99`	`<module>weixin-java-mp</module>`
`95`	`100`	`<module>weixin-java-pay</module>`
`96`	`101`	`<module>weixin-java-miniapp</module>`
	`102`	`+ <module>weixin-java-open</module>`
`97`	`103`	`<!--module>weixin-java-osgi</module-->`
`98`	`104`	`</modules>`
`99`	`105`
`@@ -225,6 +231,12 @@`
`225`	`231`	`<version>2.9.0</version>`
`226`	`232`	`<scope>provided</scope>`
`227`	`233`	`</dependency>`
	`234`	`+ <dependency>`
	`235`	`+ <groupId>org.projectlombok</groupId>`
	`236`	`+ <artifactId>lombok</artifactId>`
	`237`	`+ <version>1.16.18</version>`
	`238`	`+ <scope>compile</scope>`
	`239`	`+ </dependency>`
`228`	`240`	`</dependencies>`
`229`	`241`	`</dependencyManagement>`
`230`	`242`

`‎quality-checks/google_checks.xml‎`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`<property name="allowNonPrintableEscapes" value="true"/>`
`41`	`41`	`</module>`
`42`	`42`	`<module name="LineLength">`
`43`		`- <property name="max" value="100"/>`
	`43`	`+ <property name="max" value="120"/>`
`44`	`44`	`<property name="ignorePattern" value="^package.\|^import.\|a href\|href\|http://\|https://\|ftp://"/>`
`45`	`45`	`</module>`
`46`	`46`	`<module name="AvoidStarImport"/>`
`@@ -52,7 +52,7 @@`
`52`	`52`	`</module>`
`53`	`53`	`<module name="NeedBraces"/>`
`54`	`54`	`<module name="LeftCurly">`
`55`		`- <property name="maxLineLength" value="100"/>`
	`55`	`+ <property name="maxLineLength" value="120"/>`
`56`	`56`	`</module>`
`57`	`57`	`<module name="RightCurly">`
`58`	`58`	`<property name="id" value="RightCurlySame"/>`
`@@ -163,9 +163,12 @@`
`163`	`163`	`<module name="OverloadMethodsDeclarationOrder"/>`
`164`	`164`	`<module name="VariableDeclarationUsageDistance"/>`
`165`	`165`	`<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\."/>`
`166`	`170`	`<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"/>`
`169`	`172`	`</module>`
`170`	`173`	`<module name="MethodParamPad"/>`
`171`	`174`	`<module name="ParenPad"/>`

`‎weixin-java-common/pom.xml‎`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`<parent>`
`8`	`8`	`<groupId>com.github.binarywang</groupId>`
`9`	`9`	`<artifactId>weixin-java-parent</artifactId>`
`10`		`- <version>2.8.0</version>`
	`10`	`+ <version>2.9.0</version>`
`11`	`11`	`</parent>`
`12`	`12`
`13`	`13`	`<artifactId>weixin-java-common</artifactId>`
`@@ -74,6 +74,10 @@`
`74`	`74`	`<groupId>com.google.guava</groupId>`
`75`	`75`	`<artifactId>guava</artifactId>`
`76`	`76`	`</dependency>`
	`77`	`+ <dependency>`
	`78`	`+ <groupId>org.projectlombok</groupId>`
	`79`	`+ <artifactId>lombok</artifactId>`
	`80`	`+ </dependency>`
`77`	`81`
`78`	`82`	`<dependency>`
`79`	`83`	`<groupId>ch.qos.logback</groupId>`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 3b1645d

File tree

365 files changed

Some content is hidden

365 files changed

`‎pom.xml‎`

`‎quality-checks/google_checks.xml‎`

`‎weixin-java-common/pom.xml‎`

0 commit comments