Skip to content

W
wecloud_im_server
Commit e0cc1db3 by 南千昊
Options

限制好友sdk层修改

parent 41a5ce1b
Showing with 22 additions and 32 deletions
core/src/main/java/com/wecloud/im/friend/controller/ImFriendController.java
...@@ -88,7 +88,7 @@ public class ImFriendController extends BaseController { ...@@ -88,7 +88,7 @@ public class ImFriendController extends BaseController {
if (currentClient.getId().equals(friendClient.getId())) { if (currentClient.getId().equals(friendClient.getId())) {
return ApiResult.fail(ApiCode.PARAMETER_EXCEPTION, null); return ApiResult.fail(ApiCode.PARAMETER_EXCEPTION, null);
} }
if (param.getAddFriendScene().getCode()==1){ if (param.getAddFriendScene().equals("STRANGER")){
List<ImFriendBaseDto> friends = imFriendService.getFriends(currentClient); List<ImFriendBaseDto> friends = imFriendService.getFriends(currentClient);
if (isVip){ if (isVip){
// 是vip // 是vip
...@@ -130,6 +130,7 @@ public class ImFriendController extends BaseController { ...@@ -130,6 +130,7 @@ public class ImFriendController extends BaseController {
return ApiResult.fail(ApiCode.PARAMETER_EXCEPTION, null); return ApiResult.fail(ApiCode.PARAMETER_EXCEPTION, null);
} }
Boolean isVip = getIsVip(currentClient); Boolean isVip = getIsVip(currentClient);
if (param.getAddFriendScene().equals("STRANGER")){
List<ImFriendBaseDto> friends = imFriendService.getFriends(currentClient); List<ImFriendBaseDto> friends = imFriendService.getFriends(currentClient);
if (isVip){ if (isVip){
// 是vip // 是vip
...@@ -142,6 +143,7 @@ public class ImFriendController extends BaseController { ...@@ -142,6 +143,7 @@ public class ImFriendController extends BaseController {
throw new BusinessException("非vip最多只能加3个好友"); throw new BusinessException("非vip最多只能加3个好友");
} }
} }
}
imFriendService.applyFriend(currentClient, friendClient, param.getFriendName(), param.getRequestRemark()); imFriendService.applyFriend(currentClient, friendClient, param.getFriendName(), param.getRequestRemark());
if (!param.getNeedVerify()) { if (!param.getNeedVerify()) {
imFriendService.approveFriend(friendClient, currentClient, true, ""); imFriendService.approveFriend(friendClient, currentClient, true, "");
......
core/src/main/java/com/wecloud/im/friend/param/ImFriendApplyParam.java
package com.wecloud.im.friend.param; package com.wecloud.im.friend.param;
import com.wecloud.im.friend.enums.AddFriendSceneEnum;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -26,5 +25,5 @@ public class ImFriendApplyParam extends ImFriendBaseParam { ...@@ -26,5 +25,5 @@ public class ImFriendApplyParam extends ImFriendBaseParam {
private Boolean needVerify = true; private Boolean needVerify = true;
@ApiModelProperty("加好友入口场景") @ApiModelProperty("加好友入口场景")
private AddFriendSceneEnum addFriendScene; private String addFriendScene;
} }
im-sdk/src/main/java/com/wecloud/im/sdk/WecloudIm.java
...@@ -104,7 +104,7 @@ public interface WecloudIm { ...@@ -104,7 +104,7 @@ public interface WecloudIm {
* @param requestRemark 请求备注 * @param requestRemark 请求备注
* @Return * @Return
*/ */
Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark); Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark,String addFriendScene);
/** /**
* 好友申请 * 好友申请
...@@ -117,7 +117,7 @@ public interface WecloudIm { ...@@ -117,7 +117,7 @@ public interface WecloudIm {
* @param needVerify 是否需要验证，如果为false，则不需要对方同意即可成为好友 * @param needVerify 是否需要验证，如果为false，则不需要对方同意即可成为好友
* @Return * @Return
*/ */
Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark, Boolean needVerify); Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark, Boolean needVerify,String addFriendScene);
/** /**
* 删除好友 * 删除好友
......
im-sdk/src/main/java/com/wecloud/im/sdk/WecloudImClient.java
...@@ -135,16 +135,16 @@ public class WecloudImClient implements WecloudIm { ...@@ -135,16 +135,16 @@ 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,String addFriendScene) {
FriendRequestRequest friendRequestRequest = FriendRequestRequest friendRequestRequest =
FriendRequestRequest.builder().userId(userId).friendId(friendId).friendName(friendName).requestRemark(requestRemark).needVerify(true).build(); FriendRequestRequest.builder().userId(userId).friendId(friendId).friendName(friendName).requestRemark(requestRemark).needVerify(true).addFriendScene(addFriendScene).build();
return imContactsOperation.friendRequest(friendRequestRequest); return imContactsOperation.friendRequest(friendRequestRequest);
} }
@Override @Override
public Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark, Boolean needVerify) { public Boolean friendRequest(String userId, String friendId, String friendName, String requestRemark, Boolean needVerify,String addFriendScene) {
FriendRequestRequest friendRequestRequest = FriendRequestRequest friendRequestRequest =
FriendRequestRequest.builder().userId(userId).friendId(friendId).friendName(friendName).requestRemark(requestRemark).needVerify(needVerify).build(); FriendRequestRequest.builder().userId(userId).friendId(friendId).friendName(friendName).requestRemark(requestRemark).needVerify(needVerify).addFriendScene(addFriendScene).build();
return imContactsOperation.friendRequest(friendRequestRequest); return imContactsOperation.friendRequest(friendRequestRequest);
} }
......
im-sdk/src/main/java/com/wecloud/im/sdk/internal/WecloudImContactsOperation.java
package com.wecloud.im.sdk.internal; package com.wecloud.im.sdk.internal;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.wecloud.im.sdk.common.HttpMethod;
import com.wecloud.im.sdk.common.RequestMessage;
import com.wecloud.im.sdk.model.*;
import java.net.URL; import java.net.URL;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import com.alibaba.fastjson.JSON; import static com.wecloud.im.sdk.ResourcePathConstants.*;
import com.alibaba.fastjson.TypeReference;
import com.wecloud.im.sdk.common.HttpMethod;
import com.wecloud.im.sdk.common.RequestMessage;
import com.wecloud.im.sdk.model.Blacklist;
import com.wecloud.im.sdk.model.Friend;
import com.wecloud.im.sdk.model.FriendRequestRequest;
import com.wecloud.im.sdk.model.GetFriendsRequest;
import com.wecloud.im.sdk.model.GetUnsureFriendsRequest;
import com.wecloud.im.sdk.model.GroupMembersFriendRequestRequest;
import com.wecloud.im.sdk.model.PageBlacklistRequest;
import com.wecloud.im.sdk.model.PageResult;
import com.wecloud.im.sdk.model.RemarkFriendRequest;
import com.wecloud.im.sdk.model.UnfriendRequest;
import com.wecloud.im.sdk.model.UnsureFriend;
import static com.wecloud.im.sdk.ResourcePathConstants.FRIEND_REQUEST;
import static com.wecloud.im.sdk.ResourcePathConstants.GET_FRIENDS;
import static com.wecloud.im.sdk.ResourcePathConstants.GET_UNSURE_FRIENDS;
import static com.wecloud.im.sdk.ResourcePathConstants.GROUP_MEMBERS_FRIEND_REQUEST;
import static com.wecloud.im.sdk.ResourcePathConstants.PAGE_BLACKLIST_REQUEST;
import static com.wecloud.im.sdk.ResourcePathConstants.REMARK_FRIEND_REQUEST;
import static com.wecloud.im.sdk.ResourcePathConstants.UNFRIEND_REQUEST;
import static com.wecloud.im.sdk.utils.CodingUtils.assertParameterNotBlank; import static com.wecloud.im.sdk.utils.CodingUtils.assertParameterNotBlank;
import static com.wecloud.im.sdk.utils.CodingUtils.assertParameterNotNull; import static com.wecloud.im.sdk.utils.CodingUtils.assertParameterNotNull;
...@@ -116,6 +100,7 @@ public class WecloudImContactsOperation extends WecloudImOperation { ...@@ -116,6 +100,7 @@ public class WecloudImContactsOperation extends WecloudImOperation {
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()); param.put("needVerify", friendRequestRequest.getNeedVerify());
param.put("addFriendScene",friendRequestRequest.getAddFriendScene());
// 发送请求 // 发送请求
RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(FRIEND_REQUEST) RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(FRIEND_REQUEST)
.setMethod(HttpMethod.POST).setParameters(param) .setMethod(HttpMethod.POST).setParameters(param)
......
im-sdk/src/main/java/com/wecloud/im/sdk/model/FriendRequestRequest.java
...@@ -40,4 +40,8 @@ public class FriendRequestRequest extends WebServiceRequest { ...@@ -40,4 +40,8 @@ public class FriendRequestRequest extends WebServiceRequest {
*/ */
private Boolean needVerify; private Boolean needVerify;
/**
* 好友场景
*/
private String addFriendScene;
} }
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