build: release v0.4.02

* fix #179
* fix #180
* fix #181

Author: yanglbme

README.md

@@ -26,7 +26,7 @@ If you're using Maven, just add the following dependency in `pom.xml`.
 <dependency>
   <groupId>io.github.doocs</groupId>
   <artifactId>im-server-sdk-java</artifactId>
-  <version>0.4.01</version>
+  <version>0.4.02</version>
 </dependency>
 ```
 

README_CN.md

@@ -26,7 +26,7 @@
 <dependency>
   <groupId>io.github.doocs</groupId>
   <artifactId>im-server-sdk-java</artifactId>
-  <version>0.4.01</version>
+  <version>0.4.02</version>
 </dependency>
 ```
 

docs/guide/README.md

@@ -1,6 +1,6 @@
 # 介绍
 
-本文档基于腾讯云 IM Server SDK Java <Badge type="tip" text="v0.4.01" vertical="top" /> 编写。
+本文档基于腾讯云 IM Server SDK Java <Badge type="tip" text="v0.4.02" vertical="top" /> 编写。
 
 ## 前提条件
 

docs/guide/quickstart.md

@@ -10,14 +10,14 @@
 <dependency>
   <groupId>io.github.doocs</groupId>
   <artifactId>im-server-sdk-java</artifactId>
-  <version>0.4.01</version>
+  <version>0.4.02</version>
 </dependency>
 ```
 
 ### Gradle
 
 ```gradle
