Skip to content

W
wecloud_im_server
Commit b66f10a0 by Shadow
Options

添加好友增加是否需要验证参数，如果不需要，则自动成为好友

parent 56db439e
Showing with 70 additions and 2 deletions
core/src/main/java/com/wecloud/im/friend/controller/ImFriendController.java
...@@ -131,6 +131,9 @@ public class ImFriendController extends BaseController { ...@@ -131,6 +131,9 @@ public class ImFriendController extends BaseController {
return ApiResult.fail(ApiCode.PARAMETER_EXCEPTION, null); return ApiResult.fail(ApiCode.PARAMETER_EXCEPTION, null);
} }
imFriendService.applyFriend(currentClient, friendClient, param.getFriendName(), param.getRequestRemark()); imFriendService.applyFriend(currentClient, friendClient, param.getFriendName(), param.getRequestRemark());
if (!param.getNeedVerify()) {
imFriendService.approveFriend(currentClient, friendClient, true, "");
}
log.info("申请添加好友逻辑完成"); log.info("申请添加好友逻辑完成");
return ApiResult.ok(); return ApiResult.ok();
} }
......
core/src/main/java/com/wecloud/im/friend/param/ImFriendApplyParam.java
...@@ -20,4 +20,7 @@ public class ImFriendApplyParam extends ImFriendBaseParam { ...@@ -20,4 +20,7 @@ public class ImFriendApplyParam extends ImFriendBaseParam {
@ApiModelProperty("请求备注") @ApiModelProperty("请求备注")
private String requestRemark; private String requestRemark;
@ApiModelProperty("是否需要验证")
private Boolean needVerify = true;
} }
core/src/main/java/com/wecloud/im/service/impl/ImConversationMembersServiceImpl.java
...@@ -319,7 +319,12 @@ public class ImConversationMembersServiceImpl extends BaseServiceImpl<ImConversa ...@@ -319,7 +319,12 @@ public class ImConversationMembersServiceImpl extends BaseServiceImpl<ImConversa
ImClient initiator = imClientService.getCacheImClient(appId, param.getClientId()); ImClient initiator = imClientService.getCacheImClient(appId, param.getClientId());
ImClient recipient = imClientService.getCacheImClient(appId, param.getFriendClientId()); ImClient recipient = imClientService.getCacheImClient(appId, param.getFriendClientId());
return imFriendService.applyFriend(initiator, recipient, param.getFriendName(), imFriendService.applyFriend(initiator, recipient, param.getFriendName(),
param.getRequestRemark()); param.getRequestRemark());
if (!param.getNeedVerify()) {
imFriendService.approveFriend(initiator, recipient, true, "");
}
return true;
} }
} }
im-sdk/src/main/java/com/wecloud/im/sdk/WecloudIm.java
...@@ -124,6 +124,19 @@ public interface WecloudIm { ...@@ -124,6 +124,19 @@ public interface WecloudIm {
Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark); Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark);
/** /**
* 好友申请
* @Author luozh
* @Date 2022年04月28日 02:05:11
* @param userId 用户id
* @param friendId 好友id
* @param friendName 备注好友名称
* @param requestRemark 请求备注
* @param needVerify 是否需要验证，如果为false，则不需要对方同意即可成为好友
* @Return
*/
Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark, Boolean needVerify);
/**
* 删除好友 * 删除好友
* @Author luozh * @Author luozh
* @Date 2022年05月16日 10:14:07 * @Date 2022年05月16日 10:14:07
...@@ -231,6 +244,21 @@ public interface WecloudIm { ...@@ -231,6 +244,21 @@ public interface WecloudIm {
String requestRemark); String requestRemark);
/** /**
* 群成员好友申请
* @Author Shadow
* @Date 2022年06月07日 04:47:26
* @param conversationId
* @param userId
* @param friendId
* @param friendName
* @param requestRemark
* @param needVerify
* @Return
*/
Boolean groupMembersFriendRequest(Long conversationId, String userId, String friendId, String friendName,
String requestRemark, Boolean needVerify);
/**
* 全量获取聊天室成员 * 全量获取聊天室成员
* @param chatRoomId 聊天室id * @param chatRoomId 聊天室id
* @return * @return
......
im-sdk/src/main/java/com/wecloud/im/sdk/WecloudImClient.java
...@@ -144,7 +144,14 @@ public class WecloudImClient implements WecloudIm { ...@@ -144,7 +144,14 @@ public class WecloudImClient implements WecloudIm {
@Override @Override
public Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark) { public Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark) {
FriendRequestRequest friendRequestRequest = FriendRequestRequest friendRequestRequest =
FriendRequestRequest.builder().userId(userId).friendId(friendId).friendName(friendName).requestRemark(requestRemark).build(); FriendRequestRequest.builder().userId(userId).friendId(friendId).friendName(friendName).requestRemark(requestRemark).needVerify(true).build();
return imContactsOperation.friendRequest(friendRequestRequest);
}
@Override
public Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark, Boolean needVerify) {
FriendRequestRequest friendRequestRequest =
FriendRequestRequest.builder().userId(userId).friendId(friendId).friendName(friendName).requestRemark(requestRemark).needVerify(needVerify).build();
return imContactsOperation.friendRequest(friendRequestRequest); return imContactsOperation.friendRequest(friendRequestRequest);
} }
...@@ -155,6 +162,19 @@ public class WecloudImClient implements WecloudIm { ...@@ -155,6 +162,19 @@ public class WecloudImClient implements WecloudIm {
.userId(userId).friendId(friendId) .userId(userId).friendId(friendId)
.friendName(friendName) .friendName(friendName)
.requestRemark(requestRemark) .requestRemark(requestRemark)
.needVerify(true)
.build();
return imContactsOperation.groupMembersFriendRequest(groupMembersFriendRequestRequest);
}
@Override
public Boolean groupMembersFriendRequest(Long conversationId, String userId, String friendId, String friendName, String requestRemark, Boolean needVerify) {
GroupMembersFriendRequestRequest groupMembersFriendRequestRequest =
GroupMembersFriendRequestRequest.builder().conversationId(conversationId)
.userId(userId).friendId(friendId)
.friendName(friendName)
.requestRemark(requestRemark)
.needVerify(needVerify)
.build(); .build();
return imContactsOperation.groupMembersFriendRequest(groupMembersFriendRequestRequest); return imContactsOperation.groupMembersFriendRequest(groupMembersFriendRequestRequest);
} }
......
im-sdk/src/main/java/com/wecloud/im/sdk/internal/WecloudImContactsOperation.java
...@@ -115,6 +115,7 @@ public class WecloudImContactsOperation extends WecloudImOperation { ...@@ -115,6 +115,7 @@ public class WecloudImContactsOperation extends WecloudImOperation {
param.put("friendClientId", friendId + ""); param.put("friendClientId", friendId + "");
param.put("friendName", Optional.ofNullable(friendRequestRequest.getFriendName()).orElse("")); param.put("friendName", Optional.ofNullable(friendRequestRequest.getFriendName()).orElse(""));
param.put("requestRemark", Optional.ofNullable(friendRequestRequest.getRequestRemark()).orElse("")); param.put("requestRemark", Optional.ofNullable(friendRequestRequest.getRequestRemark()).orElse(""));
param.put("needVerify", friendRequestRequest.getNeedVerify());
// 发送请求 // 发送请求
RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(FRIEND_REQUEST) RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(FRIEND_REQUEST)
.setMethod(HttpMethod.POST).setParameters(param) .setMethod(HttpMethod.POST).setParameters(param)
...@@ -146,6 +147,7 @@ public class WecloudImContactsOperation extends WecloudImOperation { ...@@ -146,6 +147,7 @@ public class WecloudImContactsOperation extends WecloudImOperation {
param.put("friendClientId", friendId + ""); param.put("friendClientId", friendId + "");
param.put("friendName", Optional.ofNullable(groupMembersFriendRequestRequest.getFriendName()).orElse("")); param.put("friendName", Optional.ofNullable(groupMembersFriendRequestRequest.getFriendName()).orElse(""));
param.put("requestRemark", Optional.ofNullable(groupMembersFriendRequestRequest.getRequestRemark()).orElse("")); param.put("requestRemark", Optional.ofNullable(groupMembersFriendRequestRequest.getRequestRemark()).orElse(""));
param.put("needVerify", groupMembersFriendRequestRequest.getNeedVerify());
// 发送请求 // 发送请求
RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(GROUP_MEMBERS_FRIEND_REQUEST) RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(GROUP_MEMBERS_FRIEND_REQUEST)
.setMethod(HttpMethod.POST).setParameters(param) .setMethod(HttpMethod.POST).setParameters(param)
......
im-sdk/src/main/java/com/wecloud/im/sdk/model/FriendRequestRequest.java
...@@ -35,4 +35,9 @@ public class FriendRequestRequest extends WebServiceRequest { ...@@ -35,4 +35,9 @@ public class FriendRequestRequest extends WebServiceRequest {
*/ */
private String requestRemark; private String requestRemark;
/**
* 是否需要验证
*/
private Boolean needVerify;
} }
im-sdk/src/main/java/com/wecloud/im/sdk/model/GroupMembersFriendRequestRequest.java
...@@ -40,4 +40,6 @@ public class GroupMembersFriendRequestRequest extends WebServiceRequest { ...@@ -40,4 +40,6 @@ public class GroupMembersFriendRequestRequest extends WebServiceRequest {
*/ */
private String requestRemark; private String requestRemark;
private Boolean needVerify;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment