diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/Gender.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/Gender.java index d56bd57da..99da96262 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/Gender.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/Gender.java @@ -31,8 +31,8 @@ public enum Gender { private final String code; public static Gender fromCode(String code) { - for(Gender a: Gender.values()){ - if(a.code.equals(code)){ + for (Gender a : Gender.values()) { + if (a.code.equals(code)) { return a; } } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java index 614bc9791..04b0dd72e 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java @@ -1,8 +1,5 @@ package me.chanjar.weixin.cp.bean; -import java.io.Serializable; -import java.util.List; - import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Builder; @@ -10,6 +7,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; +import java.io.Serializable; +import java.util.List; + /** *
  * 企业号应用信息.
@@ -81,25 +81,27 @@ public class WxCpAgent implements Serializable {
   @Data
   public static class Users implements Serializable {
     private static final long serialVersionUID = 8801100463558788565L;
+
     @SerializedName("user")
     private List users;
   }
 
   @Data
-  public class User implements Serializable {
+  public static class User implements Serializable {
     private static final long serialVersionUID = 7287632514385508024L;
+
     @SerializedName("userid")
     private String userId;
   }
 
   @Data
-  public class Parties {
+  public static class Parties {
     @SerializedName("partyid")
     private List partyIds = null;
   }
 
   @Data
-  public class Tags {
+  public static class Tags {
     @SerializedName("tagid")
     private List tagIds = null;
   }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgentWorkBench.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgentWorkBench.java
index c97faa636..bda927a80 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgentWorkBench.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgentWorkBench.java
@@ -16,49 +16,51 @@ import java.util.List;
 /**
  * @author songshiyu
  * @date : create in 16:09 2020/9/27
- * @description: 工作台自定义展示
+ * 工作台自定义展示
  */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class WxCpAgentWorkBench implements Serializable {
-  private static final long serialVersionUid = 1L;
+  private static final long serialVersionUID = -4136604790232843229L;
 
-  /*
-  * 展示类型,目前支持 “keydata”、 “image”、 “list” 、”webview”
-  * */
+  /**
+   * 展示类型,目前支持 “keydata”、 “image”、 “list” 、”webview”
+   */
   private String type;
-  /*
-  * 用户的userid
-  * */
+  /**
+   * 用户的userid
+   */
   private String userId;
-  /*
-  * 应用id
-  * */
+  /**
+   * 应用id
+   */
   private Long agentId;
-  /*
-  * 点击跳转url,若不填且应用设置了主页url,则跳转到主页url,否则跳到应用会话窗口
-  * */
+  /**
+   * 点击跳转url,若不填且应用设置了主页url,则跳转到主页url,否则跳到应用会话窗口
+   */
   private String jumpUrl;
-  /*
-  * 若应用为小程序类型,该字段填小程序pagepath,若未设置,跳到小程序主页
-  * */
+  /**
+   * 若应用为小程序类型,该字段填小程序pagepath,若未设置,跳到小程序主页
+   */
   private String pagePath;
-  /*
-  * 图片url:图片的最佳比例为3.35:1;webview:渲染展示的url
-  * */
+  /**
+   * 图片url:图片的最佳比例为3.35:1;webview:渲染展示的url
+   */
   private String url;
-  /*
-  * 是否覆盖用户工作台的数据。设置为true的时候,会覆盖企业所有用户当前设置的数据。若设置为false,则不会覆盖用户当前设置的所有数据
-  * */
+  /**
+   * 是否覆盖用户工作台的数据。设置为true的时候,会覆盖企业所有用户当前设置的数据。若设置为false,则不会覆盖用户当前设置的所有数据
+   */
   private Boolean replaceUserData;
 
   private List keyDataList;
 
   private List lists;
 
-  // 生成模板Json字符串
+  /**
+   * 生成模板Json字符串
+   */
   public String toTemplateString() {
     JsonObject templateObject = new JsonObject();
     templateObject.addProperty("agentid", this.agentId);
@@ -70,7 +72,9 @@ public class WxCpAgentWorkBench implements Serializable {
     return templateObject.toString();
   }
 
-  // 生成用户数据Json字符串
+  /**
+   * 生成用户数据Json字符串
+   */
   public String toUserDataString() {
     JsonObject userDataObject = new JsonObject();
     userDataObject.addProperty("agentid", this.agentId);
@@ -80,7 +84,9 @@ public class WxCpAgentWorkBench implements Serializable {
     return userDataObject.toString();
   }
 
-  // 处理不用类型的工作台数据
+  /**
+   * 处理不用类型的工作台数据
+   */
   private void handle(JsonObject templateObject) {
     switch (this.getType()) {
       case WxCpConsts.WorkBenchType.KEYDATA: {
@@ -116,7 +122,7 @@ public class WxCpAgentWorkBench implements Serializable {
           listObject.addProperty("pagepath", listItem.getPagePath());
           listArray.add(listObject);
         }
-        itemsObject.add("items",listArray);
+        itemsObject.add("items", listArray);
         templateObject.add("list", itemsObject);
         break;
       }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpChat.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpChat.java
index 03b9aaa7d..eb014c595 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpChat.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpChat.java
@@ -1,22 +1,22 @@
-package me.chanjar.weixin.cp.bean;
-
-import java.io.Serializable;
-import java.util.List;
-
-import lombok.Data;
-
-/**
- * 群聊
- *
- * @author gaigeshen
- */
-@Data
-public class WxCpChat implements Serializable {
-  private static final long serialVersionUID = -4301684507150486556L;
-  
-  private String id;
-  private String name;
-  private String owner;
-  private List users;
-
-}
+package me.chanjar.weixin.cp.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 群聊
+ *
+ * @author gaigeshen
+ */
+@Data
+public class WxCpChat implements Serializable {
+  private static final long serialVersionUID = -4301684507150486556L;
+
+  private String id;
+  private String name;
+  private String owner;
+  private List users;
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpInviteResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpInviteResult.java
index f5a0a66bf..5ab4f5246 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpInviteResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpInviteResult.java
@@ -1,11 +1,11 @@
 package me.chanjar.weixin.cp.bean;
 
-import java.io.Serializable;
-
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.io.Serializable;
+
 /**
  * 邀请成员的结果对象类.
  * Created by Binary Wang on 2018-5-13.
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMaJsCode2SessionResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMaJsCode2SessionResult.java
index 90f1ae840..7291489d9 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMaJsCode2SessionResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMaJsCode2SessionResult.java
@@ -11,6 +11,7 @@ import java.io.Serializable;
  * 小程序登录凭证校验
  * 文档地址:https://work.weixin.qq.com/api/doc#90000/90136/90289/wx.qy.login
  * 
+ * * @author Binary Wang */ @Data diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpOauth2UserInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpOauth2UserInfo.java index 56e65b900..0e10737bf 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpOauth2UserInfo.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpOauth2UserInfo.java @@ -1,13 +1,13 @@ package me.chanjar.weixin.cp.bean; -import java.io.Serializable; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *
  *  用oauth2获取用户信息的结果类
@@ -23,7 +23,7 @@ import lombok.experimental.Accessors;
 @Builder
 public class WxCpOauth2UserInfo implements Serializable {
   private static final long serialVersionUID = -4301684507150486556L;
-  
+
   private String openId;
   private String deviceId;
   private String userId;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpProviderToken.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpProviderToken.java
index 6a33f1c48..7b2887f03 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpProviderToken.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpProviderToken.java
@@ -1,11 +1,11 @@
 package me.chanjar.weixin.cp.bean;
 
-import java.io.Serializable;
-
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.io.Serializable;
+
 /**
  * 服务商凭证.
  *
@@ -15,6 +15,7 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 @Data
 public class WxCpProviderToken implements Serializable {
   private static final long serialVersionUID = -4301684507150486556L;
+
   /**
    * 服务商的access_token,最长为512字节。
    */
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 f6b9fa027..8649f0ced 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,14 +1,15 @@
 package me.chanjar.weixin.cp.bean;
 
-import java.io.Serializable;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.io.Serializable;
+
 /**
  * Created by Daniel Qian.
+ *
  * @author Daniel Qian
  */
 @Data
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTagAddOrRemoveUsersResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTagAddOrRemoveUsersResult.java
index 037740ca9..adac17488 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTagAddOrRemoveUsersResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTagAddOrRemoveUsersResult.java
@@ -1,15 +1,14 @@
 package me.chanjar.weixin.cp.bean;
 
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.base.Splitter;
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * 为标签添加或移除用户结果对象类.
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAdmin.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAdmin.java
index 5d77c975d..a950e0c3f 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAdmin.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAdmin.java
@@ -12,6 +12,7 @@ import java.util.List;
 
 /**
  * 应用的管理员
+ *
  * @author huangxiaoming
  */
 @Data
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpContactSearch.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpContactSearch.java
index ee1de69f5..cc84dfd4d 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpContactSearch.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpContactSearch.java
@@ -1,12 +1,12 @@
 package me.chanjar.weixin.cp.bean;
 
-import java.io.Serializable;
-
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.io.Serializable;
+
 /**
  * @author uianz
  * @description
@@ -15,51 +15,51 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 @Data
 @Accessors(chain = true)
 public class WxCpTpContactSearch implements Serializable {
-    private static final long serialVersionUID = -4301684507150486556L;
+  private static final long serialVersionUID = -4301684507150486556L;
 
-    /**
-     * 查询的企业corpid
-     */
-    @SerializedName("auth_corpid")
-    private String authCorpId;
+  /**
+   * 查询的企业corpid
+   */
+  @SerializedName("auth_corpid")
+  private String authCorpId;
 
-    /**
-     * 搜索关键词。当查询用户时应为用户名称、名称拼音或者英文名;当查询部门时应为部门名称或者部门名称拼音
-     */
-    @SerializedName("query_word")
-    private String queryWord;
+  /**
+   * 搜索关键词。当查询用户时应为用户名称、名称拼音或者英文名;当查询部门时应为部门名称或者部门名称拼音
+   */
+  @SerializedName("query_word")
+  private String queryWord;
 
-    /**
-     * 查询类型 1:查询用户,返回用户userid列表 2:查询部门,返回部门id列表。 不填该字段或者填0代表同时查询部门跟用户
-     */
-    @SerializedName("query_type")
-    private Integer type;
+  /**
+   * 查询类型 1:查询用户,返回用户userid列表 2:查询部门,返回部门id列表。 不填该字段或者填0代表同时查询部门跟用户
+   */
+  @SerializedName("query_type")
+  private Integer type;
 
-    /**
-     * 应用id,若非0则只返回应用可见范围内的用户或者部门信息
-     */
-    @SerializedName("agentid")
-    private Integer agentId;
+  /**
+   * 应用id,若非0则只返回应用可见范围内的用户或者部门信息
+   */
+  @SerializedName("agentid")
+  private Integer agentId;
 
-    /**
-     * 查询的偏移量,每次调用的offset在上一次offset基础上加上limit
-     */
-    @SerializedName("offset")
-    private Integer offset;
+  /**
+   * 查询的偏移量,每次调用的offset在上一次offset基础上加上limit
+   */
+  @SerializedName("offset")
+  private Integer offset;
 
-    /**
-     * 查询返回的最大数量,默认为50,最多为200,查询返回的数量可能小于limit指定的值
-     */
-    @SerializedName("limit")
-    private Integer limit;
+  /**
+   * 查询返回的最大数量,默认为50,最多为200,查询返回的数量可能小于limit指定的值
+   */
+  @SerializedName("limit")
+  private Integer limit;
 
-    /**
-     * 如果需要精确匹配用户名称或者部门名称或者英文名,不填则默认为模糊匹配;1:匹配用户名称或者部门名称 2:匹配用户英文名
-     */
-    @SerializedName("full_match_field")
-    private Integer fullMatchField;
+  /**
+   * 如果需要精确匹配用户名称或者部门名称或者英文名,不填则默认为模糊匹配;1:匹配用户名称或者部门名称 2:匹配用户英文名
+   */
+  @SerializedName("full_match_field")
+  private Integer fullMatchField;
 
-    public String toJson() {
-        return WxCpGsonBuilder.create().toJson(this);
-    }
+  public String toJson() {
+    return WxCpGsonBuilder.create().toJson(this);
+  }
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpContactSearchResp.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpContactSearchResp.java
index 1998a4230..21db4e083 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpContactSearchResp.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpContactSearchResp.java
@@ -17,42 +17,42 @@ import java.util.List;
 @Data
 public class WxCpTpContactSearchResp extends WxCpBaseResp {
 
-    @SerializedName("is_last")
-    private Boolean isLast;
+  @SerializedName("is_last")
+  private Boolean isLast;
 
-    @SerializedName("query_result")
-    private QueryResult queryResult;
+  @SerializedName("query_result")
+  private QueryResult queryResult;
+
+  @Data
+  public static class QueryResult implements Serializable {
+    private static final long serialVersionUID = -4301684507150486556L;
+
+    @SerializedName("user")
+    private User user;
+    @SerializedName("party")
+    private Party party;
 
     @Data
-    public static class QueryResult implements Serializable {
-        private static final long serialVersionUID = -4301684507150486556L;
-
-        @SerializedName("user")
-        private User user;
-        @SerializedName("party")
-        private Party party;
-
-        @Data
-        public static class User implements Serializable {
-            private static final long serialVersionUID = -4301684507150486556L;
-            @SerializedName("userid")
-            private List userid;
-            @SerializedName("open_userid")
-            private List openUserId;
-        }
-
-        @Data
-        public static class Party implements Serializable {
-            private static final long serialVersionUID = -4301684507150486556L;
-
-            @SerializedName("department_id")
-            private List departmentId;
-        }
-
+    public static class User implements Serializable {
+      private static final long serialVersionUID = -4301684507150486556L;
+      @SerializedName("userid")
+      private List userid;
+      @SerializedName("open_userid")
+      private List openUserId;
     }
 
-    public static WxCpTpContactSearchResp fromJson(String json) {
-      return WxCpGsonBuilder.create().fromJson(json, WxCpTpContactSearchResp.class);
+    @Data
+    public static class Party implements Serializable {
+      private static final long serialVersionUID = -4301684507150486556L;
+
+      @SerializedName("department_id")
+      private List departmentId;
     }
 
+  }
+
+  public static WxCpTpContactSearchResp fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpTpContactSearchResp.class);
+  }
+
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpCorp.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpCorp.java
index f77fdb78d..efe6d8285 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpCorp.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpCorp.java
@@ -1,12 +1,11 @@
 package me.chanjar.weixin.cp.bean;
 
-import java.io.Serializable;
-
 import com.google.gson.annotations.SerializedName;
-
 import lombok.Data;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.io.Serializable;
+
 /**
  * 微信部门.
  *
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPreauthCode.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPreauthCode.java
index 8c102ae4a..82df9f456 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPreauthCode.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPreauthCode.java
@@ -7,6 +7,7 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
 /**
  * 预授权码返回
+ *
  * @author yqx
  * @date 2020/3/19
  */
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTag.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTag.java
index b584b31dd..73d7a5157 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTag.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTag.java
@@ -7,13 +7,11 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 import java.io.Serializable;
 
 /**
- *
  * @author zhangq 
  * @since 2021-02-14 16:15 16:15
  */
 @Data
 public class WxCpTpTag implements Serializable {
-
   private static final long serialVersionUID = 581740383760234134L;
 
   @SerializedName("tagid")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTagAddOrRemoveUsersResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTagAddOrRemoveUsersResult.java
index 35319b1ba..8a9fecf21 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTagAddOrRemoveUsersResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTagAddOrRemoveUsersResult.java
@@ -4,6 +4,7 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
 /**
  * 企业微信第三方开发-增加标签成员成员api响应体
+ *
  * @author zhangq 
  * @since 2021/2/14 16:44
  */
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTagGetResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTagGetResult.java
index d77e99b13..4fdc9a58a 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTagGetResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpTagGetResult.java
@@ -4,6 +4,7 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
 /**
  * 获取标签成员接口响应体
+ *
  * @author zhangq 
  * @since 2021/2/14 16:28
  */
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserDetail.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserDetail.java
index c949b0a1b..280939125 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserDetail.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpUserDetail.java
@@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
 /**
- *
  * @author huangxiaoming
  */
 @Data
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpXmlPackage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpXmlPackage.java
index e7af1dd61..4d9d9493a 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpXmlPackage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpXmlPackage.java
@@ -1,8 +1,5 @@
 package me.chanjar.weixin.cp.bean;
 
-import java.io.Serializable;
-import java.util.Map;
-
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
 import lombok.Data;
@@ -10,6 +7,9 @@ import me.chanjar.weixin.common.util.XmlUtils;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 import me.chanjar.weixin.cp.util.xml.XStreamTransformer;
 
+import java.io.Serializable;
+import java.util.Map;
+
 /**
  * 回调消息包.
  * https://work.weixin.qq.com/api/doc#90001/90143/91116
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 0c4bac9ea..76a8f9330 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
@@ -73,7 +73,6 @@ public class WxCpUser implements Serializable {
   private String[] directLeader;
 
 
-
   public void addExternalAttr(ExternalAttribute externalAttr) {
     this.externalAttrs.add(externalAttr);
   }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserDetail.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserDetail.java
index 7c4af4df6..295acfdbc 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserDetail.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserDetail.java
@@ -1,10 +1,10 @@
 package me.chanjar.weixin.cp.bean;
 
-import java.io.Serializable;
-
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 
  *  使用user_ticket获取成员详情接口返回类.
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalContactInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalContactInfo.java
index 6a9e2c8e7..ca6ebb8bb 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalContactInfo.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalContactInfo.java
@@ -78,6 +78,7 @@ public class WxCpUserExternalContactInfo implements Serializable {
   @AllArgsConstructor
   public static class ExternalAttribute implements Serializable {
     private static final long serialVersionUID = -5696099236344075582L;
+
     @Setter
     @Getter
     public static class Text implements Serializable {
@@ -122,7 +123,7 @@ public class WxCpUserExternalContactInfo implements Serializable {
   @Getter
   public static class FollowedUser implements Serializable {
     private static final long serialVersionUID = -5696099236344075582L;
-    
+
     @SerializedName("userid")
     private String userId;
     private String remark;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentTask.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentTask.java
index 3e952ccb9..efa0c1bfc 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentTask.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpAddMomentTask.java
@@ -1,17 +1,18 @@
 package me.chanjar.weixin.cp.bean.external;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import me.chanjar.weixin.cp.bean.external.moment.VisibleRange;
 import me.chanjar.weixin.cp.bean.external.msg.Attachment;
 import me.chanjar.weixin.cp.bean.external.msg.Text;
-import me.chanjar.weixin.cp.bean.external.moment.VisibleRange;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * 企业发表内容到客户的朋友圈 创建发表任务
  *
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayInfo.java
index 35f6a6eaa..66d94da2c 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayInfo.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayInfo.java
@@ -208,7 +208,7 @@ public class WxCpContactWayInfo implements Serializable {
      * 多人
      */
     @SerializedName("2")
-    MULTI;
+    MULTI
 
   }
 
@@ -224,7 +224,7 @@ public class WxCpContactWayInfo implements Serializable {
      * 通过二维码联系
      */
     @SerializedName("2")
-    QRCODE;
+    QRCODE
 
   }
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayResult.java
index 0a49719a9..789dac318 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpContactWayResult.java
@@ -8,11 +8,14 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
 /**
  * 「联系我」方式 处理结果
+ *
+ * @author 爱因斯唐
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WxCpContactWayResult extends WxCpBaseResp {
   private static final long serialVersionUID = -2612867517869192015L;
+
   @SerializedName("config_id")
   private String configId;
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpExternalUserIdList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpExternalUserIdList.java
index 5de738c74..3b06a0a07 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpExternalUserIdList.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpExternalUserIdList.java
@@ -18,6 +18,7 @@ import java.util.List;
 @Getter
 @Setter
 public class WxCpExternalUserIdList extends WxCpBaseResp {
+  private static final long serialVersionUID = 3922210865083522513L;
 
   @SerializedName("external_userid_info")
   private List externalUserIdInfo;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java
index b397954dc..a0228e3ac 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentComments.java
@@ -1,7 +1,6 @@
 package me.chanjar.weixin.cp.bean.external;
 
 import com.google.gson.annotations.SerializedName;
-import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -9,6 +8,8 @@ import lombok.Setter;
 import me.chanjar.weixin.cp.bean.WxCpBaseResp;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.util.List;
+
 /**
  * 企业发表内容到客户的朋友圈 获取客户朋友圈的互动数据
  *
@@ -19,6 +20,7 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 @EqualsAndHashCode(callSuper = true)
 public class WxCpGetMomentComments extends WxCpBaseResp {
   private static final long serialVersionUID = -9056664072546234965L;
+
   @SerializedName("comment_list")
   private List commentList;
   @SerializedName("like_list")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java
index 6ba154df8..32cce1dd4 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentList.java
@@ -1,13 +1,14 @@
 package me.chanjar.weixin.cp.bean.external;
 
 import com.google.gson.annotations.SerializedName;
-import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import me.chanjar.weixin.cp.bean.WxCpBaseResp;
 import me.chanjar.weixin.cp.bean.external.moment.MomentInfo;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.util.List;
+
 /**
  * 企业发表内容到客户的朋友圈 获取企业全部的发表列表
  *
@@ -18,6 +19,7 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 @EqualsAndHashCode(callSuper = true)
 public class WxCpGetMomentList extends WxCpBaseResp {
   private static final long serialVersionUID = 106159971765109008L;
+
   @SerializedName("next_cursor")
   private String nextCursor;
   @SerializedName("moment_list")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java
index 38cd89a45..30df9c43a 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentSendResult.java
@@ -1,13 +1,14 @@
 package me.chanjar.weixin.cp.bean.external;
 
 import com.google.gson.annotations.SerializedName;
-import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import me.chanjar.weixin.cp.bean.WxCpBaseResp;
 import me.chanjar.weixin.cp.bean.external.moment.CustomerItem;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.util.List;
+
 /**
  * 企业发表内容到客户的朋友圈 获取客户朋友圈发表后的可见客户列表
  *
@@ -18,6 +19,7 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 @EqualsAndHashCode(callSuper = true)
 public class WxCpGetMomentSendResult extends WxCpBaseResp {
   private static final long serialVersionUID = -5782811995184523379L;
+
   @SerializedName("next_cursor")
   private String nextCursor;
   @SerializedName("customer_list")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java
index aa45bec4e..2b7032f79 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTask.java
@@ -1,7 +1,6 @@
 package me.chanjar.weixin.cp.bean.external;
 
 import com.google.gson.annotations.SerializedName;
-import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -9,6 +8,8 @@ import lombok.Setter;
 import me.chanjar.weixin.cp.bean.WxCpBaseResp;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.util.List;
+
 /**
  * 企业发表内容到客户的朋友圈 获取客户朋友圈企业发表的列表
  *
@@ -19,6 +20,7 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 @EqualsAndHashCode(callSuper = true)
 public class WxCpGetMomentTask extends WxCpBaseResp {
   private static final long serialVersionUID = 5621905029624794129L;
+
   @SerializedName("next_cursor")
   private String nextCursor;
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java
index 019e7fdf1..b0ab78f1e 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGetMomentTaskResult.java
@@ -20,6 +20,7 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 @EqualsAndHashCode(callSuper = true)
 public class WxCpGetMomentTaskResult extends WxCpBaseResp {
   private static final long serialVersionUID = 2515140928288915077L;
+
   private Integer status;
   private String type;
   private TaskResult result;
@@ -27,6 +28,8 @@ public class WxCpGetMomentTaskResult extends WxCpBaseResp {
   @Getter
   @Setter
   public static class TaskResult extends WxCpBaseResp {
+    private static final long serialVersionUID = 2162642873632126707L;
+
     @SerializedName("moment_id")
     private String momentId;
     @SerializedName("invalid_sender_list")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGroupWelcomeTemplateResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGroupWelcomeTemplateResult.java
index 5b92a0209..631d6be26 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGroupWelcomeTemplateResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpGroupWelcomeTemplateResult.java
@@ -1,9 +1,6 @@
 package me.chanjar.weixin.cp.bean.external;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import me.chanjar.weixin.cp.bean.WxCpBaseResp;
 import me.chanjar.weixin.cp.bean.external.msg.*;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
@@ -20,6 +17,7 @@ import java.io.Serializable;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 public class WxCpGroupWelcomeTemplateResult extends WxCpBaseResp implements Serializable {
   private static final long serialVersionUID = -6406667238670580612L;
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpMsgTemplate.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpMsgTemplate.java
index 845aefcc7..2d5343459 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpMsgTemplate.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpMsgTemplate.java
@@ -5,7 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import me.chanjar.weixin.cp.bean.external.msg.*;
+import me.chanjar.weixin.cp.bean.external.msg.Attachment;
+import me.chanjar.weixin.cp.bean.external.msg.Text;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
 import java.io.Serializable;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumInfo.java
index d84b9f232..e0ad62ea3 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumInfo.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumInfo.java
@@ -1,13 +1,14 @@
 package me.chanjar.weixin.cp.bean.external;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
-import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 import me.chanjar.weixin.cp.bean.external.product.Attachment;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * 
  * 获取商品图册
@@ -19,7 +20,6 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 @Getter
 @Setter
 public class WxCpProductAlbumInfo implements Serializable {
-
   private static final long serialVersionUID = -8338202601802366899L;
 
   @SerializedName("product_id")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumListResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumListResult.java
index 29b9d4c57..2b6f4b208 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumListResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumListResult.java
@@ -1,13 +1,14 @@
 package me.chanjar.weixin.cp.bean.external;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
-import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 import me.chanjar.weixin.cp.bean.WxCpBaseResp;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * 
  * 获取商品图册列表执行结果
@@ -19,7 +20,6 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 @Getter
 @Setter
 public class WxCpProductAlbumListResult extends WxCpBaseResp implements Serializable {
-
   private static final long serialVersionUID = 121265727802015428L;
 
   @SerializedName("product_list")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumResult.java
index 74e5fc3be..527bfb6eb 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumResult.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/WxCpProductAlbumResult.java
@@ -1,12 +1,13 @@
 package me.chanjar.weixin.cp.bean.external;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import me.chanjar.weixin.cp.bean.WxCpBaseResp;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
+import java.io.Serializable;
+
 /**
  * 
  * 获取商品图册执行结果
@@ -18,7 +19,6 @@ import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 @Getter
 @Setter
 public class WxCpProductAlbumResult extends WxCpBaseResp implements Serializable {
-
   private static final long serialVersionUID = 4076734101839851497L;
 
   @SerializedName("product")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/CustomerItem.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/CustomerItem.java
index 08b124239..3bcbe03e0 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/CustomerItem.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/CustomerItem.java
@@ -4,6 +4,9 @@ import com.google.gson.annotations.SerializedName;
 import lombok.Getter;
 import lombok.Setter;
 
+/**
+ * @author Boris
+ */
 @Getter
 @Setter
 public class CustomerItem {
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/ExternalContactList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/ExternalContactList.java
index 4d08bf358..c9f2e0a58 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/ExternalContactList.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/ExternalContactList.java
@@ -1,10 +1,11 @@
 package me.chanjar.weixin.cp.bean.external.moment;
 
 import com.google.gson.annotations.SerializedName;
-import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 public class ExternalContactList {
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/MomentInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/MomentInfo.java
index 589a4a58c..3fd364ddb 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/MomentInfo.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/MomentInfo.java
@@ -1,14 +1,14 @@
 package me.chanjar.weixin.cp.bean.external.moment;
 
 import com.google.gson.annotations.SerializedName;
-import java.util.List;
 import lombok.Data;
-import me.chanjar.weixin.cp.bean.external.msg.Image;
-import me.chanjar.weixin.cp.bean.external.msg.Link;
-import me.chanjar.weixin.cp.bean.external.msg.Location;
-import me.chanjar.weixin.cp.bean.external.msg.Text;
-import me.chanjar.weixin.cp.bean.external.msg.Video;
+import me.chanjar.weixin.cp.bean.external.msg.*;
 
+import java.util.List;
+
+/**
+ * @author Borisg
+ */
 @Data
 public class MomentInfo {
   @SerializedName("moment_id")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/SenderList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/SenderList.java
index 45889684c..b3f2c387e 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/SenderList.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/SenderList.java
@@ -1,10 +1,14 @@
 package me.chanjar.weixin.cp.bean.external.moment;
 
 import com.google.gson.annotations.SerializedName;
-import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
+/**
+ * @author Boris
+ */
 @Getter
 @Setter
 public class SenderList {
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/VisibleRange.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/VisibleRange.java
index 251fb5e64..39605be88 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/VisibleRange.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/moment/VisibleRange.java
@@ -1,11 +1,17 @@
 package me.chanjar.weixin.cp.bean.external.moment;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
+/**
+ * @author Boris
+ */
 @Data
 public class VisibleRange implements Serializable {
+  private static final long serialVersionUID = 5356285705365931051L;
+
   @SerializedName("sender_list")
   private SenderList senderList;
   @SerializedName("external_contact_list")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Attachment.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Attachment.java
index 7dce73ad0..d714b093c 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Attachment.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/msg/Attachment.java
@@ -47,7 +47,7 @@ public class Attachment implements Serializable {
     this.msgType = WxCpConsts.WelcomeMsgType.VIDEO;
   }
 
-  public void setFile(File file ) {
+  public void setFile(File file) {
     this.file = file;
     this.msgType = WxCpConsts.WelcomeMsgType.FILE;
   }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Attachment.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Attachment.java
index cfcb688c2..c1480fbb7 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Attachment.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Attachment.java
@@ -1,9 +1,10 @@
 package me.chanjar.weixin.cp.bean.external.product;
 
-import java.io.Serializable;
 import lombok.Data;
 import me.chanjar.weixin.cp.constant.WxCpConsts;
 
+import java.io.Serializable;
+
 /**
  * 商品画册附件
  *
@@ -11,7 +12,6 @@ import me.chanjar.weixin.cp.constant.WxCpConsts;
  */
 @Data
 public class Attachment implements Serializable {
-
   private static final long serialVersionUID = -4545283630169056262L;
 
   /**
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Image.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Image.java
index d56f0b270..7628a6367 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Image.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/external/product/Image.java
@@ -1,9 +1,10 @@
 package me.chanjar.weixin.cp.bean.external.product;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 商品画册图片
  *
@@ -11,7 +12,6 @@ import lombok.Data;
  */
 @Data
 public class Image implements Serializable {
-
   private static final long serialVersionUID = -2737415903252627814L;
 
   @SerializedName("media_id")
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfAccountLink.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfAccountLink.java
index a17e5c5e8..a46a186db 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfAccountLink.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfAccountLink.java
@@ -28,10 +28,10 @@ public class WxCpKfAccountLink implements Serializable {
    * 场景值,字符串类型,由开发者自定义。
    * 不多于32字节
    * 字符串取值范围(正则表达式):[0-9a-zA-Z_-]*
-   *
+   * 

* 1. 若scene非空,返回的客服链接开发者可拼接scene_param=SCENE_PARAM参数使用,用户进入会话事件会将SCENE_PARAM原样返回。 - * 其中SCENE_PARAM需要urlencode,且长度不能超过128字节。 - * 如 https://work.weixin.qq.com/kf/kfcbf8f8d07ac7215f?enc_scene=ENCGFSDF567DF&scene_param=a%3D1%26b%3D2 + * 其中SCENE_PARAM需要urlencode,且长度不能超过128字节。 + * 如 https://work.weixin.qq.com/kf/kfcbf8f8d07ac7215f?enc_scene=ENCGFSDF567DF&scene_param=a%3D1%26b%3D2 * 2. 历史调用接口返回的客服链接(包含encScene=XXX参数),不支持scene_param参数。 * 3. 返回的客服链接,不能修改或复制参数到其他链接使用。否则进入会话事件参数校验不通过,导致无法回调。 */ diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfAccountListResp.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfAccountListResp.java index c2676a44d..06f1ef066 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfAccountListResp.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfAccountListResp.java @@ -24,7 +24,7 @@ public class WxCpKfAccountListResp extends WxCpBaseResp { private static final long serialVersionUID = -1317201649692262217L; /** - * 帐号信息列表 + * 帐号信息列表 */ @JsonProperty("account_list") private List accountList; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpGroupRobotMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpGroupRobotMessage.java index de7e88d79..387b454cd 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpGroupRobotMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpGroupRobotMessage.java @@ -25,7 +25,7 @@ import static me.chanjar.weixin.cp.constant.WxCpConsts.GroupRobotMsgType.*; @Data public class WxCpGroupRobotMessage implements Serializable { private static final long serialVersionUID = -4301684507150486556L; - + /** * 消息类型 */ diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java index 027a51883..e6df7c5d6 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java @@ -147,7 +147,7 @@ public class WxCpMessage implements Serializable { * 整体卡片的点击跳转事件,text_notice必填本字段 * 跳转事件类型,1 代表跳转url,2 代表打开小程序。text_notice卡片模版中该字段取值范围为[1,2] */ - private Integer card_action_type; + private Integer card_action_type; /** * 跳转事件的url,card_action.type是1时必填 */ @@ -517,7 +517,7 @@ public class WxCpMessage implements Serializable { } List verticalContents = this.getVertical_contents(); - if(null != verticalContents && verticalContents.size() > 0) { + if (null != verticalContents && verticalContents.size() > 0) { JsonArray vContentJsonArray = new JsonArray(); for (VerticalContent vContent : this.getVertical_contents()) { JsonObject tempObject = vContent.toJson(); @@ -527,7 +527,7 @@ public class WxCpMessage implements Serializable { } List horizontalContents = this.getHorizontal_contents(); - if(null != horizontalContents && horizontalContents.size() > 0) { + if (null != horizontalContents && horizontalContents.size() > 0) { JsonArray hContentJsonArray = new JsonArray(); for (HorizontalContent hContent : this.getHorizontal_contents()) { JsonObject tempObject = hContent.toJson(); @@ -537,7 +537,7 @@ public class WxCpMessage implements Serializable { } List jumps = this.getJumps(); - if(null != jumps && jumps.size() > 0) { + if (null != jumps && jumps.size() > 0) { JsonArray jumpJsonArray = new JsonArray(); for (TemplateCardJump jump : this.getJumps()) { JsonObject tempObject = jump.toJson(); @@ -562,7 +562,7 @@ public class WxCpMessage implements Serializable { } List buttons = this.getButtons(); - if(null != buttons && buttons.size() > 0) { + if (null != buttons && buttons.size() > 0) { JsonArray btnJsonArray = new JsonArray(); for (TemplateCardButton btn : this.getButtons()) { JsonObject tempObject = btn.toJson(); @@ -602,7 +602,7 @@ public class WxCpMessage implements Serializable { // select_list List selects = this.getSelects(); - if(null != selects && selects.size() > 0) { + if (null != selects && selects.size() > 0) { JsonArray selectJsonArray = new JsonArray(); for (MultipleSelect select : this.getSelects()) { JsonObject tempObject = select.toJson(); @@ -612,9 +612,9 @@ public class WxCpMessage implements Serializable { } QuoteArea quoteArea = this.getQuoteArea(); - if (null != quoteArea){ + if (null != quoteArea) { JsonObject quoteAreaJson = quoteArea.toJson(); - template.add("quote_area",quoteAreaJson); + template.add("quote_area", quoteAreaJson); } messageJson.add("template_card", template); diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessageSendResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessageSendResult.java index 4c41d631b..6b02941dd 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessageSendResult.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessageSendResult.java @@ -1,15 +1,14 @@ package me.chanjar.weixin.cp.bean.message; -import java.io.Serializable; -import java.util.Collections; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Splitter; import com.google.gson.annotations.SerializedName; import lombok.Data; import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; +import org.apache.commons.lang3.StringUtils; + +import java.io.Serializable; +import java.util.Collections; +import java.util.List; /** * 消息发送结果对象类. @@ -44,7 +43,7 @@ public class WxCpMessageSendResult implements Serializable { @SerializedName("invalidtag") private String invalidTag; - + @SerializedName("msgid") private String msgId; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessageSendStatistics.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessageSendStatistics.java index 7cef0564d..be652c50b 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessageSendStatistics.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessageSendStatistics.java @@ -24,9 +24,9 @@ public class WxCpMessageSendStatistics implements Serializable { private List statistics; @Data - public static class StatisticItem implements Serializable { + public static class StatisticItem implements Serializable { private static final long serialVersionUID = 6031833682211475786L; - + /** * 应用名 */ diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpTpXmlMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpTpXmlMessage.java index fc159a9a3..579673594 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpTpXmlMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpTpXmlMessage.java @@ -1,9 +1,5 @@ package me.chanjar.weixin.cp.bean.message; -import java.io.Serializable; -import java.util.List; -import java.util.Map; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; import com.thoughtworks.xstream.converters.basic.IntConverter; @@ -15,6 +11,10 @@ import me.chanjar.weixin.common.util.xml.StringArrayConverter; import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; import me.chanjar.weixin.cp.util.xml.XStreamTransformer; +import java.io.Serializable; +import java.util.List; +import java.util.Map; + /** * 回调推送的message * https://work.weixin.qq.com/api/doc#90001/90143/90612 @@ -449,7 +449,7 @@ public class WxCpTpXmlMessage implements Serializable { @XStreamAlias("ItemUserId") protected Integer itemUserId; @XStreamAlias("ItemImage") - protected String itemImage; + protected String itemImage; } } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java index a95870590..6e215052f 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java @@ -658,20 +658,20 @@ public class WxCpXmlMessage implements Serializable { /** * 审批流程信息,可能有多个审批节点。 */ - @XStreamImplicit(itemFieldName="SpRecord") + @XStreamImplicit(itemFieldName = "SpRecord") private List spRecords; /** * 抄送信息,可能有多个抄送节点 * 这回查字典,notifier通知人,Notifyer这不知道是什么 */ - @XStreamImplicit(itemFieldName="Notifyer") + @XStreamImplicit(itemFieldName = "Notifyer") private List notifier; /** * 审批申请备注信息,可能有多个备注节点 */ - @XStreamImplicit(itemFieldName="Comments") + @XStreamImplicit(itemFieldName = "Comments") private List comments; /** @@ -706,7 +706,7 @@ public class WxCpXmlMessage implements Serializable { */ @XStreamAlias("SpRecord") @Data - public static class SpRecord implements Serializable{ + public static class SpRecord implements Serializable { private static final long serialVersionUID = 1247535623941881764L; @@ -725,7 +725,7 @@ public class WxCpXmlMessage implements Serializable { /** * 审批节点详情。当节点为标签或上级时,一个节点可能有多个分支 */ - @XStreamImplicit(itemFieldName="Details") + @XStreamImplicit(itemFieldName = "Details") private List details; } @@ -735,7 +735,7 @@ public class WxCpXmlMessage implements Serializable { */ @XStreamAlias("Details") @Data - public static class Detail implements Serializable{ + public static class Detail implements Serializable { private static final long serialVersionUID = -8446107461495047603L; @@ -775,7 +775,7 @@ public class WxCpXmlMessage implements Serializable { */ @Data @XStreamAlias("Approver") - public static class Approver implements Serializable{ + public static class Approver implements Serializable { private static final long serialVersionUID = 7360442444186683191L; @@ -791,7 +791,7 @@ public class WxCpXmlMessage implements Serializable { */ @Data @XStreamAlias("Notifyer") - public static class Notifier implements Serializable{ + public static class Notifier implements Serializable { private static final long serialVersionUID = -4524071522890013920L; @@ -807,7 +807,7 @@ public class WxCpXmlMessage implements Serializable { */ @Data @XStreamAlias("Comments") - public static class Comment implements Serializable{ + public static class Comment implements Serializable { private static final long serialVersionUID = 6912156206252719485L; @@ -839,7 +839,7 @@ public class WxCpXmlMessage implements Serializable { @Data @XStreamAlias("CommentUserInfo") - private static class CommentUserInfo implements Serializable{ + private static class CommentUserInfo implements Serializable { private static final long serialVersionUID = 5031739716823000947L; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutEventMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutEventMessage.java index 2b32d9c40..430e63a3a 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutEventMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutEventMessage.java @@ -5,7 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamConverter; import lombok.Data; import lombok.EqualsAndHashCode; import me.chanjar.weixin.common.api.WxConsts; -import me.chanjar.weixin.common.util.xml.*; +import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; /** * @author eYoung diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutMessage.java index f1c9831b9..89c29e25c 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutMessage.java @@ -1,7 +1,5 @@ package me.chanjar.weixin.cp.bean.message; -import java.io.Serializable; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; import lombok.Data; @@ -11,6 +9,8 @@ import me.chanjar.weixin.cp.config.WxCpConfigStorage; import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil; import me.chanjar.weixin.cp.util.xml.XStreamTransformer; +import java.io.Serializable; + /** * 被动回复消息. * https://work.weixin.qq.com/api/doc#12975 diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutUpdateBtnMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutUpdateBtnMessage.java index b0428469f..9e7222901 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutUpdateBtnMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutUpdateBtnMessage.java @@ -5,12 +5,8 @@ import com.thoughtworks.xstream.annotations.XStreamConverter; import lombok.Data; import lombok.EqualsAndHashCode; import me.chanjar.weixin.common.api.WxConsts; -import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; -import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter; import me.chanjar.weixin.common.util.xml.XStreamReplaceNameConverter; -import java.io.Serializable; - /** * @author nickname263 * @date 2021-09-23 @@ -18,7 +14,7 @@ import java.io.Serializable; @XStreamAlias("xml") @Data @EqualsAndHashCode(callSuper = false) -public class WxCpXmlOutUpdateBtnMessage extends WxCpXmlOutMessage { +public class WxCpXmlOutUpdateBtnMessage extends WxCpXmlOutMessage { private static final long serialVersionUID = 976182367423048138L; @XStreamAlias("Button") @XStreamConverter(value = XStreamReplaceNameConverter.class) @@ -29,5 +25,4 @@ public class WxCpXmlOutUpdateBtnMessage extends WxCpXmlOutMessage { } - } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutVideoMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutVideoMessage.java index 031dc02cb..add435a87 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutVideoMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutVideoMessage.java @@ -1,7 +1,5 @@ package me.chanjar.weixin.cp.bean.message; -import java.io.Serializable; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; import lombok.Data; @@ -9,6 +7,8 @@ import lombok.EqualsAndHashCode; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; +import java.io.Serializable; + @XStreamAlias("xml") @Data @EqualsAndHashCode(callSuper = false) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/MpnewsBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/MpnewsBuilder.java index bc1467e14..1d2108900 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/MpnewsBuilder.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/MpnewsBuilder.java @@ -1,8 +1,8 @@ package me.chanjar.weixin.cp.bean.messagebuilder; import me.chanjar.weixin.common.api.WxConsts; -import me.chanjar.weixin.cp.bean.message.WxCpMessage; import me.chanjar.weixin.cp.bean.article.MpnewsArticle; +import me.chanjar.weixin.cp.bean.message.WxCpMessage; import java.util.ArrayList; import java.util.Collections; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java index ef661e6ed..4d12a51ce 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java @@ -1,8 +1,8 @@ package me.chanjar.weixin.cp.bean.messagebuilder; import me.chanjar.weixin.common.api.WxConsts; -import me.chanjar.weixin.cp.bean.message.WxCpMessage; import me.chanjar.weixin.cp.bean.article.NewArticle; +import me.chanjar.weixin.cp.bean.message.WxCpMessage; import java.util.ArrayList; import java.util.Collections; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TemplateCardBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TemplateCardBuilder.java index ecee5108e..d936cda0f 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TemplateCardBuilder.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TemplateCardBuilder.java @@ -5,16 +5,17 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; import me.chanjar.weixin.cp.bean.templatecard.*; import java.util.List; + /** *

  * 模板卡片消息Builder
  * 用法: WxCustomMessage m = WxCustomMessage.TEMPLATECARD().title(...)....toUser(...).build();
  * 
* - * @author yzts + * @author yzts * @date 2019-05-16 */ -public class TemplateCardBuilder extends BaseBuilder{ +public class TemplateCardBuilder extends BaseBuilder { /** * 模板卡片类型,文本通知型卡片填写 “text_notice”, * 图文展示型卡片此处填写 “news_notice”, @@ -88,7 +89,7 @@ public class TemplateCardBuilder extends BaseBuilder{ * 整体卡片的点击跳转事件,text_notice必填本字段 * 跳转事件类型,1 代表跳转url,2 代表打开小程序。text_notice卡片模版中该字段取值范围为[1,2] */ - private Integer card_action_type; + private Integer card_action_type; /** * 跳转事件的url,card_action.type是1时必填 */ @@ -196,7 +197,7 @@ public class TemplateCardBuilder extends BaseBuilder{ return this; } - public TemplateCardBuilder vertical_contents(List vertical_contents) { + public TemplateCardBuilder vertical_contents(List vertical_contents) { this.vertical_contents = vertical_contents; return this; } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/SummaryInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/SummaryInfo.java index 49222cd0a..85954ba88 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/SummaryInfo.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/SummaryInfo.java @@ -3,7 +3,6 @@ package me.chanjar.weixin.cp.bean.oa; import com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.experimental.Accessors; -import me.chanjar.weixin.cp.bean.oa.WxCpOaApplyEventRequest; import java.io.Serializable; import java.util.List; @@ -18,6 +17,7 @@ import java.util.List; @Accessors(chain = true) public class SummaryInfo implements Serializable { private static final long serialVersionUID = 8262265774851382414L; + /** * 摘要行信息,用于定义某一行摘要显示的内容 */ @@ -28,6 +28,7 @@ public class SummaryInfo implements Serializable { @Accessors(chain = true) public static class SummaryInfoData implements Serializable { private static final long serialVersionUID = 5314161929610113856L; + /** * 摘要行显示文字,用于记录列表和消息通知的显示,不要超过20个字符 */ diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalApplier.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalApplier.java index 7d372cdfc..8b16aefa8 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalApplier.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalApplier.java @@ -8,6 +8,7 @@ import java.io.Serializable; /** * 申请人信息 + * * @author element */ @Data diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalInfo.java index 4856af419..b9c1235f1 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalInfo.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalInfo.java @@ -1,11 +1,11 @@ package me.chanjar.weixin.cp.bean.oa; -import java.io.Serializable; -import java.util.List; - import com.google.gson.annotations.SerializedName; import lombok.Data; +import java.io.Serializable; +import java.util.List; + /** * @author element */ diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalInfoQueryFilter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalInfoQueryFilter.java index 527131208..73e6d81d2 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalInfoQueryFilter.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalInfoQueryFilter.java @@ -29,7 +29,7 @@ public class WxCpApprovalInfoQueryFilter implements Serializable { return WxGsonBuilder.create().toJson(this); } - public static enum KEY { + public enum KEY { /** * template_id - 模板类型/模板id; @@ -52,9 +52,9 @@ public class WxCpApprovalInfoQueryFilter implements Serializable { @SerializedName("sp_status") SP_STATUS("sp_status"); - private String value; + private final String value; - private KEY(String value) { + KEY(String value) { this.value = value; } } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalRecord.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalRecord.java index 3325eaa4a..c2ac33176 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalRecord.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalRecord.java @@ -8,6 +8,7 @@ import java.util.List; /** * 审批流程信息 + * * @author element */ @Data diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalRecordDetail.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalRecordDetail.java index 4c966c9d6..371546d73 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalRecordDetail.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalRecordDetail.java @@ -8,11 +8,11 @@ import java.util.List; /** * 审批节点详情 + * * @author element */ @Data public class WxCpApprovalRecordDetail implements Serializable { - private static final long serialVersionUID = -9142079764088495301L; /** diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApproverAttr.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApproverAttr.java index 15e55f2f7..ae65a8208 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApproverAttr.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApproverAttr.java @@ -19,9 +19,9 @@ public enum WxCpApproverAttr { @SerializedName("2") ALL_SIGN(2); - private Integer attr; + private final Integer attr; - private WxCpApproverAttr(Integer attr) { + WxCpApproverAttr(Integer attr) { this.attr = attr; } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinData.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinData.java index 93e975508..9fb385a93 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinData.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinData.java @@ -96,26 +96,26 @@ public class WxCpCheckinData implements Serializable { */ @SerializedName("deviceid") private String deviceId; - + /** * 标准打卡时间,指此次打卡时间对应的标准上班时间或标准下班时间 */ @SerializedName("sch_checkin_time") private Long schCheckinTime; - - /** + + /** * 规则id,表示打卡记录所属规则的id */ @SerializedName("groupid") private Integer groupId; - - /** + + /** * 班次id,表示打卡记录所属规则中,所属班次的id */ @SerializedName("schedule_id") private Integer scheduleId; - - /** + + /** * 时段id,表示打卡记录所属规则中,某一班次中的某一时段的id,如上下班时间为9:00-12:00、13:00-18:00的班次中,9:00-12:00为其中一组时段 */ @SerializedName("timeline_id") diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinDayData.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinDayData.java index 0c0bd8a07..ef3ae1c08 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinDayData.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinDayData.java @@ -8,7 +8,6 @@ import java.util.List; /** * 企业微信打卡日报数据 - * */ @Data public class WxCpCheckinDayData implements Serializable { @@ -22,7 +21,7 @@ public class WxCpCheckinDayData implements Serializable { private BaseInfo baseInfo; @Data - public class BaseInfo implements Serializable{ + public class BaseInfo implements Serializable { private static final long serialVersionUID = 3679745559788648438L; @@ -102,7 +101,7 @@ public class WxCpCheckinDayData implements Serializable { private List checkinTime; @Data - public class CheckinTime implements Serializable{ + public class CheckinTime implements Serializable { private static final long serialVersionUID = 1582835435812966332L; /** * work_sec 上班时间,为距离0点的时间差 @@ -117,6 +116,7 @@ public class WxCpCheckinDayData implements Serializable { private Integer offWorkSec; } } + /** * day_type 日报类型:0-工作日日报;1-休息日日报 */ @@ -131,7 +131,7 @@ public class WxCpCheckinDayData implements Serializable { private SummaryInfo summaryInfo; @Data - public class SummaryInfo implements Serializable{ + public class SummaryInfo implements Serializable { private static final long serialVersionUID = 3428576099259666595L; /** * checkin_count 当日打卡次数 @@ -171,7 +171,7 @@ public class WxCpCheckinDayData implements Serializable { private List holidayInfos; @Data - public class HolidayInfos implements Serializable{ + public class HolidayInfos implements Serializable { private static final long serialVersionUID = -6671577072585561527L; /** * sp_number 假勤相关信息 @@ -195,7 +195,7 @@ public class WxCpCheckinDayData implements Serializable { private List data; @lombok.Data - public class Data implements Serializable{ + public class Data implements Serializable { private static final long serialVersionUID = -1672692024530543180L; /** * text 假勤信息摘要-标题文本 @@ -218,7 +218,7 @@ public class WxCpCheckinDayData implements Serializable { private SpDescription spDescription; @Data - public class SpDescription implements Serializable{ + public class SpDescription implements Serializable { private static final long serialVersionUID = 77680581771933449L; /** @@ -228,7 +228,7 @@ public class WxCpCheckinDayData implements Serializable { private List data; @lombok.Data - public class Data implements Serializable{ + public class Data implements Serializable { private static final long serialVersionUID = 3555479101375365805L; /** * text 假勤信息摘要-标题文本 @@ -252,7 +252,7 @@ public class WxCpCheckinDayData implements Serializable { private List exceptionInfos; @Data - public class ExceptionInfos implements Serializable{ + public class ExceptionInfos implements Serializable { private static final long serialVersionUID = -5987438373762518299L; /** * exception 校准状态类型:1-迟到;2-早退;3-缺卡;4-旷工;5-地点异常;6-设备异常 @@ -280,7 +280,7 @@ public class WxCpCheckinDayData implements Serializable { private OtInfo otInfo; @Data - public class OtInfo implements Serializable{ + public class OtInfo implements Serializable { private static final long serialVersionUID = -6557759801572150175L; /** * ot_status 状态:0-无加班;1-正常;2-缺时长 @@ -308,7 +308,7 @@ public class WxCpCheckinDayData implements Serializable { private List spItems; @Data - public class SpItem implements Serializable{ + public class SpItem implements Serializable { private static final long serialVersionUID = 2423158264958352024L; /** * type 类型:1-请假;2-补卡;3-出差;4-外出;100-外勤 diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinMonthData.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinMonthData.java index 003c68d2e..559c8e46a 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinMonthData.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinMonthData.java @@ -8,6 +8,8 @@ import java.util.List; /** * 企业微信打卡月报数据 + * + * @author longliveh */ @Data @@ -21,8 +23,9 @@ public class WxCpCheckinMonthData implements Serializable { private BaseInfo baseInfo; @Data - public class BaseInfo implements Serializable { + public static class BaseInfo implements Serializable { private static final long serialVersionUID = -5368331890851903885L; + /** * record_type 记录类型:1-固定上下班;2-外出(此报表中不会出现外出打卡数据);3-按班次上下班;4-自由签到;5-加班;7-无规则 */ @@ -60,8 +63,9 @@ public class WxCpCheckinMonthData implements Serializable { private RuleInfo ruleInfo; @Data - public class RuleInfo implements Serializable { + public static class RuleInfo implements Serializable { private static final long serialVersionUID = 9152263355916880710L; + /** * groupid 所属规则Id */ @@ -76,10 +80,6 @@ public class WxCpCheckinMonthData implements Serializable { } } - - - - /** * summary_info 打卡人员所属规则信息 */ @@ -87,7 +87,7 @@ public class WxCpCheckinMonthData implements Serializable { private SummaryInfo summaryInfo; @Data - public class SummaryInfo implements Serializable { + public static class SummaryInfo implements Serializable { private static final long serialVersionUID = -1956770107240513983L; /** * work_days 应打卡天数 @@ -128,7 +128,7 @@ public class WxCpCheckinMonthData implements Serializable { private List exceptionInfos; @Data - public class ExceptionInfo implements Serializable { + public static class ExceptionInfo implements Serializable { private static final long serialVersionUID = -4855850255704089359L; /** * exception 异常类型:1-迟到;2-早退;3-缺卡;4-旷工;5-地点异常;6-设备异常 @@ -156,9 +156,9 @@ public class WxCpCheckinMonthData implements Serializable { private List spItems; @Data - public class SpItem implements Serializable { - + public static class SpItem implements Serializable { private static final long serialVersionUID = 224472626753597080L; + /** * type 假勤类型:1-请假;2-补卡;3-出差;4-外出;100-外勤 */ @@ -203,8 +203,9 @@ public class WxCpCheckinMonthData implements Serializable { private OverWorkInfo overworkInfo; @Data - public class OverWorkInfo implements Serializable { + public static class OverWorkInfo implements Serializable { private static final long serialVersionUID = -9149524232645899305L; + /** * workday_over_sec 工作日加班时长 */ diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCropCheckinOption.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCropCheckinOption.java index c68741fca..f9ab9dd15 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCropCheckinOption.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCropCheckinOption.java @@ -22,61 +22,61 @@ public class WxCpCropCheckinOption implements Serializable { private Long groupType; /** - * 打卡规则id + * 打卡规则id */ @SerializedName("groupid") private Long groupId; /** - * 打卡规则名称 + * 打卡规则名称 */ @SerializedName("groupname") private String groupName; /** - * 打卡时间,当规则类型为排班时没有意义 + * 打卡时间,当规则类型为排班时没有意义 */ @SerializedName("checkindate") private List checkinDate; /** - * 特殊日期-必须打卡日期信息,timestamp表示具体时间 + * 特殊日期-必须打卡日期信息,timestamp表示具体时间 */ @SerializedName("spe_workdays") private List speWorkdays; /** - * 特殊日期-不用打卡日期信息, timestamp表示具体时间 + * 特殊日期-不用打卡日期信息, timestamp表示具体时间 */ @SerializedName("spe_offdays") private List speOffDays; /** - * 是否同步法定节假日,true为同步,false为不同步,当前排班不支持 + * 是否同步法定节假日,true为同步,false为不同步,当前排班不支持 */ @SerializedName("sync_holidays") private Boolean syncHolidays; /** - * 是否打卡必须拍照,true为必须拍照,false为不必须拍照 + * 是否打卡必须拍照,true为必须拍照,false为不必须拍照 */ @SerializedName("need_photo") private Boolean needPhoto; /** - * 是否备注时允许上传本地图片,true为允许,false为不允许 + * 是否备注时允许上传本地图片,true为允许,false为不允许 */ @SerializedName("note_can_use_local_pic") private Boolean noteCanUseLocalPic; /** - * 是否非工作日允许打卡,true为允许,false为不允许 + * 是否非工作日允许打卡,true为允许,false为不允许 */ @SerializedName("allow_checkin_offworkday") private Boolean allowCheckinOffWorkDay; /** - * 是否允许提交补卡申请,true为允许,false为不允许 + * 是否允许提交补卡申请,true为允许,false为不允许 */ @SerializedName("allow_apply_offworkday") private Boolean allowApplyOffWorkDay; @@ -106,217 +106,217 @@ public class WxCpCropCheckinOption implements Serializable { private Long createTime; /** - * 打卡人员白名单,即不需要打卡人员,需要有设置白名单才能查看 + * 打卡人员白名单,即不需要打卡人员,需要有设置白名单才能查看 */ @SerializedName("white_users") private List whiteUsers; /** - * 打卡方式,0:手机;2:智慧考勤机;3:手机+智慧考勤机 + * 打卡方式,0:手机;2:智慧考勤机;3:手机+智慧考勤机 */ @SerializedName("type") private Integer type; /** - * 打卡方式,0:手机;2:智慧考勤机;3:手机+智慧考勤机 + * 打卡方式,0:手机;2:智慧考勤机;3:手机+智慧考勤机 */ @SerializedName("reporterinfo") private ReporterInfo reporterInfo; /** - * 加班信息,相关信息需要设置后才能显示 + * 加班信息,相关信息需要设置后才能显示 */ @SerializedName("ot_info") private OtInfo otInfo; /** - * 每月最多补卡次数,默认-1表示不限制 + * 每月最多补卡次数,默认-1表示不限制 */ @SerializedName("allow_apply_bk_cnt") private Integer allowApplyBkCnt; /** - * 范围外打卡处理方式,0-视为范围外异常,默认值;1-视为正常外勤;2:不允许范围外打卡 + * 范围外打卡处理方式,0-视为范围外异常,默认值;1-视为正常外勤;2:不允许范围外打卡 */ @SerializedName("option_out_range") private Integer optionOutRange; /** - * 规则创建人userid + * 规则创建人userid */ @SerializedName("create_userid") private String createUserid; /** - * 人脸识别打卡开关,true为启用,false为不启用 + * 人脸识别打卡开关,true为启用,false为不启用 */ @SerializedName("use_face_detect") private Boolean useFaceDetect; /** - * 允许补卡时限,默认-1表示不限制。单位天 + * 允许补卡时限,默认-1表示不限制。单位天 */ @SerializedName("allow_apply_bk_day_limit") private Integer allowApplyBkDayLimit; /** - * 规则最近编辑人userid + * 规则最近编辑人userid */ @SerializedName("update_userid") private String updateUserid; /** - * 加班信息,相关信息需要设置后才能显示 + * 加班信息,相关信息需要设置后才能显示 */ @SerializedName("schedulelist") private List schedulelist; /** - * 自由签到,上班打卡后xx秒可打下班卡 + * 自由签到,上班打卡后xx秒可打下班卡 */ @SerializedName("offwork_interval_time") private Integer offWorkIntervalTime; @Data - public static class CheckinDate implements Serializable{ + public static class CheckinDate implements Serializable { private static final long serialVersionUID = -8560643656775167406L; /** - * 工作日。若为固定时间上下班或自由上下班,则1到6分别表示星期一到星期六,0表示星期日 + * 工作日。若为固定时间上下班或自由上下班,则1到6分别表示星期一到星期六,0表示星期日 */ @SerializedName("workdays") private List workdays; /** - * 工作日上下班打卡时间信息 + * 工作日上下班打卡时间信息 */ @SerializedName("checkintime") private List checkinTime; /** - * 下班不需要打卡,true为下班不需要打卡,false为下班需要打卡 + * 下班不需要打卡,true为下班不需要打卡,false为下班需要打卡 */ @SerializedName("noneed_offwork") private Boolean noneedOffwork; /** - * 打卡时间限制(毫秒) + * 打卡时间限制(毫秒) */ @SerializedName("limit_aheadtime") private Long limitAheadtime; /** - * 允许迟到时间,单位ms + * 允许迟到时间,单位ms */ @SerializedName("flex_on_duty_time") private Integer flexOnDutyTime; /** - * 允许早退时间,单位ms + * 允许早退时间,单位ms */ @SerializedName("flex_off_duty_time") private Integer flexOffDutyTime; } @Data - public static class CheckinTime implements Serializable{ + public static class CheckinTime implements Serializable { private static final long serialVersionUID = -5507709858609705279L; /** - * 上班时间,表示为距离当天0点的秒数。 + * 上班时间,表示为距离当天0点的秒数。 */ @SerializedName("work_sec") private Integer workSec; /** - * 下班时间,表示为距离当天0点的秒数。 + * 下班时间,表示为距离当天0点的秒数。 */ @SerializedName("off_work_sec") private Integer offWorkSec; /** - * 上班提醒时间,表示为距离当天0点的秒数。。 + * 上班提醒时间,表示为距离当天0点的秒数。。 */ @SerializedName("remind_work_sec") private Integer remindWorkSec; /** - * 下班提醒时间,表示为距离当天0点的秒数。 + * 下班提醒时间,表示为距离当天0点的秒数。 */ @SerializedName("remind_off_work_sec") private Integer remindOffWorkSec; } @Data - public static class SpeWorkday implements Serializable{ + public static class SpeWorkday implements Serializable { private static final long serialVersionUID = -4620710297258742666L; /** - * 特殊日期-必须打卡日期时间戳 + * 特殊日期-必须打卡日期时间戳 */ @SerializedName("timestamp") private Long timestamp; /** - * 特殊日期备注 + * 特殊日期备注 */ @SerializedName("notes") private String notes; /** - * 特殊日期-必须打卡日期-上下班打卡时间 + * 特殊日期-必须打卡日期-上下班打卡时间 */ @SerializedName("checkintime") private List checkinTime; } @Data - public static class SpeOffDay implements Serializable{ + public static class SpeOffDay implements Serializable { private static final long serialVersionUID = 9214798931489490993L; /** - * 特殊日期-不用打卡日期时间戳 + * 特殊日期-不用打卡日期时间戳 */ @SerializedName("timestamp") private Long timestamp; /** - * 特殊日期备注 + * 特殊日期备注 */ @SerializedName("notes") private String notes; } @Data - public static class WifiMacInfo implements Serializable{ + public static class WifiMacInfo implements Serializable { private static final long serialVersionUID = 6742659716677227089L; /** - * WiFi打卡地点名称 + * WiFi打卡地点名称 */ @SerializedName("wifiname") private String wifiname; /** - * WiFi打卡地点MAC地址/bssid + * WiFi打卡地点MAC地址/bssid */ @SerializedName("wifimac") private String wifimac; } @Data - public static class LocInfo implements Serializable{ + public static class LocInfo implements Serializable { private static final long serialVersionUID = -5591379191341944101L; /** - * 位置打卡地点纬度,是实际纬度的1000000倍,与腾讯地图一致采用GCJ-02坐标系统标准 + * 位置打卡地点纬度,是实际纬度的1000000倍,与腾讯地图一致采用GCJ-02坐标系统标准 */ @SerializedName("lat") private Long lat; /** - * 位置打卡地点经度,是实际经度的1000000倍,与腾讯地图一致采用GCJ-02坐标系统标准 + * 位置打卡地点经度,是实际经度的1000000倍,与腾讯地图一致采用GCJ-02坐标系统标准 */ @SerializedName("lng") private Long lng; @@ -334,31 +334,31 @@ public class WxCpCropCheckinOption implements Serializable { private String locDetail; /** - * 允许打卡范围(米) + * 允许打卡范围(米) */ @SerializedName("distance") private Integer distance; } @Data - public static class Range implements Serializable{ + public static class Range implements Serializable { private static final long serialVersionUID = 8940086218556453088L; /** - * 打卡人员中,单个打卡人员节点的userid + * 打卡人员中,单个打卡人员节点的userid */ @SerializedName("party_id") private List partyid; /** - * 打卡人员中,部门节点的id + * 打卡人员中,部门节点的id */ @SerializedName("userid") private List userid; /** - * 打卡人员中,标签节点的标签id + * 打卡人员中,标签节点的标签id */ @SerializedName("tagid") private List tagid; @@ -367,16 +367,16 @@ public class WxCpCropCheckinOption implements Serializable { } @Data - public static class ReporterInfo implements Serializable{ + public static class ReporterInfo implements Serializable { private static final long serialVersionUID = 1132450350458936772L; /** - * 汇报对象,每个汇报人用userid表示 + * 汇报对象,每个汇报人用userid表示 */ @SerializedName("reporters") private List reporters; /** - * 汇报对象更新时间 + * 汇报对象更新时间 */ @SerializedName("updatetime") private long updateTime; @@ -392,7 +392,7 @@ public class WxCpCropCheckinOption implements Serializable { } @Data - public static class OtInfo implements Serializable{ + public static class OtInfo implements Serializable { private static final long serialVersionUID = 1610150484871066199L; @@ -406,31 +406,31 @@ public class WxCpCropCheckinOption implements Serializable { private Integer type; /** - * 允许工作日加班,true为允许,false为不允许 + * 允许工作日加班,true为允许,false为不允许 */ @SerializedName("allow_ot_workingday") private Boolean allowOtWorkingDay; /** - * 允许非工作日加班,true为允许,flase为不允许 + * 允许非工作日加班,true为允许,flase为不允许 */ @SerializedName("allow_ot_nonworkingday") private Boolean allowOtNonworkingDay; /** - * 允许非工作日加班,true为允许,flase为不允许 + * 允许非工作日加班,true为允许,flase为不允许 */ @SerializedName("otcheckinfo") private OtCheckInfo otcheckinfo; /** - * 更新时间 + * 更新时间 */ @SerializedName("uptime") private Long uptime; /** - * 允许非工作日加班,true为允许,flase为不允许 + * 允许非工作日加班,true为允许,flase为不允许 */ @SerializedName("otapplyinfo") private OtApplyInfo otapplyinfo; @@ -442,91 +442,91 @@ public class WxCpCropCheckinOption implements Serializable { private static final long serialVersionUID = -2363047492489556390L; /** - * 允许工作日加班-加班开始时间:下班后xx秒开始计算加班,距离最晚下班时间的秒数,例如,1800(30分钟 乘以 60秒),默认值30分钟 + * 允许工作日加班-加班开始时间:下班后xx秒开始计算加班,距离最晚下班时间的秒数,例如,1800(30分钟 乘以 60秒),默认值30分钟 */ @SerializedName("ot_workingday_time_start") private Integer otWorkingDayTimeStart; /** - * 允许工作日加班-最短加班时长:不足xx秒视为未加班,单位秒,默认值30分钟 + * 允许工作日加班-最短加班时长:不足xx秒视为未加班,单位秒,默认值30分钟 */ @SerializedName("ot_workingday_time_min") private Integer otWorkingDayTimeMin; /** - * 允许工作日加班-最长加班时长:超过则视为加班xx秒,单位秒,默认值240分钟 + * 允许工作日加班-最长加班时长:超过则视为加班xx秒,单位秒,默认值240分钟 */ @SerializedName("ot_workingday_time_max") private Integer otWorkingDayTimeMax; /** - * 允许非工作日加班-最短加班时长:不足xx秒视为未加班,单位秒,默认值30分钟 + * 允许非工作日加班-最短加班时长:不足xx秒视为未加班,单位秒,默认值30分钟 */ @SerializedName("ot_nonworkingday_time_min") private Integer otNonworkingDayTimeMin; /** - * 允许非工作日加班-最长加班时长:超过则视为加班xx秒 单位秒,默认值240分钟 + * 允许非工作日加班-最长加班时长:超过则视为加班xx秒 单位秒,默认值240分钟 */ @SerializedName("ot_nonworkingday_time_max") private Integer otNonworkingDayTimeMax; /** - * 非工作日加班,跨天时间,距离当天00:00的秒数 + * 非工作日加班,跨天时间,距离当天00:00的秒数 */ @SerializedName("ot_nonworkingday_spanday_time") private Integer otNonworkingDaySpanDayTime; /** - * 允许非工作日加班,true为允许,flase为不允许 + * 允许非工作日加班,true为允许,flase为不允许 */ @SerializedName("ot_workingday_restinfo") private OtWorkingDayRestInfo otWorkingdayRestinfo; /** - * 允许非工作日加班,true为允许,flase为不允许 + * 允许非工作日加班,true为允许,flase为不允许 */ @SerializedName("ot_nonworkingday_restinfo") private OtNonworkingDayRestInfo otNonworkingdayRestinfo; } @Data - public static class OtWorkingDayRestInfo implements Serializable{ + public static class OtWorkingDayRestInfo implements Serializable { private static final long serialVersionUID = -4011047369711928306L; /** - * 工作日加班-休息扣除类型:0-不开启扣除;1-指定休息时间扣除;2-按加班时长扣除休息时间 + * 工作日加班-休息扣除类型:0-不开启扣除;1-指定休息时间扣除;2-按加班时长扣除休息时间 */ @SerializedName("type") private Integer type; /** - * 工作日加班-指定休息时间配置信息,当group.ot_info.otcheckinfo.ot_workingday_restinfo.type为1时有意义 + * 工作日加班-指定休息时间配置信息,当group.ot_info.otcheckinfo.ot_workingday_restinfo.type为1时有意义 */ @SerializedName("fix_time_rule") private FixTimeRule fixTimeRule; /** - * 工作日加班-按加班时长扣除配置信息,当group.ot_info.otcheckinfo.ot_workingday_restinfo.type为2时有意义 + * 工作日加班-按加班时长扣除配置信息,当group.ot_info.otcheckinfo.ot_workingday_restinfo.type为2时有意义 */ @SerializedName("cal_ottime_rule") private CalOtTimeRule calOttimeRule; } @Data - public static class FixTimeRule implements Serializable{ + public static class FixTimeRule implements Serializable { private static final long serialVersionUID = 5709478500196619664L; /** - * 工作日加班-指定休息时间的开始时间, 距离当天00:00的秒数 + * 工作日加班-指定休息时间的开始时间, 距离当天00:00的秒数 */ @SerializedName("fix_time_begin_sec") private Integer fixTimeBeginSec; /** - * 工作日加班-指定休息时间的结束时间, 距离当天00:00的秒数 + * 工作日加班-指定休息时间的结束时间, 距离当天00:00的秒数 */ @SerializedName("fix_time_end_sec") private Integer fixTimeEndSec; @@ -538,91 +538,92 @@ public class WxCpCropCheckinOption implements Serializable { private static final long serialVersionUID = -2407839982631243413L; /** - * 工作日加班-按加班时长扣除条件信息 + * 工作日加班-按加班时长扣除条件信息 */ @SerializedName("items") private List items; } + @Data - public static class Item implements Serializable{ + public static class Item implements Serializable { private static final long serialVersionUID = 5235770378506228461L; /** - * 加班满-时长(秒) + * 加班满-时长(秒) */ @SerializedName("ot_time") private Integer otTime; /** - * 对应扣除-时长(秒) + * 对应扣除-时长(秒) */ @SerializedName("rest_time") private Integer restTime; } @Data - public static class OtNonworkingDayRestInfo implements Serializable{ + public static class OtNonworkingDayRestInfo implements Serializable { private static final long serialVersionUID = 3773846077049838088L; /** - * 非工作日加班-休息扣除类型:0-不开启扣除;1-指定休息时间扣除;2-按加班时长扣除休息时间 + * 非工作日加班-休息扣除类型:0-不开启扣除;1-指定休息时间扣除;2-按加班时长扣除休息时间 */ @SerializedName("type") private Integer type; /** - * 非工作日加班-指定休息时间配置信息,当group.ot_info.otcheckinfo.ot_workingday_restinfo.type为1时有意义 + * 非工作日加班-指定休息时间配置信息,当group.ot_info.otcheckinfo.ot_workingday_restinfo.type为1时有意义 */ @SerializedName("fix_time_rule") private FixTimeRule fixTimeRule; /** - * 非工作日加班-按加班时长扣除配置信息,当group.ot_info.otcheckinfo.ot_workingday_restinfo.type为2时有意义 + * 非工作日加班-按加班时长扣除配置信息,当group.ot_info.otcheckinfo.ot_workingday_restinfo.type为2时有意义 */ @SerializedName("cal_ottime_rule") private CalOtTimeRule calOttimeRule; } @Data - public static class OtApplyInfo implements Serializable{ + public static class OtApplyInfo implements Serializable { private static final long serialVersionUID = 961217471918884103L; /** - * 允许工作日加班,true为允许,false为不允许 + * 允许工作日加班,true为允许,false为不允许 */ @SerializedName("allow_ot_workingday") private Boolean allowOtWorkingDay; /** - * 允许非工作日加班,true为允许,flase为不允许 + * 允许非工作日加班,true为允许,flase为不允许 */ @SerializedName("allow_ot_nonworkingday") private Boolean allowOtNonworkingDay; /** - * 更新时间 + * 更新时间 */ @SerializedName("uptime") private Long uptime; /** - * 允许非工作日加班,true为允许,flase为不允许 + * 允许非工作日加班,true为允许,flase为不允许 */ @SerializedName("ot_workingday_restinfo") private OtWorkingDayRestInfo otWorkingdayRestinfo; /** - * 允许非工作日加班,true为允许,flase为不允许 + * 允许非工作日加班,true为允许,flase为不允许 */ @SerializedName("ot_nonworkingday_restinfo") private OtNonworkingDayRestInfo otNonworkingdayRestinfo; /** - * 非工作日加班,跨天时间,距离当天00:00的秒数 + * 非工作日加班,跨天时间,距离当天00:00的秒数 */ @SerializedName("ot_nonworkingday_spanday_time") private Integer otNonworkingDaySpanDayTime; @@ -630,78 +631,78 @@ public class WxCpCropCheckinOption implements Serializable { } @Data - public static class Schedule implements Serializable{ + public static class Schedule implements Serializable { private static final long serialVersionUID = -2461113644925307266L; /** - * 班次id + * 班次id */ @SerializedName("schedule_id") private Integer scheduleId; /** - * 班次名称 + * 班次名称 */ @SerializedName("schedule_name") private String scheduleName; /** - * 班次上下班时段信息 + * 班次上下班时段信息 */ @SerializedName("time_section") private List timeSection; /** - * 允许提前打卡时间 + * 允许提前打卡时间 */ @SerializedName("limit_aheadtime") private Long limitAheadTime; /** - * 下班xx秒后不允许打下班卡 + * 下班xx秒后不允许打下班卡 */ @SerializedName("limit_offtime") private Integer limitOffTime; /** - * 下班不需要打卡 + * 下班不需要打卡 */ @SerializedName("noneed_offwork") private Boolean noNeedOffWork; /** - * 是否允许弹性时间 + * 是否允许弹性时间 */ @SerializedName("allow_flex") private Boolean allowFlex; /** - * 允许迟到时间 + * 允许迟到时间 */ @SerializedName("flex_on_duty_time") private Integer flexOnDutyTime; /** - * 允许早退时间 + * 允许早退时间 */ @SerializedName("flex_off_duty_time") private Integer flexOffDutyTime; /** - * 非工作日加班,跨天时间,距离当天00:00的秒数 + * 非工作日加班,跨天时间,距离当天00:00的秒数 */ @SerializedName("late_rule") private LateRule lateRule; /** - * 最早可打卡时间限制 + * 最早可打卡时间限制 */ @SerializedName("max_allow_arrive_early") private Integer maxAllowArriveEarly; /** - * 最晚可打卡时间限制,max_allow_arrive_early、max_allow_arrive_early与flex_on_duty_time、flex_off_duty_time互斥,当设置其中一组时,另一组数值置0 + * 最晚可打卡时间限制,max_allow_arrive_early、max_allow_arrive_early与flex_on_duty_time、flex_off_duty_time互斥,当设置其中一组时,另一组数值置0 */ @SerializedName("max_allow_arrive_late") private Integer maxAllowArriveLate; @@ -714,49 +715,49 @@ public class WxCpCropCheckinOption implements Serializable { private static final long serialVersionUID = 7497252128339062724L; /** - * 时段id,为班次中某一堆上下班时间组合的id + * 时段id,为班次中某一堆上下班时间组合的id */ @SerializedName("time_id") private Integer timeId; /** - * 上班时间,表示为距离当天0点的秒数。 + * 上班时间,表示为距离当天0点的秒数。 */ @SerializedName("work_sec") private Integer workSec; /** - * 下班时间,表示为距离当天0点的秒数。 + * 下班时间,表示为距离当天0点的秒数。 */ @SerializedName("off_work_sec") private Integer offWorkSec; /** - * 上班提醒时间,表示为距离当天0点的秒数。 + * 上班提醒时间,表示为距离当天0点的秒数。 */ @SerializedName("remind_work_sec") private Long remindWorkSec; /** - * 下班提醒时间,表示为距离当天0点的秒数。 + * 下班提醒时间,表示为距离当天0点的秒数。 */ @SerializedName("remind_off_work_sec") private Integer remindOffWorkSec; /** - * 休息开始时间,仅单时段支持,距离0点的秒 + * 休息开始时间,仅单时段支持,距离0点的秒 */ @SerializedName("rest_begin_time") private Integer restBeginTime; /** - * 休息结束时间,仅单时段支持,距离0点的秒 + * 休息结束时间,仅单时段支持,距离0点的秒 */ @SerializedName("rest_end_time") private Integer restEndTime; /** - * 是否允许休息 + * 是否允许休息 */ @SerializedName("allow_rest") private Boolean allowRest; @@ -764,37 +765,37 @@ public class WxCpCropCheckinOption implements Serializable { @Data - public static class LateRule implements Serializable{ + public static class LateRule implements Serializable { private static final long serialVersionUID = 5604969713950037053L; /** - * 是否允许超时下班(下班晚走次日晚到)允许时onwork_flex_time,offwork_after_time才有意义 + * 是否允许超时下班(下班晚走次日晚到)允许时onwork_flex_time,offwork_after_time才有意义 */ @SerializedName("allow_offwork_after_time") private Boolean allowOffWorkAfterTime; /** - * 迟到规则时间 + * 迟到规则时间 */ @SerializedName("timerules") private List timerules; } @Data - public static class TimeRule implements Serializable{ + public static class TimeRule implements Serializable { private static final long serialVersionUID = 5680614050081598333L; /** - * 晚走的时间 距离最晚一个下班的时间单位:秒 + * 晚走的时间 距离最晚一个下班的时间单位:秒 */ @SerializedName("offwork_after_time") private Integer offWorkAfterTime; /** - * 第二天第一个班次允许迟到的弹性时间单位:秒 + * 第二天第一个班次允许迟到的弹性时间单位:秒 */ @SerializedName("onwork_flex_time") private Integer onWorkFlexTime; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpSetCheckinSchedule.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpSetCheckinSchedule.java index 3d0d1f87f..d34d233a3 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpSetCheckinSchedule.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpSetCheckinSchedule.java @@ -33,7 +33,7 @@ public class WxCpSetCheckinSchedule implements Serializable { @Data - public static class Item implements Serializable{ + public static class Item implements Serializable { private static final long serialVersionUID = -918057757709951513L; @@ -44,7 +44,7 @@ public class WxCpSetCheckinSchedule implements Serializable { private String userid; /** - * 要设置的天日期,取值在1-31之间。联合yearmonth组成唯一日期 比如20201205 + * 要设置的天日期,取值在1-31之间。联合yearmonth组成唯一日期 比如20201205 */ @SerializedName("day") private Integer day; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpSpStatus.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpSpStatus.java index c3d8005f5..029b7c144 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpSpStatus.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpSpStatus.java @@ -46,9 +46,9 @@ public enum WxCpSpStatus { @SerializedName("10") ALREADY_PAY(10); - private Integer status; + private final Integer status; - private WxCpSpStatus(Integer status) { + WxCpSpStatus(Integer status) { this.status = status; } } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java index 23a874962..6ae69c189 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java @@ -131,10 +131,10 @@ public class ContentValue implements Serializable { * 关联审批单控件 */ @Data - public static class RelatedApproval implements Serializable{ + public static class RelatedApproval implements Serializable { private static final long serialVersionUID = 8629601623267510738L; /** - *关联审批单的模板名 + * 关联审批单的模板名 */ @SerializedName("template_names") private List templateNames; @@ -160,7 +160,7 @@ public class ContentValue implements Serializable { } @Data - public static class TemplateName implements Serializable{ + public static class TemplateName implements Serializable { private static final long serialVersionUID = 3152481506054355937L; private String text; private String lang; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateConfig.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateConfig.java index 54213d9d9..3bbb4b2cb 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateConfig.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateConfig.java @@ -14,6 +14,7 @@ import java.io.Serializable; * Contact-成员/部门; * Table-明细; * Attendance-假勤组件(请假、外出、出差、加班) + * * @author gyv12345@163.com */ @Data diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/control/TemplateTable.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/control/TemplateTable.java index 08cdd5d4e..1022e1662 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/control/TemplateTable.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/control/TemplateTable.java @@ -7,7 +7,6 @@ import java.io.Serializable; import java.util.List; /** - * * @author gyv12345@163.com */ @Data diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/EventBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/EventBuilder.java index 5e2ee481f..19dc5f38e 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/EventBuilder.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/EventBuilder.java @@ -86,7 +86,7 @@ public class EventBuilder extends BaseBuilder articles){ + public NewsBuilder articles(List articles) { this.articles = articles; return this; } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/UpdateButtonBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/UpdateButtonBuilder.java index d4dd4b04d..352abeb04 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/UpdateButtonBuilder.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/UpdateButtonBuilder.java @@ -1,6 +1,5 @@ package me.chanjar.weixin.cp.bean.outxmlbuilder; -import me.chanjar.weixin.cp.bean.message.WxCpXmlOutTaskCardMessage; import me.chanjar.weixin.cp.bean.message.WxCpXmlOutUpdateBtnMessage; /** diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/taskcard/TaskCardButton.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/taskcard/TaskCardButton.java index 4a7e3c00e..bff28c415 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/taskcard/TaskCardButton.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/taskcard/TaskCardButton.java @@ -1,12 +1,12 @@ package me.chanjar.weixin.cp.bean.taskcard; -import java.io.Serializable; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** *
  *  任务卡片按钮
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class TaskCardButton implements Serializable {
   private static final long serialVersionUID = -4301684507150486556L;
-  
+
   private String key;
   private String name;
   private String replaceName;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/CheckboxOption.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/CheckboxOption.java
index 2f6b5b1a9..8e76ca00b 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/CheckboxOption.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/CheckboxOption.java
@@ -5,12 +5,12 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 
 /**
  * 按钮列表,该字段可为空数组,但有数据的话需确认对应字段是否必填,列表长度不超过6
+ *
  * @author yzts
  * @date 2021/9/22
  */
@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class CheckboxOption  implements Serializable {
+public class CheckboxOption implements Serializable {
   private static final long serialVersionUID = 5405702239190050250L;
 
   /**
@@ -41,7 +41,7 @@ public class CheckboxOption  implements Serializable {
     JsonObject optionJson = new JsonObject();
     optionJson.addProperty("id", this.getId());
     optionJson.addProperty("text", this.getText());
-    if(null != this.getIs_checked()) {
+    if (null != this.getIs_checked()) {
       optionJson.addProperty("is_checked", this.getIs_checked());
     }
     return optionJson;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/HorizontalContent.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/HorizontalContent.java
index 4f1160e93..397420820 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/HorizontalContent.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/HorizontalContent.java
@@ -11,6 +11,7 @@ import java.io.Serializable;
 
 /**
  * 二级标题+文本列表,该字段可为空数组,但有数据的话需确认对应字段是否必填,列表长度不超过6
+ *
  * @author yzts
  * @date 2021/9/22
  */
@@ -46,7 +47,7 @@ public class HorizontalContent implements Serializable {
   public JsonObject toJson() {
     JsonObject hContentJson = new JsonObject();
 
-    if(null !=  this.getType()){
+    if (null != this.getType()) {
       hContentJson.addProperty("type", this.getType());
     }
     hContentJson.addProperty("keyname", this.getKeyname());
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/MultipleSelect.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/MultipleSelect.java
index 145a6c442..95ab92f3f 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/MultipleSelect.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/MultipleSelect.java
@@ -13,6 +13,7 @@ import java.util.List;
 
 /**
  * 下拉式的选择器列表,multiple_interaction类型的卡片该字段不可为空,一个消息最多支持 3 个选择器
+ *
  * @author yzts
  * @date 2021/9/22
  */
@@ -54,7 +55,7 @@ public class MultipleSelect implements Serializable {
     }
 // select_list
     List options = this.getOptions();
-    if(null != options && options.size() > 0) {
+    if (null != options && options.size() > 0) {
       JsonArray optionJsonArray = new JsonArray();
       for (CheckboxOption option : this.getOptions()) {
         JsonObject tempObject = option.toJson();
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/TemplateCardButton.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/TemplateCardButton.java
index 4ac9e005e..28722c8d7 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/TemplateCardButton.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/TemplateCardButton.java
@@ -5,12 +5,12 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 
 /**
  * 按钮列表,该字段可为空数组,但有数据的话需确认对应字段是否必填,列表长度不超过6
+ *
  * @author yzts
  * @date 2021/9/22
  */
@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TemplateCardButton  implements Serializable {
+public class TemplateCardButton implements Serializable {
   private static final long serialVersionUID = -4826551822490837002L;
 
   /**
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/TemplateCardJump.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/TemplateCardJump.java
index 6d297e9c0..79fd92ff9 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/TemplateCardJump.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/TemplateCardJump.java
@@ -11,6 +11,7 @@ import java.io.Serializable;
 
 /**
  * 跳转指引样式的列表,该字段可为空数组,但有数据的话需确认对应字段是否必填,列表长度不超过3
+ *
  * @author yzts
  * @date 2021/9/22
  */
@@ -45,7 +46,7 @@ public class TemplateCardJump implements Serializable {
   public JsonObject toJson() {
     JsonObject hContentJson = new JsonObject();
 
-    if(null !=  this.getType()){
+    if (null != this.getType()) {
       hContentJson.addProperty("type", this.getType());
     }
     hContentJson.addProperty("title", this.getTitle());
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/VerticalContent.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/VerticalContent.java
index 7d364ff10..2dc402184 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/VerticalContent.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/templatecard/VerticalContent.java
@@ -1,7 +1,6 @@
 package me.chanjar.weixin.cp.bean.templatecard;
 
 import com.google.gson.JsonObject;
-import kotlin.text.UStringsKt;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -12,6 +11,7 @@ import java.io.Serializable;
 
 /**
  * 卡片二级垂直内容,该字段可为空数组,但有数据的话需确认对应字段是否必填,列表长度不超过4
+ *
  * @author yzts
  * @date 2021/9/22
  */