Merge remote-tracking branch 'origin/dev' into dev

Author: MilletBo

README.md

@@ -25,7 +25,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.15</version>
+  <version>0.4.18</version>
 </dependency>
 ```
 

README_CN.md

@@ -25,7 +25,7 @@ https://im.doocs.org
 <dependency>
   <groupId>io.github.doocs</groupId>
   <artifactId>im-server-sdk-java</artifactId>
-  <version>0.4.15</version>
+  <version>0.4.18</version>
 </dependency>
 ```
 

docs/guide/intro.md

@@ -1,6 +1,6 @@
 # 介绍
 
-本文档基于腾讯云 IM Server SDK Java <Badge type="tip" text="v0.4.15" vertical="top" /> 编写。
+本文档基于腾讯云 IM Server SDK Java <Badge type="tip" text="v0.4.18" 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.15</version>
+  <version>0.4.18</version>
 </dependency>
 ```
 
 ### Gradle
 
 ```txt
-implementation group: 'io.github.doocs', name: 'im-server-sdk-java', version: '0.4.15'
+implementation group: 'io.github.doocs', name: 'im-server-sdk-java', version: '0.4.18'
 ```
 
 ### 下载 JAR

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "qcloud-im-server-sdk-java",
-  "version": "0.4.15",
+  "version": "0.4.18",
   "description": "腾讯云 IM 服务端 SDK API 文档 Java 版",
   "scripts": {
     "docs:dev": "vitepress dev docs",
@@ -18,6 +18,6 @@
   },
   "homepage": "https://github.com/doocs/qcloud-im-server-sdk-java#readme",
   "devDependencies": {
-    "vitepress": "^1.6.3"
+    "vitepress": "^2.0.0-alpha.6"
   }
 }

package.json

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

pom.xml

@@ -70,6 +70,23 @@ public MultiAccountImportResult multiAccountImport(MultiAccountImportRequest mul
         return HttpUtil.post(url, multiAccountImportRequest, MultiAccountImportResult.class, imClient.getConfig());
     }
 
+    /**
+     * 导入多个账号（新版本，支持昵称和头像）
+     *
+     * @param multiAccountImportNewRequest 请求参数
+     * @return 结果
+     * @throws IOException 异常
+     */
+    public MultiAccountImportResult multiAccountImportNew(MultiAccountImportNewRequest multiAccountImportNewRequest) throws IOException {
+        String url = imClient.getUrl(SERVICE_NAME, MULTI_ACCOUNT_IMPORT_COMMAND);
+        return HttpUtil.post(url, multiAccountImportNewRequest, MultiAccountImportResult.class, imClient.getConfig());
+    }
+
+    public MultiAccountImportResult multiAccountImportNew(MultiAccountImportNewRequest multiAccountImportNewRequest, long random) throws IOException {
+        String url = imClient.getUrl(SERVICE_NAME, MULTI_ACCOUNT_IMPORT_COMMAND, random);
+        return HttpUtil.post(url, multiAccountImportNewRequest, MultiAccountImportResult.class, imClient.getConfig());
+    }
+
     /**
      * 删除账号
      *

src/main/java/io/github/doocs/im/core/Account.java

@@ -0,0 +1,63 @@
+package io.github.doocs.im.model.request;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 导入多个账号-请求参数
+ * 
+ * @author dileex
+ * @since 2024/12/19
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class MultiAccountImportNewRequest extends GenericRequest implements Serializable {
+    private static final long serialVersionUID = 1096507781689811276L;
+
+    /**
+     * 待导入的用户列表，单次最多导入100个用户
+     */
+    @JsonProperty("AccountList")
+    private List<AccountImportRequest> accountList;
+
+    public MultiAccountImportNewRequest() {
+    }
+
+    public MultiAccountImportNewRequest(List<AccountImportRequest> accountList) {
+        this.accountList = accountList;
+    }
+
+    private MultiAccountImportNewRequest(Builder builder) {
+        this.accountList = builder.accountList;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public List<AccountImportRequest> getAccountList() {
+        return accountList;
+    }
+
+    public void setAccountList(List<AccountImportRequest> accountList) {
+        this.accountList = accountList;
+    }
+
+    public static final class Builder {
+        private List<AccountImportRequest> accountList;
+
+        private Builder() {
+        }
+
+        public MultiAccountImportNewRequest build() {
+            return new MultiAccountImportNewRequest(this);
+        }
+
+        public Builder accountList(List<AccountImportRequest> accountList) {
+            this.accountList = accountList;
+            return this;
+        }
+    }
+}

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

@@ -93,7 +93,7 @@ public class SendGroupMsgRequest extends GenericRequest implements Serializable
      * 支持群类型 Private、Public、ChatRoom
      */
     @JsonProperty("To_Account")
-    private String toAccount;
+    private List<String> toAccount;
 
     /**
      * 话题的 ID，仅社群支持此选项
@@ -125,7 +125,7 @@ public SendGroupMsgRequest(String groupId, Long random, List<TIMMsgElement> msgB
     public SendGroupMsgRequest(String groupId, Long random, String msgPriority, List<TIMMsgElement> msgBody,
                                String fromAccount, OfflinePushInfo offlinePushInfo, List<String> forbidCallbackControl,
                                Integer onlineOnlyFlag, List<String> sendMsgControl, String cloudCustomData,
-                               Integer supportMessageExtension, String toAccount, String topicId) {
+                               Integer supportMessageExtension, List<String> toAccount, String topicId) {
         this.groupId = groupId;
         this.random = random;
         this.msgPriority = msgPriority;
@@ -141,7 +141,7 @@ public SendGroupMsgRequest(String groupId, Long random, String msgPriority, List
         this.topicId = topicId;
     }
 
-    public SendGroupMsgRequest(String groupId, Long random, String msgPriority, List<TIMMsgElement> msgBody, String fromAccount, OfflinePushInfo offlinePushInfo, List<String> forbidCallbackControl, Integer onlineOnlyFlag, List<String> sendMsgControl, String cloudCustomData, Integer supportMessageExtension, String toAccount, String topicId, Integer needReadReceipt, List<GroupAtInfo> groupAtInfos) {
+    public SendGroupMsgRequest(String groupId, Long random, String msgPriority, List<TIMMsgElement> msgBody, String fromAccount, OfflinePushInfo offlinePushInfo, List<String> forbidCallbackControl, Integer onlineOnlyFlag, List<String> sendMsgControl, String cloudCustomData, Integer supportMessageExtension, List<String> toAccount, String topicId, Integer needReadReceipt, List<GroupAtInfo> groupAtInfos) {
         this.groupId = groupId;
         this.random = random;
         this.msgPriority = msgPriority;
@@ -269,11 +269,11 @@ public void setSupportMessageExtension(Integer supportMessageExtension) {
         this.supportMessageExtension = supportMessageExtension;
     }
 
-    public String getToAccount() {
+    public List<String> getToAccount() {
         return toAccount;
     }
 
-    public void setToAccount(String toAccount) {
+    public void setToAccount(List<String> toAccount) {
         this.toAccount = toAccount;
     }
 
@@ -314,7 +314,7 @@ public static final class Builder {
         private List<String> sendMsgControl;
         private String cloudCustomData;
         private Integer supportMessageExtension;
-        private String toAccount;
+        private List<String> toAccount;
         private String topicId;
         private Integer needReadReceipt;
 
@@ -385,7 +385,7 @@ public Builder supportMessageExtension(Integer supportMessageExtension) {
             return this;
         }
 
-        public Builder toAccount(String toAccount) {
+        public Builder toAccount(List<String> toAccount) {
             this.toAccount = toAccount;
             return this;
         }