-implementation group: 'io.github.doocs', name: 'im-server-sdk-java', version: '0.4.01'
+implementation group: 'io.github.doocs', name: 'im-server-sdk-java', version: '0.4.02'
 ```
 
 ### 下载 JAR

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "qcloud-im-server-sdk-java",
-  "version": "0.4.01",
+  "version": "0.4.02",
   "description": "腾讯云 IM 服务端 SDK API 文档 Java 版",
   "main": "index.js",
   "scripts": {

package.json

@@ -6,7 +6,7 @@
 
     <groupId>io.github.doocs</groupId>
     <artifactId>im-server-sdk-java</artifactId>
-    <version>0.4.01</version>
+    <version>0.4.02</version>
     <packaging>jar</packaging>
 
     <name>qcloud-im-server-sdk-java</name>

pom.xml

@@ -3,6 +3,8 @@
 import io.github.doocs.im.util.VersionInfoUtil;
 import okhttp3.ConnectionPool;
 
+import java.util.Objects;
+
 /**
  * 客户端配置类
  *
@@ -163,6 +165,47 @@ public void setConnectionPool(ConnectionPool connectionPool) {
         this.connectionPool = connectionPool;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ClientConfiguration that = (ClientConfiguration) o;
+        if (maxRetries != that.maxRetries) {
+            return false;
+        }
+        if (connectTimeout != that.connectTimeout) {
+            return false;
+        }
+        if (readTimeout != that.readTimeout) {
+            return false;
+        }
+        if (writeTimeout != that.writeTimeout) {
+            return false;
+        }
+        if (callTimeout != that.callTimeout) {
+            return false;
+        }
+        if (expireTime != that.expireTime) {
+            return false;
+        }
+        if (autoRenewSig != that.autoRenewSig) {
+            return false;
+        }
+        if (!userAgent.equals(that.userAgent)) {
+            return false;
+        }
+        return connectionPool.equals(that.connectionPool);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(maxRetries, connectTimeout, readTimeout, writeTimeout, callTimeout, expireTime, autoRenewSig, userAgent, connectionPool);
+    }
 
     public static final class Builder {
         private int maxRetries = DEFAULT_MAX_RETRIES;

src/main/java/io/github/doocs/im/ClientConfiguration.java

@@ -24,23 +24,26 @@ public class GetMembersRequest extends GenericRequest implements Serializable {
      * 首次请求传0，当直播群中人数较多时，后台返回非0的 Timestamp 表示需要分页拉取，后续请求将 Timestamp 传回，直到后台返回0
      */
     @JsonProperty("Timestamp")
-    private Integer timestamp;
+    private Long timestamp;
+
+    /**
+     *  按某个标记过滤拉取用户列表
+     */
+    @JsonProperty("Mark")
+    private Long mark;
 
     public GetMembersRequest() {
     }
 
-    public GetMembersRequest(String groupId, Integer timestamp) {
+    public GetMembersRequest(String groupId, Long timestamp) {
         this.groupId = groupId;
         this.timestamp = timestamp;
     }
 
-    private GetMembersRequest(Builder builder) {
-        this.groupId = builder.groupId;
-        this.timestamp = builder.timestamp;
-    }
-
-    public static Builder builder() {
-        return new Builder();
+    public GetMembersRequest(String groupId, Long timestamp, Long mark) {
+        this.groupId = groupId;
+        this.timestamp = timestamp;
+        this.mark = mark;
     }
 
     public String getGroupId() {
@@ -51,34 +54,57 @@ public void setGroupId(String groupId) {
         this.groupId = groupId;
     }
 
-    public Integer getTimestamp() {
+    public Long getTimestamp() {
         return timestamp;
     }
 
-    public void setTimestamp(Integer timestamp) {
+    public void setTimestamp(Long timestamp) {
         this.timestamp = timestamp;
     }
 
+    public Long getMark() {
+        return mark;
+    }
+
+    public void setMark(Long mark) {
+        this.mark = mark;
+    }
+
+    private GetMembersRequest(Builder builder) {
+        this.groupId = builder.groupId;
+        this.timestamp = builder.timestamp;
+        this.mark = builder.mark;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
 
     public static final class Builder {
         private String groupId;
-        private Integer timestamp;
+        private Long timestamp;
+        private Long mark;
 
         private Builder() {
         }
 
         public GetMembersRequest build() {
             return new GetMembersRequest(this);
         }
-
         public Builder groupId(String groupId) {
             this.groupId = groupId;
             return this;
         }
 
-        public Builder timestamp(Integer timestamp) {
+        public Builder timestamp(Long timestamp) {
             this.timestamp = timestamp;
             return this;
         }
+
+        public Builder mark(Long mark) {
+            this.mark = mark;
+            return this;
+        }
     }
 }

src/main/java/io/github/doocs/im/model/request/GetMembersRequest.java

@@ -24,7 +24,7 @@ public class GetRecentContactListRequest extends GenericRequest implements Seria
      * 普通会话的起始时间，第一页填 0
      */
     @JsonProperty("TimeStamp")
-    private Integer timestamp;
+    private Long timestamp;
 
     /**
      * 普通会话的起始位置，第一页填 0
@@ -36,7 +36,7 @@ public class GetRecentContactListRequest extends GenericRequest implements Seria
      * 置顶会话的起始时间，第一页填 0
      */
     @JsonProperty("TopTimeStamp")
-    private Integer topTimestamp;
+    private Long topTimestamp;
 
     /**
      * 置顶会话的起始位置，第一页填 0
@@ -57,8 +57,8 @@ public class GetRecentContactListRequest extends GenericRequest implements Seria
     public GetRecentContactListRequest() {
     }
 
-    public GetRecentContactListRequest(String fromAccount, Integer timestamp, Integer startIndex,
-                                       Integer topTimestamp, Integer topStartIndex, Integer assistFlags) {
+    public GetRecentContactListRequest(String fromAccount, Long timestamp, Integer startIndex,
+                                       Long topTimestamp, Integer topStartIndex, Integer assistFlags) {
         this.fromAccount = fromAccount;
         this.timestamp = timestamp;
         this.startIndex = startIndex;
@@ -88,11 +88,11 @@ public void setFromAccount(String fromAccount) {
         this.fromAccount = fromAccount;
     }
 
-    public Integer getTimestamp() {
+    public Long getTimestamp() {
         return timestamp;
     }
 
-    public void setTimestamp(Integer timestamp) {
+    public void setTimestamp(Long timestamp) {
         this.timestamp = timestamp;
     }
 
@@ -104,11 +104,11 @@ public void setStartIndex(Integer startIndex) {
         this.startIndex = startIndex;
     }
 
-    public Integer getTopTimestamp() {
+    public Long getTopTimestamp() {
         return topTimestamp;
     }
 
-    public void setTopTimestamp(Integer topTimestamp) {
+    public void setTopTimestamp(Long topTimestamp) {
         this.topTimestamp = topTimestamp;
     }
 
@@ -131,9 +131,9 @@ public void setAssistFlags(Integer assistFlags) {
 
     public static final class Builder {
         private String fromAccount;
-        private Integer timestamp;
+        private Long timestamp;
         private Integer startIndex;
-        private Integer topTimestamp;
+        private Long topTimestamp;
         private Integer topStartIndex;
         private Integer assistFlags;
 
@@ -149,7 +149,7 @@ public Builder fromAccount(String fromAccount) {
             return this;
         }
 
-        public Builder timestamp(Integer timestamp) {
+        public Builder timestamp(Long timestamp) {
             this.timestamp = timestamp;
             return this;
         }
@@ -159,7 +159,7 @@ public Builder startIndex(Integer startIndex) {
             return this;
         }
 
-        public Builder topTimestamp(Integer topTimestamp) {
+        public Builder topTimestamp(Long topTimestamp) {
             this.topTimestamp = topTimestamp;
             return this;
         }