|
2 | 2 |
|
3 | 3 | import com.thoughtworks.xstream.annotations.XStreamAlias; |
4 | 4 | import com.thoughtworks.xstream.annotations.XStreamConverter; |
| 5 | +import me.chanjar.weixin.common.util.ToStringUtils; |
5 | 6 | import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; |
6 | 7 | import me.chanjar.weixin.cp.config.WxCpConfigStorage; |
7 | 8 | import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil; |
@@ -175,12 +176,6 @@ protected static WxCpXmlMessage fromXml(InputStream is) { |
175 | 176 |
|
176 | 177 | /** |
177 | 178 | * 从加密字符串转换 |
178 | | - * |
179 | | - * @param encryptedXml |
180 | | - * @param wxCpConfigStorage |
181 | | - * @param timestamp |
182 | | - * @param nonce |
183 | | - * @param msgSignature |
184 | 179 | */ |
185 | 180 | public static WxCpXmlMessage fromEncryptedXml( |
186 | 181 | String encryptedXml, |
@@ -492,41 +487,7 @@ public void setSendLocationInfo(WxCpXmlMessage.SendLocationInfo sendLocationInfo |
492 | 487 |
|
493 | 488 | @Override |
494 | 489 | public String toString() { |
495 | | - return "WxCpXmlMessage{" + |
496 | | - "agentId=" + this.agentId + |
497 | | - ", toUserName='" + this.toUserName + '\'' + |
498 | | - ", fromUserName='" + this.fromUserName + '\'' + |
499 | | - ", createTime=" + this.createTime + |
500 | | - ", msgType='" + this.msgType + '\'' + |
501 | | - ", content='" + this.content + '\'' + |
502 | | - ", msgId=" + this.msgId + |
503 | | - ", picUrl='" + this.picUrl + '\'' + |
504 | | - ", mediaId='" + this.mediaId + '\'' + |
505 | | - ", format='" + this.format + '\'' + |
506 | | - ", thumbMediaId='" + this.thumbMediaId + '\'' + |
507 | | - ", locationX=" + this.locationX + |
508 | | - ", locationY=" + this.locationY + |
509 | | - ", scale=" + this.scale + |
510 | | - ", label='" + this.label + '\'' + |
511 | | - ", title='" + this.title + '\'' + |
512 | | - ", description='" + this.description + '\'' + |
513 | | - ", url='" + this.url + '\'' + |
514 | | - ", event='" + this.event + '\'' + |
515 | | - ", eventKey='" + this.eventKey + '\'' + |
516 | | - ", ticket='" + this.ticket + '\'' + |
517 | | - ", latitude=" + this.latitude + |
518 | | - ", longitude=" + this.longitude + |
519 | | - ", precision=" + this.precision + |
520 | | - ", recognition='" + this.recognition + '\'' + |
521 | | - ", status='" + this.status + '\'' + |
522 | | - ", totalCount=" + this.totalCount + |
523 | | - ", filterCount=" + this.filterCount + |
524 | | - ", sentCount=" + this.sentCount + |
525 | | - ", errorCount=" + this.errorCount + |
526 | | - ", scanCodeInfo=" + this.scanCodeInfo + |
527 | | - ", sendPicsInfo=" + this.sendPicsInfo + |
528 | | - ", sendLocationInfo=" + this.sendLocationInfo + |
529 | | - '}'; |
| 490 | + return ToStringUtils.toSimpleString(this); |
530 | 491 | } |
531 | 492 |
|
532 | 493 | @XStreamAlias("ScanCodeInfo") |
@@ -567,7 +528,6 @@ public void setScanResult(String scanResult) { |
567 | 528 |
|
568 | 529 | @XStreamAlias("SendPicsInfo") |
569 | 530 | public static class SendPicsInfo { |
570 | | - |
571 | 531 | @XStreamAlias("PicList") |
572 | 532 | protected final List<Item> picList = new ArrayList<>(); |
573 | 533 | @XStreamAlias("Count") |
|
0 commit comments