Skip to content

Commit

Permalink
Merge branch 'master-upstream'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
richard.li committed Feb 12, 2019
1 parent af14a50 commit 3374517
Showing 1 changed file with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import me.chanjar.weixin.common.util.ToStringUtils;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;

import java.io.Serializable;
Expand All @@ -28,6 +31,6 @@ public static WxMpFastRegisterResult fromJson(String json) {

@Override
public String toString() {
return ToStringUtils.toSimpleString(this);
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
}
}

0 comments on commit 3374517

Please sign in to comment.