Merge branch 'master-upstream'

* master-upstream: (181 commits)
  Update
  Update readme.md
  Update readme.md
  Update readme.md
  Upgrade org.eclipse.jetty:jetty-server to version 9.3.24.v20180605 or later.
  Create CONTRIBUTING.md
  Update demo.md
  Update readme.md
  Update readme.md
  发布3.2.0正式版本
  binarywang#769 WxMaCodeExtConfig增加缺少的tabBar属性
  pay模块批量添加缺失的javadoc文档
  调整checkstyle配置
  binarywang#708 企业微信素材管理增加上传图片接口
  binarywang#760 小程序增加统一服务消息接口
  Update readme.md
  发布3.1.9.B测试版本
  merge master
  binarywang#762 企业微信WxCpJedisConfigStorage增加JedisPool参数的构造方法
  binarywang#705 企业微信增加获取外部联系人详情接口
  ...

# Conflicts:
#	pom.xml
#	readme.md
#	weixin-java-common/pom.xml
#	weixin-java-cp/pom.xml
#	weixin-java-miniapp/pom.xml
#	weixin-java-mp/pom.xml
#	weixin-java-open/pom.xml
#	weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenComponentService.java
#	weixin-java-pay/pom.xml

CONTRIBUTING.md

@@ -0,0 +1 @@
+Please refer to [【代码贡献指南】](contribution.md).

demo.md

@@ -1,12 +1,16 @@
 
-### Demo项目
-在码云和GitHub上均可访问，会保持同步，请根据自己情况选用，欢迎提供更多的demo实现。
+## Demo项目
+### 说明
+1. 在码云和GitHub上均可访问，会尽量保持同步，请根据自己情况选用。
+1. 一般来说，Github上的版本应该是最新的，但也有可能没及时同步，此种情况下请以github上的版本为准，有问题也请在github对应项目issues页面提问）。
+1. 欢迎提供更多的demo实现。
 
