From 87f023e6807a91a75464f6061e107b69abd03617 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Fri, 14 Oct 2016 13:47:19 +0800 Subject: [PATCH] =?UTF-8?q?CP=E9=83=A8=E5=88=86bean=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0serialVersionUID=20to=20fix=20#66?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/cp/bean/WxCpDepart.java | 7 ++---- .../chanjar/weixin/cp/bean/WxCpMessage.java | 14 +++++++----- .../me/chanjar/weixin/cp/bean/WxCpTag.java | 7 ++---- .../me/chanjar/weixin/cp/bean/WxCpUser.java | 7 ++---- .../weixin/cp/bean/WxCpXmlMessage.java | 22 +++++++++---------- .../cp/bean/WxCpXmlOutImageMessage.java | 2 ++ .../weixin/cp/bean/WxCpXmlOutMessage.java | 6 ++++- .../weixin/cp/bean/WxCpXmlOutNewsMessage.java | 8 ++++--- .../weixin/cp/bean/WxCpXmlOutTextMessage.java | 2 ++ .../cp/bean/WxCpXmlOutVideoMessage.java | 2 ++ .../cp/bean/WxCpXmlOutVoiceMessage.java | 2 ++ 11 files changed, 42 insertions(+), 37 deletions(-) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java index c8735086..a679dffe 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java @@ -1,9 +1,9 @@ package me.chanjar.weixin.cp.bean; -import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; - import java.io.Serializable; +import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; + /** * 微信部门 * @@ -11,9 +11,6 @@ import java.io.Serializable; */ public class WxCpDepart implements Serializable { - /** - * - */ private static final long serialVersionUID = -5028321625140879571L; private Integer id; private String name; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java index 6dba9091..e2422e3b 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java @@ -1,12 +1,17 @@ package me.chanjar.weixin.cp.bean; -import me.chanjar.weixin.cp.bean.messagebuilder.*; -import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import me.chanjar.weixin.cp.bean.messagebuilder.FileBuilder; +import me.chanjar.weixin.cp.bean.messagebuilder.ImageBuilder; +import me.chanjar.weixin.cp.bean.messagebuilder.NewsBuilder; +import me.chanjar.weixin.cp.bean.messagebuilder.TextBuilder; +import me.chanjar.weixin.cp.bean.messagebuilder.VideoBuilder; +import me.chanjar.weixin.cp.bean.messagebuilder.VoiceBuilder; +import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; + /** * 消息 * @@ -14,9 +19,6 @@ import java.util.List; */ public class WxCpMessage implements Serializable { - /** - * - */ private static final long serialVersionUID = -2082278303476631708L; private String toUser; private String toParty; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTag.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTag.java index ca11cb1f..4e1c034f 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTag.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTag.java @@ -1,17 +1,14 @@ package me.chanjar.weixin.cp.bean; -import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; - import java.io.Serializable; +import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; + /** * Created by Daniel Qian */ public class WxCpTag implements Serializable { - /** - * - */ private static final long serialVersionUID = -7243320279646928402L; private String id; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java index d1737d5d..93c3e5fe 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java @@ -1,11 +1,11 @@ package me.chanjar.weixin.cp.bean; -import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; + /** * 微信用户信息 * @@ -13,9 +13,6 @@ import java.util.List; */ public class WxCpUser implements Serializable { - /** - * - */ private static final long serialVersionUID = -5696099236344075582L; private final List extAttrs = new ArrayList<>(); private String userId; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java index 352fa2e6..93ca45c3 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java @@ -1,18 +1,20 @@ package me.chanjar.weixin.cp.bean; +import java.io.IOException; +import java.io.InputStream; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.io.IOUtils; + import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; + import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; import me.chanjar.weixin.cp.api.WxCpConfigStorage; import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil; import me.chanjar.weixin.cp.util.xml.XStreamTransformer; -import org.apache.commons.io.IOUtils; - -import java.io.IOException; -import java.io.InputStream; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; /** *
@@ -27,16 +29,12 @@ import java.util.List;
  */
 @XStreamAlias("xml")
 public class WxCpXmlMessage implements Serializable {
+  private static final long serialVersionUID = -1042994982179476410L;
 
   ///////////////////////
   // 以下都是微信推送过来的消息的xml的element所对应的属性
   ///////////////////////
 
-  /**
-   * 
-   */
-  private static final long serialVersionUID = -1042994982179476410L;
-
   @XStreamAlias("AgentID")
   private Integer agentId;
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutImageMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutImageMessage.java
index 44de8811..35cbe754 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutImageMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutImageMessage.java
@@ -2,11 +2,13 @@ package me.chanjar.weixin.cp.bean;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
+
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter;
 
 @XStreamAlias("xml")
 public class WxCpXmlOutImageMessage extends WxCpXmlOutMessage {
+  private static final long serialVersionUID = -1099446240667237313L;
 
   @XStreamAlias("Image")
   @XStreamConverter(value = XStreamMediaIdConverter.class)
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutMessage.java
index 332b5e24..0d90a012 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutMessage.java
@@ -8,8 +8,12 @@ import me.chanjar.weixin.cp.bean.outxmlbuilder.*;
 import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil;
 import me.chanjar.weixin.cp.util.xml.XStreamTransformer;
 
+import java.io.Serializable;
+
 @XStreamAlias("xml")
-public abstract class WxCpXmlOutMessage {
+public abstract class WxCpXmlOutMessage implements Serializable {
+
+  private static final long serialVersionUID = 1418629839964153110L;
 
   @XStreamAlias("ToUserName")
   @XStreamConverter(value = XStreamCDataConverter.class)
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessage.java
index 5906a324..8910f03f 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessage.java
@@ -1,15 +1,17 @@
 package me.chanjar.weixin.cp.bean;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
+
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @XStreamAlias("xml")
 public class WxCpXmlOutNewsMessage extends WxCpXmlOutMessage {
+  private static final long serialVersionUID = -5796178637883178826L;
 
   @XStreamAlias("Articles")
   protected final List articles = new ArrayList<>();
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutTextMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutTextMessage.java
index 3c59edf9..532e06c3 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutTextMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutTextMessage.java
@@ -2,11 +2,13 @@ package me.chanjar.weixin.cp.bean;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
+
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
 @XStreamAlias("xml")
 public class WxCpXmlOutTextMessage extends WxCpXmlOutMessage {
+  private static final long serialVersionUID = 2569239617185930232L;
 
   @XStreamAlias("Content")
   @XStreamConverter(value = XStreamCDataConverter.class)
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVideoMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVideoMessage.java
index 6e2f268f..73c56d4c 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVideoMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVideoMessage.java
@@ -2,11 +2,13 @@ package me.chanjar.weixin.cp.bean;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
+
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
 @XStreamAlias("xml")
 public class WxCpXmlOutVideoMessage extends WxCpXmlOutMessage {
+  private static final long serialVersionUID = -8672761162722733622L;
 
   @XStreamAlias("Video")
   protected final Video video = new Video();
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVoiceMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVoiceMessage.java
index 1fd6d4ce..bba95cfd 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVoiceMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVoiceMessage.java
@@ -2,11 +2,13 @@ package me.chanjar.weixin.cp.bean;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
+
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter;
 
 @XStreamAlias("xml")
 public class WxCpXmlOutVoiceMessage extends WxCpXmlOutMessage {
+  private static final long serialVersionUID = -7947384031546099340L;
 
   @XStreamAlias("Voice")
   @XStreamConverter(value = XStreamMediaIdConverter.class)