2
0
mirror of https://gitee.com/hotlcc/wechat4j.git synced 2025-06-09 20:14:06 +08:00

代码调整

This commit is contained in:
Allen 2019-09-08 03:23:05 +08:00
parent 56791e7965
commit cc98ea74b1
13 changed files with 87 additions and 71 deletions

View File

@ -9,9 +9,10 @@ import lombok.AllArgsConstructor;
*/ */
@AllArgsConstructor @AllArgsConstructor
public enum ExitType { public enum ExitType {
ERROR_EXIT("错误退出"), /** 错误退出 */
LOCAL_EXIT("本地退出"), ERROR_EXIT,
REMOTE_EXIT("远程退出"); /** 本地退出 */
LOCAL_EXIT,
private String desc; /** 远程退出 */
REMOTE_EXIT
} }

View File

@ -8,18 +8,13 @@ import lombok.Getter;
* *
* @author Allen * @author Allen
*/ */
@SuppressWarnings("unused")
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum LoginTip { public enum LoginTip {
TIP_0(0, "扫码登录"), /** 扫码登录 */
TIP_1(1, "确认登录"); TIP_0(0),
/** 确认登录 */
TIP_1(1);
private int code; private int code;
private String desc;
@Override
public String toString() {
return code + "";
}
} }

View File

