Merge branch 'v4.0.8' into 'master'

feat: enable auto publishing, add user list pagination & deletion APIs, fix group join param, add owner field.

See merge request public-server/server-sdk-java!29

Author: rongljz

README-CN.md

@@ -11,12 +11,12 @@ RongCloud IM Server SDK in Java.
     <dependency>
         <groupId>cn.rongcloud.im</groupId>
         <artifactId>server-sdk-java</artifactId>
-        <version>4.0.7</version>
+        <version>4.0.8</version>
     </dependency>
 ```
    * Gradle
 ```
-    compile group: 'cn.rongcloud.im', name: 'server-sdk-java', version: '4.0.7'
+    compile group: 'cn.rongcloud.im', name: 'server-sdk-java', version: '4.0.8'
    
 ```
    * 基于源码 Meavn 打包构建

README.md

@@ -10,12 +10,12 @@ RongCloud IM Server SDK in Java.
     <dependency>
         <groupId>cn.rongcloud.im</groupId>
         <artifactId>server-sdk-java</artifactId>
-        <version>4.0.7</version>
+        <version>4.0.8</version>
     </dependency>
 ```
 * Gradle
 ```
-    compile group: 'cn.rongcloud.im', name: 'server-sdk-java', version: '4.0.7'
+    compile group: 'cn.rongcloud.im', name: 'server-sdk-java', version: '4.0.8'
 ```
 * Build from source
 ```

Server SDK Supported Feature Version List.md

@@ -10,6 +10,8 @@
 |                                                                                                                | deactivate                                    | User deactivation                                                                                                                                                                        | 3.3.2                     |
 |                                                                                                                | reactivate                                    | Reactivate user ID                                                                                                                                                                       | 3.3.5                     |
 |                                                                                                                | deactivateList                                | Query deactivated users                                                                                                                                                                  | 3.3.2                     |
+|                                                                                                                | querySandBoxUsers                                | Query development environment user list                                                                                                                                                           | 4.0.8                     |
+|                                                                                                                | deleteSandBoxUsers                                | Delete development environment users                                                                                                                                                                | 4.0.8                     |
 | [Check User Online Status](./src/main/java/io/rong/methods/user/onlinestatus/OnlineStatus.java)                | onlinestatus.check                            | Check user online status                                                                                                                                                                 | 3.0.1                     |
 | [Blocklist](./src/main/java/io/rong/methods/user/blacklist/Blacklist.java)                                     | blacklist.add                                 | Add to blocklist                                                                                                                                                                         | 3.0.1                     |
 |                                                                                                                | blacklist.getList                             | Get blocklist                                                                                                                                                                            | 3.0.1                     |

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cn.rongcloud.im</groupId>
     <artifactId>server-sdk-java</artifactId>
-    <version>4.0.7</version>
+    <version>4.0.8</version>
     <packaging>jar</packaging>
     <name>RongCloud IM Server SDK</name>
     <description>
@@ -158,7 +158,7 @@
                         <extensions>true</extensions>
                         <configuration>
                             <publishingServerId>ossrh</publishingServerId>
-                            <autoPublish>false</autoPublish>
+                            <autoPublish>true</autoPublish>
                         </configuration>
                     </plugin>
                 </plugins>

src/main/java/io/rong/example/group/GroupExample.java

@@ -118,8 +118,7 @@ public static void main(String[] args) throws Exception {
          */
         group = new GroupModel()
                 .setId("groupId")
-                .setMembers(members)
-                .setName("groupName");
+                .setMembers(members);
         OperationGroupResult groupJoinResult =  Group.join(group);
         System.out.println("join:  " + groupJoinResult.toString());
 

src/main/java/io/rong/methods/group/Group.java

@@ -177,7 +177,9 @@ public Result invite(GroupModel group) throws Exception {
         }
 
         sb.append("&groupId=").append(URLEncoder.encode(group.getId().toString(), UTF8));
-        sb.append("&groupName=").append(URLEncoder.encode(group.getName().toString(), UTF8));
+        if(group.getName() != null){
+            sb.append("&groupName=").append(URLEncoder.encode(group.getName().toString(), UTF8));
+        }
         String body = sb.toString();
         if (body.indexOf("&") == 0) {
             body = body.substring(1, body.length());
@@ -210,7 +212,9 @@ public OperationGroupResult join(GroupModel group) throws Exception {
         }
 
         sb.append("&groupId=").append(URLEncoder.encode(group.getId().toString(), UTF8));
-        sb.append("&groupName=").append(URLEncoder.encode(group.getName().toString(), UTF8));
+        if(group.getName()!= null){
+            sb.append("&groupName=").append(URLEncoder.encode(group.getName().toString(), UTF8));
+        }
         sb = operateGroup(sb, group);
         String body = sb.toString();
         if (body.indexOf("&") == 0) {

src/main/java/io/rong/methods/user/User.java

@@ -2,6 +2,7 @@
 
 import com.google.gson.JsonParseException;
 import io.rong.RongCloud;
+import io.rong.methods.BaseMethod;
 import io.rong.methods.user.blacklist.Blacklist;
 import io.rong.methods.user.block.Block;
 import io.rong.methods.user.blockpushperiod.BlockPushPeriod;
@@ -22,17 +23,16 @@
 import java.net.URLEncoder;
 
 import com.alibaba.fastjson.JSONException;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**
  * User Service
  **/
-public class User {
+public class User extends BaseMethod {
 
     private static final String UTF8 = "UTF-8";
     private static final String PATH = "user";
-    private String appKey;
-    private String appSecret;
     public Block block;
     public Blacklist blackList;
     public Whitelist whiteList;
@@ -43,14 +43,10 @@ public class User {
     public MuteGroups muteGroups;
     public Ban ban;
     public BlockPushPeriod blockPushPeriod;
-    private RongCloud rongCloud;
 
-    public RongCloud getRongCloud() {
-        return rongCloud;
-    }
-
-    public void setRongCloud(RongCloud rongCloud) {
-        this.rongCloud = rongCloud;
+    @Override
+    protected void initPath() {
+        super.path = PATH;
     }
 
     public User(String appKey, String appSecret, RongCloud rongCloud) {
@@ -67,6 +63,7 @@ public User(String appKey, String appSecret, RongCloud rongCloud) {
         this.ban = new Ban(appKey, appSecret, rongCloud);
         this.remark = new Remark(appKey, appSecret, rongCloud);
         this.blockPushPeriod = new BlockPushPeriod(appKey, appSecret, rongCloud);
+        initPath();
     }
 
     /**
@@ -343,4 +340,22 @@ public Result expire(ExpireModel user) throws Exception {
         return result;
     }
 
+
+    public QueryUsersResult querySandBoxUsers(Integer page, Integer pageSize, Integer order) throws Exception {
+        StringBuilder sb = new StringBuilder();
+        addFormParam(sb, "page=", page);
+        addFormParam(sb, "&pageSize=", pageSize);
+        addFormParam(sb, "&order=", order);
+        String body = sb.toString();
+        return doRequest("/user/query.json", body, CheckMethod.GET, QueryUsersResult.class);
+    }
+
+    public  ResponseResult deleteSandBoxUsers(String... userIds) throws Exception {
+        StringBuilder sb = new StringBuilder();
+        addFormParam(sb, "&userId=",StringUtils.join(removeDuplicates(userIds), ","));
+        String body = sb.toString();
+        return doRequest("/user/delusers.json", body, CheckMethod.GET, ResponseResult.class);
+    }
+
+
 }

src/main/java/io/rong/models/response/EntrustGroupProfile.java

@@ -15,6 +15,7 @@ public class EntrustGroupProfile {
     private Long joinTime;
     private Integer role;
     private Integer count;
+    private String owner;
 
     public String getGroupId() {
         return groupId;
@@ -97,4 +98,12 @@ public Integer getCount() {
     public void setCount(Integer count) {
         this.count = count;
     }
+
+    public String getOwner() {
+        return owner;
+    }
+
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
 }

src/main/java/io/rong/models/response/QueryUsersResult.java

@@ -0,0 +1,92 @@
+package io.rong.models.response;
+
+import io.rong.util.GsonUtil;
+
+import java.util.List;
+
+public class QueryUsersResult extends ResponseResult {
+
+    /**
+     * Total number of users.
+     */
+    private Integer total;
+    /**
+     * Blocklist user list
+     */
+    private List<UserInfo> users;
+
+    public QueryUsersResult(Integer code, String msg) {
+        super(code, msg);
+    }
+
+
+    @Override
+    public String toString() {
+        return GsonUtil.toJson(this, QueryUsersResult.class);
+    }
+
+    public List<UserInfo> getUsers() {
+        return users;
+    }
+
+    public void setUsers(List<UserInfo> users) {
+        this.users = users;
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public static class UserInfo {
+        private String userId;
+        private String userName;
+        private String userPortrait;
+        private String regTime;
+
+        public String getUserId() {
+            return userId;
+        }
+
+        public void setUserId(String userId) {
+            this.userId = userId;
+        }
+
+        public String getUserName() {
+            return userName;
+        }
+
+        public void setUserName(String userName) {
+            this.userName = userName;
+        }
+
+        public String getUserPortrait() {
+            return userPortrait;
+        }
+
+        public void setUserPortrait(String userPortrait) {
+            this.userPortrait = userPortrait;
+        }
+
+        public String getRegTime() {
+            return regTime;
+        }
+
+        public void setRegTime(String regTime) {
+            this.regTime = regTime;
+        }
+    }
+
+
+}

src/test/java/io/rong/example/Example.java

@@ -55,6 +55,28 @@ public void setUp() throws Exception {
         rongCloud = RongCloud.getInstance(appKey, appSecret, CenterEnum.BJ);
     }
 
+    /**
+     * Paginate query user
+     */
+    @Test
+    public void testQueryUserList() throws Exception {
+        QueryUsersResult result = rongCloud.user.querySandBoxUsers(1,null, null);
+        System.out.println("testQueryUserList:  " + result.toString());
+    }
+
+
+
+    /**
+     * delete users
+     */
+    @Test
+    public void testDeleteUsers() throws Exception {
+        ResponseResult result = rongCloud.user.deleteSandBoxUsers("13100000294","13100000292");
+        System.out.println("testDeleteUsers:  " + result.toString());
+    }
+
+
+
 
     /**
      * Paginate query user allowlist