diff --git a/src/main/java/com/hotlcc/wechat4j/enums/ExitType.java b/src/main/java/com/hotlcc/wechat4j/enums/ExitType.java index c65b6d4..9f7f91f 100644 --- a/src/main/java/com/hotlcc/wechat4j/enums/ExitType.java +++ b/src/main/java/com/hotlcc/wechat4j/enums/ExitType.java @@ -9,9 +9,10 @@ import lombok.AllArgsConstructor; */ @AllArgsConstructor public enum ExitType { - ERROR_EXIT("错误退出"), - LOCAL_EXIT("本地退出"), - REMOTE_EXIT("远程退出"); - - private String desc; + /** 错误退出 */ + ERROR_EXIT, + /** 本地退出 */ + LOCAL_EXIT, + /** 远程退出 */ + REMOTE_EXIT } diff --git a/src/main/java/com/hotlcc/wechat4j/enums/LoginTip.java b/src/main/java/com/hotlcc/wechat4j/enums/LoginTip.java index 24a821d..42b0f30 100644 --- a/src/main/java/com/hotlcc/wechat4j/enums/LoginTip.java +++ b/src/main/java/com/hotlcc/wechat4j/enums/LoginTip.java @@ -8,18 +8,13 @@ import lombok.Getter; * * @author Allen */ -@SuppressWarnings("unused") @Getter @AllArgsConstructor public enum LoginTip { - TIP_0(0, "扫码登录"), - TIP_1(1, "确认登录"); + /** 扫码登录 */ + TIP_0(0), + /** 确认登录 */ + TIP_1(1); private int code; - private String desc; - - @Override - public String toString() { - return code + ""; - } } diff --git a/src/main/java/com/hotlcc/wechat4j/enums/MediaType.java b/src/main/java/com/hotlcc/wechat4j/enums/MediaType.java index 272bdc6..bfc31a9 100644 --- a/src/main/java/com/hotlcc/wechat4j/enums/MediaType.java +++ b/src/main/java/com/hotlcc/wechat4j/enums/MediaType.java @@ -11,11 +11,13 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum MediaType { + /** pic */ PICTURE(4, "pic"), + /** video */ VIDEO(4, "video"); - public static String REQUEST_KEY = "mediatype"; - public static String REQUEST_JSON_KEY = "MediaType"; + public static final String REQUEST_KEY = "mediatype"; + public static final String REQUEST_JSON_KEY = "MediaType"; private Integer code; private String value; diff --git a/src/main/java/com/hotlcc/wechat4j/enums/MsgType.java b/src/main/java/com/hotlcc/wechat4j/enums/MsgType.java index 9e43499..f4d4c10 100644 --- a/src/main/java/com/hotlcc/wechat4j/enums/MsgType.java +++ b/src/main/java/com/hotlcc/wechat4j/enums/MsgType.java @@ -12,25 +12,42 @@ import lombok.Getter; @AllArgsConstructor @Getter public enum MsgType { - TEXT_MSG(1, "文本消息"), - IMAGE_MSG(3, "图片消息"), - VOICE_MSG(34, "语音消息"), - VERIFY_MSG(37, "验证消息"), - POSSIBLE_FRIEND_MSG(40, "可能的朋友的消息"), - SHARE_CARD_MSG(42, "共享名片"), - VIDEO_CALL_MSG(43, "视频通话消息"), - ANIMATED_STICKER_MSG(47, "动画表情"), - LOCATION_MSG(48, "位置消息"), - SHARE_LINK_MSG(49, "分享链接"), - VOIP_MSG(50, "VoIP消息"), - INIT_MSG(51, "初始化消息"), - VOIP_NOTIFY_MSG(52, "VoIP通知"), - VOIP_INVITE_MSG(53, "VoIP邀请"), - VIDEO_MSG(62, "小视频"), - SYS_NOTICE_MSG(9999, "系统通知"), - SYSTEM_MSG(10000, "系统消息"), - WITHDRAW_MSG(10002, "撤回消息"); + /** 文本消息 */ + TEXT_MSG(1), + /** 图片消息 */ + IMAGE_MSG(3), + /** 语音消息 */ + VOICE_MSG(34), + /** 验证消息 */ + VERIFY_MSG(37), + /** 可能的朋友的消息 */ + POSSIBLE_FRIEND_MSG(40), + /** 共享名片 */ + SHARE_CARD_MSG(42), + /** 视频通话消息 */ + VIDEO_CALL_MSG(43), + /** 动画表情 */ + ANIMATED_STICKER_MSG(47), + /** 位置消息 */ + LOCATION_MSG(48), + /** 分享链接 */ + SHARE_LINK_MSG(49), + /** VoIP消息 */ + VOIP_MSG(50), + /** 初始化消息 */ + INIT_MSG(51), + /** VoIP通知 */ + VOIP_NOTIFY_MSG(52), + /** VoIP邀请 */ + VOIP_INVITE_MSG(53), + /** 小视频 */ + VIDEO_MSG(62), + /** 系统通知 */ + SYS_NOTICE_MSG(9999), + /** 系统消息 */ + SYSTEM_MSG(10000), + /** 撤回消息 */ + WITHDRAW_MSG(10002); private int code; - private String desc; } diff --git a/src/main/java/com/hotlcc/wechat4j/enums/OperatingSystem.java b/src/main/java/com/hotlcc/wechat4j/enums/OperatingSystem.java index d820d92..7bc86ee 100644 --- a/src/main/java/com/hotlcc/wechat4j/enums/OperatingSystem.java +++ b/src/main/java/com/hotlcc/wechat4j/enums/OperatingSystem.java @@ -11,10 +11,15 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum OperatingSystem { + /** darwin */ DARWIN("darwin"), + /** windows */ WINDOWS("windows"), + /** linux */ LINUX("linux"), + /** mac os */ MAC_OS("mac"), + /** other */ OTHER("other"); private String value; diff --git a/src/main/java/com/hotlcc/wechat4j/enums/Retcode.java b/src/main/java/com/hotlcc/wechat4j/enums/Retcode.java index 51566b4..76ff1ae 100644 --- a/src/main/java/com/hotlcc/wechat4j/enums/Retcode.java +++ b/src/main/java/com/hotlcc/wechat4j/enums/Retcode.java @@ -11,12 +11,14 @@ import lombok.Getter; @AllArgsConstructor @Getter public enum Retcode { - RECODE_0(0, "正常"), - RECODE_1100(1100, "失败/登出微信"), - RECODE_1101(1101, "从其它设备登录微信"); + /** 正常 */ + RECODE_0(0), + /** 失败/登出微信 */ + RECODE_1100(1100), + /** 从其它设备登录微信 */ + RECODE_1101(1101); private int code; - private String desc; public static Retcode valueOf(int code) { Retcode[] es = values(); diff --git a/src/main/java/com/hotlcc/wechat4j/enums/Selector.java b/src/main/java/com/hotlcc/wechat4j/enums/Selector.java index f8336ae..7d85212 100644 --- a/src/main/java/com/hotlcc/wechat4j/enums/Selector.java +++ b/src/main/java/com/hotlcc/wechat4j/enums/Selector.java @@ -9,14 +9,18 @@ import lombok.AllArgsConstructor; */ @AllArgsConstructor public enum Selector { - SELECTOR_0(0, "正常"), - SELECTOR_2(2, "有新消息"), - SELECTOR_4(4, "目前发现修改了联系人备注会出现"), - SELECTOR_6(6, "目前不知道代表什么"), - SELECTOR_7(7, "手机操作了微信"); + /** 正常 */ + SELECTOR_0(0), + /** 有新消息 */ + SELECTOR_2(2), + /** 目前发现修改了联系人备注会出现 */ + SELECTOR_4(4), + /** 目前不知道代表什么 */ + SELECTOR_6(6), + /** 手机操作了微信 */ + SELECTOR_7(7); private int code; - private String desc; public static Selector valueOf(int code) { Selector[] es = values(); diff --git a/src/main/java/com/hotlcc/wechat4j/model/AppInfo.java b/src/main/java/com/hotlcc/wechat4j/model/AppInfo.java index 36fa86f..ed633c1 100644 --- a/src/main/java/com/hotlcc/wechat4j/model/AppInfo.java +++ b/src/main/java/com/hotlcc/wechat4j/model/AppInfo.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import java.io.Serializable; @@ -18,11 +19,9 @@ import java.util.List; */ @Getter @Setter +@NoArgsConstructor public final class AppInfo implements Serializable { - private static final long serialVersionUID = 1L; - - private AppInfo() { - } + private static final long serialVersionUID = 6409793898938883312L; @JSONField(name = "Type") private Integer type; diff --git a/src/main/java/com/hotlcc/wechat4j/model/BaseRequest.java b/src/main/java/com/hotlcc/wechat4j/model/BaseRequest.java index 576ffb9..7109645 100644 --- a/src/main/java/com/hotlcc/wechat4j/model/BaseRequest.java +++ b/src/main/java/com/hotlcc/wechat4j/model/BaseRequest.java @@ -2,7 +2,9 @@ package com.hotlcc.wechat4j.model; import com.alibaba.fastjson.annotation.JSONField; import com.hotlcc.wechat4j.util.WechatUtil; +import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import java.io.Serializable; @@ -14,18 +16,10 @@ import java.io.Serializable; */ @Getter @Setter +@AllArgsConstructor +@NoArgsConstructor public class BaseRequest implements Serializable { - private static final long serialVersionUID = 1L; - - public BaseRequest() { - } - - public BaseRequest(String deviceID, String sid, String skey, String uin) { - this.deviceID = deviceID; - this.sid = sid; - this.skey = skey; - this.uin = uin; - } + private static final long serialVersionUID = 9141083671818346541L; public BaseRequest(String Sid, String Skey, String Uin) { this(WechatUtil.createDeviceID(), Sid, Skey, Uin); diff --git a/src/main/java/com/hotlcc/wechat4j/model/ReceivedMsg.java b/src/main/java/com/hotlcc/wechat4j/model/ReceivedMsg.java index 8bc188c..7712a65 100644 --- a/src/main/java/com/hotlcc/wechat4j/model/ReceivedMsg.java +++ b/src/main/java/com/hotlcc/wechat4j/model/ReceivedMsg.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import java.io.Serializable; @@ -13,12 +14,10 @@ import java.util.List; @Getter @Setter +@NoArgsConstructor public final class ReceivedMsg implements Serializable { private static final long serialVersionUID = 1L; - private ReceivedMsg() { - } - @JSONField(name = "SubMsgType") private Integer subMsgType; @JSONField(name = "VoiceLength") diff --git a/src/main/java/com/hotlcc/wechat4j/model/RecommendInfo.java b/src/main/java/com/hotlcc/wechat4j/model/RecommendInfo.java index 73e700a..451a926 100644 --- a/src/main/java/com/hotlcc/wechat4j/model/RecommendInfo.java +++ b/src/main/java/com/hotlcc/wechat4j/model/RecommendInfo.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import java.io.Serializable; @@ -18,12 +19,10 @@ import java.util.List; */ @Getter @Setter +@NoArgsConstructor public final class RecommendInfo implements Serializable { private static final long serialVersionUID = 1L; - private RecommendInfo() { - } - @JSONField(name = "Ticket") private String ticket; @JSONField(name = "UserName") diff --git a/src/main/java/com/hotlcc/wechat4j/model/UserInfo.java b/src/main/java/com/hotlcc/wechat4j/model/UserInfo.java index b81d5d3..03e33d2 100644 --- a/src/main/java/com/hotlcc/wechat4j/model/UserInfo.java +++ b/src/main/java/com/hotlcc/wechat4j/model/UserInfo.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import java.io.Serializable; @@ -18,11 +19,9 @@ import java.util.List; */ @Getter @Setter +@NoArgsConstructor public final class UserInfo implements Serializable { - private static final long serialVersionUID = 1L; - - private UserInfo() { - } + private static final long serialVersionUID = 3117101379254847458L; @JSONField(name = "Uin") private Long uin; diff --git a/src/main/java/com/hotlcc/wechat4j/model/WxMessage.java b/src/main/java/com/hotlcc/wechat4j/model/WxMessage.java index 5125432..7b33423 100644 --- a/src/main/java/com/hotlcc/wechat4j/model/WxMessage.java +++ b/src/main/java/com/hotlcc/wechat4j/model/WxMessage.java @@ -14,7 +14,7 @@ import java.io.Serializable; @Getter @Setter public class WxMessage implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 3090487762066388772L; @JSONField(name = "ClientMsgId") private String clientMsgId;