@ -11,11 +11,13 @@ import lombok.Getter;
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum MediaType { public enum MediaType {
/** pic */
PICTURE(4, "pic"), PICTURE(4, "pic"),
/** video */
VIDEO(4, "video"); VIDEO(4, "video");
public static String REQUEST_KEY = "mediatype"; public static final String REQUEST_KEY = "mediatype";
public static String REQUEST_JSON_KEY = "MediaType"; public static final String REQUEST_JSON_KEY = "MediaType";
private Integer code; private Integer code;
private String value; private String value;

View File

@ -12,25 +12,42 @@ import lombok.Getter;
@AllArgsConstructor @AllArgsConstructor
@Getter @Getter
public enum MsgType { public enum MsgType {
TEXT_MSG(1, "文本消息"), /** 文本消息 */
IMAGE_MSG(3, "图片消息"), TEXT_MSG(1),
VOICE_MSG(34, "语音消息"), /** 图片消息 */
VERIFY_MSG(37, "验证消息"), IMAGE_MSG(3),
POSSIBLE_FRIEND_MSG(40, "可能的朋友的消息"), /** 语音消息 */
SHARE_CARD_MSG(42, "共享名片"), VOICE_MSG(34),
VIDEO_CALL_MSG(43, "视频通话消息"), /** 验证消息 */
ANIMATED_STICKER_MSG(47, "动画表情"), VERIFY_MSG(37),
LOCATION_MSG(48, "位置消息"), /** 可能的朋友的消息 */
SHARE_LINK_MSG(49, "分享链接"), POSSIBLE_FRIEND_MSG(40),
VOIP_MSG(50, "VoIP消息"), /** 共享名片 */
INIT_MSG(51, "初始化消息"), SHARE_CARD_MSG(42),
VOIP_NOTIFY_MSG(52, "VoIP通知"), /** 视频通话消息 */
VOIP_INVITE_MSG(53, "VoIP邀请"), VIDEO_CALL_MSG(43),
VIDEO_MSG(62, "小视频"), /** 动画表情 */
SYS_NOTICE_MSG(9999, "系统通知"), ANIMATED_STICKER_MSG(47),
SYSTEM_MSG(10000, "系统消息"), /** 位置消息 */
WITHDRAW_MSG(10002, "撤回消息"); 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 int code;
private String desc;
} }

View File

@ -11,10 +11,15 @@ import lombok.Getter;
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum OperatingSystem { public enum OperatingSystem {
/** darwin */
DARWIN("darwin"), DARWIN("darwin"),
/** windows */
WINDOWS("windows"), WINDOWS("windows"),
/** linux */
LINUX("linux"), LINUX("linux"),
/** mac os */
MAC_OS("mac"), MAC_OS("mac"),
/** other */
OTHER("other"); OTHER("other");
private String value; private String value;

View File

@ -11,12 +11,14 @@ import lombok.Getter;
@AllArgsConstructor @AllArgsConstructor
@Getter @Getter
public enum Retcode { public enum Retcode {
RECODE_0(0, "正常"), /** 正常 */
RECODE_1100(1100, "失败/登出微信"), RECODE_0(0),
RECODE_1101(1101, "从其它设备登录微信"); /** 失败/登出微信 */
RECODE_1100(1100),
/** 从其它设备登录微信 */
RECODE_1101(1101);
private int code; private int code;
private String desc;
public static Retcode valueOf(int code) { public static Retcode valueOf(int code) {
Retcode[] es = values(); Retcode[] es = values();

View File

@ -9,14 +9,18 @@ import lombok.AllArgsConstructor;
*/ */
@AllArgsConstructor @AllArgsConstructor
public enum Selector { public enum Selector {
SELECTOR_0(0, "正常"), /** 正常 */
SELECTOR_2(2, "有新消息"), SELECTOR_0(0),
SELECTOR_4(4, "目前发现修改了联系人备注会出现"), /** 有新消息 */
SELECTOR_6(6, "目前不知道代表什么"), SELECTOR_2(2),
SELECTOR_7(7, "手机操作了微信"); /** 目前发现修改了联系人备注会出现 */
SELECTOR_4(4),
/** 目前不知道代表什么 */
SELECTOR_6(6),
/** 手机操作了微信 */
SELECTOR_7(7);
private int code; private int code;
private String desc;
public static Selector valueOf(int code) { public static Selector valueOf(int code) {
Selector[] es = values(); Selector[] es = values();

View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable; import java.io.Serializable;
@ -18,11 +19,9 @@ import java.util.List;
*/ */
@Getter @Getter
@Setter @Setter
@NoArgsConstructor
public final class AppInfo implements Serializable { public final class AppInfo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 6409793898938883312L;
private AppInfo() {
}
@JSONField(name = "Type") @JSONField(name = "Type")
private Integer type; private Integer type;

View File

@ -2,7 +2,9 @@ package com.hotlcc.wechat4j.model;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.hotlcc.wechat4j.util.WechatUtil; import com.hotlcc.wechat4j.util.WechatUtil;
import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable; import java.io.Serializable;
@ -14,18 +16,10 @@ import java.io.Serializable;
*/ */
@Getter @Getter
@Setter @Setter
@AllArgsConstructor
@NoArgsConstructor
public class BaseRequest implements Serializable { public class BaseRequest implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 9141083671818346541L;
public BaseRequest() {
}
public BaseRequest(String deviceID, String sid, String skey, String uin) {
this.deviceID = deviceID;
this.sid = sid;
this.skey = skey;
this.uin = uin;
}
public BaseRequest(String Sid, String Skey, String Uin) { public BaseRequest(String Sid, String Skey, String Uin) {
this(WechatUtil.createDeviceID(), Sid, Skey, Uin); this(WechatUtil.createDeviceID(), Sid, Skey, Uin);

View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable; import java.io.Serializable;
@ -13,12 +14,10 @@ import java.util.List;
@Getter @Getter
@Setter @Setter
@NoArgsConstructor
public final class ReceivedMsg implements Serializable { public final class ReceivedMsg implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private ReceivedMsg() {
}
@JSONField(name = "SubMsgType") @JSONField(name = "SubMsgType")
private Integer subMsgType; private Integer subMsgType;
@JSONField(name = "VoiceLength") @JSONField(name = "VoiceLength")

View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable; import java.io.Serializable;
@ -18,12 +19,10 @@ import java.util.List;
*/ */
@Getter @Getter
@Setter @Setter
@NoArgsConstructor
public final class RecommendInfo implements Serializable { public final class RecommendInfo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private RecommendInfo() {
}
@JSONField(name = "Ticket") @JSONField(name = "Ticket")
private String ticket; private String ticket;
@JSONField(name = "UserName") @JSONField(name = "UserName")

View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable; import java.io.Serializable;
@ -18,11 +19,9 @@ import java.util.List;
*/ */
@Getter @Getter
@Setter @Setter
@NoArgsConstructor
public final class UserInfo implements Serializable { public final class UserInfo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 3117101379254847458L;
private UserInfo() {
}
@JSONField(name = "Uin") @JSONField(name = "Uin")
private Long uin; private Long uin;

View File

@ -14,7 +14,7 @@ import java.io.Serializable;
@Getter @Getter
@Setter @Setter
public class WxMessage implements Serializable { public class WxMessage implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 3090487762066388772L;
@JSONField(name = "ClientMsgId") @JSONField(name = "ClientMsgId")
private String clientMsgId; private String clientMsgId;