-1. 微信支付Demo：[码云](http://gitee.com/binary/weixin-java-pay-demo)、[GitHub](https://github.com/binarywang/weixin-java-pay-demo)
-1. 企业号/企业微信Demo：[码云](http://gitee.com/binary/weixin-java-cp-demo)、[GitHub](https://github.com/binarywang/weixin-java-cp-demo)
-1. 微信小程序Demo：[码云](http://gitee.com/binary/weixin-java-miniapp-demo)、[GitHub](https://github.com/binarywang/weixin-java-miniapp-demo)
-1. 开放平台Demo：[码云](http://gitee.com/binary/weixin-java-open-demo)、[GitHub](https://github.com/Wechat-Group/weixin-java-open-demo)
+### Demo列表
+1. 微信支付Demo：[GitHub](https://github.com/binarywang/weixin-java-pay-demo)、[码云](http://gitee.com/binary/weixin-java-pay-demo)
+1. 企业号/企业微信Demo：[GitHub](https://github.com/binarywang/weixin-java-cp-demo)、[码云](http://gitee.com/binary/weixin-java-cp-demo)
+1. 微信小程序Demo：[GitHub](https://github.com/binarywang/weixin-java-miniapp-demo)、[码云](http://gitee.com/binary/weixin-java-miniapp-demo)
+1. 开放平台Demo：[GitHub](https://github.com/Wechat-Group/weixin-java-open-demo)、[码云](http://gitee.com/binary/weixin-java-open-demo)
 1. 公众号Demo：
-	- 使用Spring MVC实现的公众号Demo：[码云](http://gitee.com/binary/weixin-java-mp-demo-springmvc)、[GitHub](http://github.com/binarywang/weixin-java-mp-demo-springmvc)
-	- 使用Spring Boot实现的公众号Demo：[码云](http://gitee.com/binary/weixin-java-mp-demo-springboot)、[GitHub](http://github.com/binarywang/weixin-java-mp-demo-springboot)
-	- 含公众号和部分微信支付代码的Demo：[码云](http://gitee.com/binary/weixin-java-tools-springmvc)、[GitHub](http://github.com/Wechat-Group/weixin-java-tools-springmvc)
+	- 使用Spring MVC实现的公众号Demo：[GitHub](http://github.com/binarywang/weixin-java-mp-demo-springmvc)、[码云](https://gitee.com/binary/weixin-java-mp-demo)
+	- 使用Spring Boot实现的公众号Demo（支持多公众号）：[GitHub](http://github.com/binarywang/weixin-java-mp-demo-springboot)、[码云](http://gitee.com/binary/weixin-java-mp-demo-springboot)
+	- 含公众号和部分微信支付代码的Demo：[GitHub](http://github.com/Wechat-Group/weixin-java-tools-springmvc)、[码云](http://gitee.com/binary/weixin-java-tools-springmvc)

pom.xml

@@ -6,10 +6,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>3.1.1-SNAPSHOT</version>
+  <version>3.2.0</version>
   <packaging>pom</packaging>
   <name>Weixin Java Tools - Parent</name>
-  <description>微信公众号、企业号上级POM</description>
+  <description>微信开发Java SDK</description>
   <url>https://github.com/wechat-group/weixin-java-tools</url>
 
   <licenses>
@@ -88,9 +88,9 @@
   </developers>
 
   <scm>
-    <connection>scm:git:https://github.com/eanfs/weixin-java-tools.git</connection>
-    <developerConnection>scm:git:[email protected]:eanfs/weixin-java-tools.git</developerConnection>
-    <url>https://github.com/eanfs/weixin-java-tools</url>
+    <connection>scm:git:https://github.com/wechat-group/weixin-java-tools.git</connection>
+    <developerConnection>scm:git:[email protected]:wechat-group/weixin-java-tools.git</developerConnection>
+    <url>https://github.com/wechat-group/weixin-java-tools</url>
   </scm>
 
   <modules>
@@ -109,7 +109,7 @@
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <httpclient.version>4.5</httpclient.version>
-    <jetty.version>9.3.0.RC0</jetty.version>
+    <jetty.version>9.3.24.v20180605</jetty.version>
   </properties>
 
   <dependencyManagement>
@@ -245,7 +245,7 @@
     </dependencies>
   </dependencyManagement>
 
-  <!-- <distributionManagement>
+  <distributionManagement>
     <snapshotRepository>
       <id>ossrh</id>
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -254,18 +254,6 @@
       <id>ossrh</id>
       <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
     </repository>
-  </distributionManagement> -->
-  <distributionManagement>
-    <repository>
-      <id>esen_release</id>
-      <name>Internal Releases</name>
-      <url>http://nexus.esenyun.com/nexus/content/repositories/releases/</url>
-    </repository>
-    <snapshotRepository>
-      <id>esen_snapshot</id>
-      <name>Internal Releases</name>
-      <url>http://nexus.esenyun.com/nexus/content/repositories/snapshots/</url>
-    </snapshotRepository>
   </distributionManagement>
 
   <profiles>
@@ -354,8 +342,8 @@
         <version>1.6.3</version>
         <extensions>true</extensions>
         <configuration>
-          <serverId>esen_snapshot</serverId>
-          <nexusUrl>http://nexus.esenyun.com/</nexusUrl>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
           <autoReleaseAfterClose>true</autoReleaseAfterClose>
         </configuration>
       </plugin>

quality-checks/google_checks.xml

@@ -83,20 +83,6 @@
     <module name="EmptyLineSeparator">
       <property name="allowNoEmptyLineBetweenFields" value="true"/>
     </module>
-    <module name="SeparatorWrap">
-      <property name="id" value="SeparatorWrapDot"/>
-      <property name="tokens" value="DOT"/>
-      <property name="option" value="nl"/>
-    </module>
-    <module name="SeparatorWrap">
-      <property name="id" value="SeparatorWrapComma"/>
-      <property name="tokens" value="COMMA"/>
-      <property name="option" value="EOL"/>
-    </module>
-    <module name="SeparatorWrap">
-      <property name="id" value="SeparatorWrapMethodRef"/>
-      <property name="option" value="nl"/>
-    </module>
     <module name="PackageName">
       <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
       <message key="name.invalidPattern"
@@ -156,7 +142,7 @@
     <module name="VariableDeclarationUsageDistance"/>
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-                value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
+                value="SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###STATIC"/>
       <property name="specialImportsRegExp" value="^javax\."/>
       <property name="standardPackageRegExp" value="^java\."/>
       <property name="sortImportsInGroupAlphabetically" value="true"/>