Skip to content

W
wecloud_im_server
Commit 54623d88 by 罗长华
Options

1、action入参前增加@RequestParam(value = "data")注解

parent 143e98a2
Showing with 76 additions and 72 deletions
core/src/main/java/com/wecloud/im/action/BlacklistAction.java
......@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestParam;
import com.wecloud.dispatch.annotation.ActionMapping;
import com.wecloud.im.param.ImClientBlacklistPageParam;
......@@ -37,8 +38,8 @@ public class BlacklistAction {
*/
@ActionMapping("/add")
@ApiOperation(value = "拉入黑名单")
public WsResponse<Boolean> addImClientBlacklist(ImClientBlacklistUpdate data) {
imClientBlacklistService.addImClientBlacklist(data);
public WsResponse<Boolean> addImClientBlacklist(@RequestParam(value = "data") ImClientBlacklistUpdate clientBlacklistUpdate) {
imClientBlacklistService.addImClientBlacklist(clientBlacklistUpdate);
return WsResponse.ok();
}
......@@ -48,8 +49,8 @@ public class BlacklistAction {
*/
@ActionMapping("/delete")
@ApiOperation(value = "移出黑名单")
public WsResponse<Boolean> deleteImClientBlacklist(ImClientBlacklistUpdate data) {
imClientBlacklistService.removeImClientBlacklist(data);
public WsResponse<Boolean> deleteImClientBlacklist(@RequestParam(value = "data") ImClientBlacklistUpdate clientBlacklistUpdate) {
imClientBlacklistService.removeImClientBlacklist(clientBlacklistUpdate);
return WsResponse.ok();
}
......@@ -59,9 +60,9 @@ public class BlacklistAction {
@ActionMapping("/getPageList")
@OperationLog(name = "黑名单分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "黑名单分页列表")
public WsResponse<Paging<ImClientBlacklistQueryVo>> getImClientBlacklistPageList(ImClientBlacklistPageParam data) {
public WsResponse<Paging<ImClientBlacklistQueryVo>> getImClientBlacklistPageList(@RequestParam(value = "data") ImClientBlacklistPageParam clientBlacklistUpdate) {
Paging<ImClientBlacklistQueryVo> blacklist =
imClientBlacklistService.getImClientBlacklistPageList(data);
imClientBlacklistService.getImClientBlacklistPageList(clientBlacklistUpdate);
return WsResponse.ok(blacklist);
}
}
core/src/main/java/com/wecloud/im/action/ClientAction.java
......@@ -9,6 +9,7 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestParam;
import com.alibaba.fastjson.JSON;
import com.wecloud.dispatch.annotation.ActionMapping;
......@@ -68,8 +69,8 @@ public class ClientAction {
@ActionMapping("/infoList")
@ApiOperation(value = "根据id获取Client的头像昵称")
public WsResponse<List<GetInfoListVo>> getInfoList(GetClientInfoParam data) throws Exception {
return WsResponse.ok(imClientService.getInfoList(data));
public WsResponse<List<GetInfoListVo>> getInfoList(@RequestParam(value = "data") GetClientInfoParam getClientInfoParam) throws Exception {
return WsResponse.ok(imClientService.getInfoList(getClientInfoParam));
}
/**
......@@ -77,34 +78,34 @@ public class ClientAction {
*/
@ActionMapping("/clientInfo")
@ApiOperation(value = "查询用户信息 用户可能是好友、陌生人、被拉黑名单的人")
public WsResponse<ClientInfoVo> getClientInfo(ClientInfoParam data) {
ClientInfoVo clientInfoVo = imClientService.getClientInfo(data);
public WsResponse<ClientInfoVo> getClientInfo(@RequestParam(value = "data") ClientInfoParam clientInfoParam) {
ClientInfoVo clientInfoVo = imClientService.getClientInfo(clientInfoParam);
return WsResponse.ok(clientInfoVo);
}
@ActionMapping("/updateHeadAndNickname")
@ApiOperation(value = "添加或修改头像和昵称")
public WsResponse<Boolean> updateHeadAndNickname(ImClientHeadPortraitAndNicknameUpdate data) throws Exception {
log.info("添加或修改头像和昵称入参 {}", JSON.toJSONString(data));
boolean flag = imClientService.updateHeadAndNickname(data);
public WsResponse<Boolean> updateHeadAndNickname(@RequestParam(value = "data") ImClientHeadPortraitAndNicknameUpdate clientHeadPortraitAndNicknameUpdate) throws Exception {
log.info("添加或修改头像和昵称入参 {}", JSON.toJSONString(clientHeadPortraitAndNicknameUpdate));
boolean flag = imClientService.updateHeadAndNickname(clientHeadPortraitAndNicknameUpdate);
return WsResponse.ok(flag);
}
@ActionMapping("/updateHeadPortrait")
@ApiOperation(value = "添加或修改头像")
public WsResponse<Boolean> updateHeadPortrait(ImClientHeadPortraitAdd data) throws Exception {
log.info("添加或修改头像入参 {}", JSON.toJSONString(data));
boolean flag = imClientService.updateHeadPortrait(data);
public WsResponse<Boolean> updateHeadPortrait(@RequestParam(value = "data") ImClientHeadPortraitAdd clientHeadPortraitAdd) throws Exception {
log.info("添加或修改头像入参 {}", JSON.toJSONString(clientHeadPortraitAdd));
boolean flag = imClientService.updateHeadPortrait(clientHeadPortraitAdd);
return WsResponse.ok(flag);
}
@ActionMapping("/updateNickname")
@ApiOperation(value = "添加或修改主昵称")
public WsResponse<Boolean> updateNickname(ImClientNicknameAdd data) throws Exception {
log.info("添加或修改主昵称入参 {}", JSON.toJSONString(data));
boolean flag = imClientService.updateNickname(data);
public WsResponse<Boolean> updateNickname(@RequestParam(value = "data") ImClientNicknameAdd clientNicknameAdd) throws Exception {
log.info("添加或修改主昵称入参 {}", JSON.toJSONString(clientNicknameAdd));
boolean flag = imClientService.updateNickname(clientNicknameAdd);
return WsResponse.ok(flag);
}
......@@ -117,7 +118,7 @@ public class ClientAction {
*/
@ActionMapping("/logout")
@ApiOperation(value = "退出登陆 清除推送token等")
public WsResponse<Boolean> logout(LogoutParam param) {
public WsResponse<Boolean> logout(@RequestParam(value = "data") LogoutParam param) {
log.info("退出登陆入参 {}", JSON.toJSONString(param));
boolean flag = imClientService.logout(param);
return WsResponse.ok(flag);
......@@ -131,7 +132,7 @@ public class ClientAction {
@ActionMapping("/onlineStatus")
@ApiOperation(value = "获取用户在线状态(批量)")
public WsResponse<List<ImOnlineStatusVo>> getOnlineStatus(
GetOnlineStatusParam getOnlineStatusParam) {
@RequestParam(value = "data") GetOnlineStatusParam getOnlineStatusParam) {
// shiro线程中获取当前token
ImClient imClient = contextService.getImClientIfNotNullOrThrow();
ImApplication imApplication = contextService.getImApplicationIfNotNullOrThrow(imClient.getFkAppid());
......
core/src/main/java/com/wecloud/im/action/ConversationAction.java
......@@ -12,6 +12,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestParam;
import com.alibaba.fastjson.JSON;
import com.wecloud.dispatch.annotation.ActionMapping;
......@@ -53,9 +54,9 @@ public class ConversationAction {
*/
@ActionMapping("/saveOrUpdateName")
@ApiOperation(value = "添加或修改会话名称", notes = "权限:目前只有创建者有权限操作")
public WsResponse<Boolean> saveOrUpdateName(ImConversationNameUpdate data) {
log.info("添加或修改会话名称入参 {}", JSON.toJSONString(data));
imConversationService.saveOrUpdateName(data);
public WsResponse<Boolean> saveOrUpdateName(@RequestParam(value = "data") ImConversationNameUpdate conversationNameUpdate) {
log.info("添加或修改会话名称入参 {}", JSON.toJSONString(conversationNameUpdate));
imConversationService.saveOrUpdateName(conversationNameUpdate);
return WsResponse.ok();
}
......@@ -65,7 +66,7 @@ public class ConversationAction {
*/
@ActionMapping("/saveOrUpdateAttr")
@ApiOperation(value = "添加或修改会话拓展字段", notes = "权限:所有client都权限操作")
public WsResponse<Boolean> saveOrUpdateAttr(ImConversationAttrUpdate imConversationAttrUpdate) {
public WsResponse<Boolean> saveOrUpdateAttr(@RequestParam(value = "data") ImConversationAttrUpdate imConversationAttrUpdate) {
imConversationService.saveOrUpdateAttr(imConversationAttrUpdate);
return WsResponse.ok();
}
......@@ -76,7 +77,7 @@ public class ConversationAction {
*/
@ActionMapping("/leave")
@ApiOperation(value = "client退出会话", notes = "若是创建者退出,[创建者]权限将会转移给按加入会话时间排序的下一个client")
public WsResponse<Boolean> leaveConversation(ImClientLeaveConversation imClientToConversation) {
public WsResponse<Boolean> leaveConversation(@RequestParam(value = "data") ImClientLeaveConversation imClientToConversation) {
log.info("client退出会话入参 {}", JSON.toJSONString(imClientToConversation));
imConversationService.leaveConversation(imClientToConversation);
return WsResponse.ok();
......@@ -88,7 +89,7 @@ public class ConversationAction {
*/
@ActionMapping("/delClient")
@ApiOperation(value = "将client从会话移除", notes = "权限:目前只有群主有权限操作")
public WsResponse<Boolean> delClientToConversation(ImClientToConversation imClientToConversation) throws Exception {
public WsResponse<Boolean> delClientToConversation(@RequestParam(value = "data") ImClientToConversation imClientToConversation) throws Exception {
log.info("将client从会话移除入参 {}", JSON.toJSONString(imClientToConversation));
return WsResponse.ok(imConversationService.delClientToConversation(imClientToConversation));
}
......@@ -98,7 +99,7 @@ public class ConversationAction {
*/
@ActionMapping("/disband")
@ApiOperation(value = "解散群聊", notes = "权限:目前只有群主有权限操作")
public WsResponse<Boolean> disband(DisbandConversationParam param) throws Exception {
public WsResponse<Boolean> disband(@RequestParam(value = "data") DisbandConversationParam param) throws Exception {
log.info("解散群聊入参 {}", JSON.toJSONString(param));
imConversationService.disband(param);
return WsResponse.ok();
......@@ -110,7 +111,7 @@ public class ConversationAction {
*/
@ActionMapping("/addClient")
@ApiOperation(value = "将用户添加进会话", notes = "权限:会话中所有client都有权限操作")
public WsResponse<Boolean> addClientToConversation(ImClientToConversation imClientToConversation) throws Exception {
public WsResponse<Boolean> addClientToConversation(@RequestParam(value = "data") ImClientToConversation imClientToConversation) throws Exception {
log.info("将用户添加进会话入参 {}", JSON.toJSONString(imClientToConversation));
imConversationService.addClientToConversation(imClientToConversation);
return WsResponse.ok();
......@@ -121,7 +122,7 @@ public class ConversationAction {
*/
@ActionMapping("/create")
@ApiOperation(value = "创建会话", notes = "后台可配置:两个客户端如果已经创建过会话,是否重复创建会话")
public WsResponse<ImConversationCreateVo> createImConversation(ImConversationCreate imConversationCreate) throws Exception {
public WsResponse<ImConversationCreateVo> createImConversation(@RequestParam(value = "data") ImConversationCreate imConversationCreate) throws Exception {
log.info("创建会话入参 {}", JSON.toJSONString(imConversationCreate));
ImConversationCreateVo vo = imConversationService.createImConversation(imConversationCreate);
return WsResponse.ok(vo);
......@@ -132,7 +133,7 @@ public class ConversationAction {
*/
@ActionMapping("/transferOwner")
@ApiOperation(value = "群主转让", notes = "权限:目前只有群主有权限操作")
public WsResponse<Boolean> transferOwner(TransferOwnerParam param) {
public WsResponse<Boolean> transferOwner(@RequestParam(value = "data") TransferOwnerParam param) {
log.info("群主转让入参 {}", JSON.toJSONString(param));
Boolean result = imConversationService.transferOwner(param);
return WsResponse.ok(result);
......@@ -143,7 +144,7 @@ public class ConversationAction {
*/
@ActionMapping("/setAdmins")
@ApiOperation(value = "设置群管理员", notes = "权限:目前只有群主有权限操作")
public WsResponse<Boolean> setAdmins(@Validated SetAdminsParam param) {
public WsResponse<Boolean> setAdmins(@RequestParam(value = "data") @Validated SetAdminsParam param) {
log.info("设置群管理员入参 {}", JSON.toJSONString(param));
if (CollectionUtils.isEmpty(param.getClientIds())) {
return WsResponse.fail(ApiCode.PARAMETER_EXCEPTION, null);
......@@ -157,7 +158,7 @@ public class ConversationAction {
*/
@ActionMapping("/mutedGroup")
@ApiOperation(value = "群禁言、取消群禁言", notes = "权限:群主和管理员有权限操作")
public WsResponse<Boolean> mutedGroup(@Validated MutedGroupParam param) {
public WsResponse<Boolean> mutedGroup(@RequestParam(value = "data") @Validated MutedGroupParam param) {
log.info("群禁言、取消群禁言入参 {}", JSON.toJSONString(param));
Boolean result = imConversationService.mutedGroup(param);
return WsResponse.ok(result);
......@@ -168,7 +169,7 @@ public class ConversationAction {
*/
@ActionMapping("/mutedGroupMember")
@ApiOperation(value = "选择禁言", notes = "权限:群主和管理员有权限操作")
public WsResponse<Boolean> mutedGroupMember(@Validated MutedGroupMemberParam param) {
public WsResponse<Boolean> mutedGroupMember(@RequestParam(value = "data") @Validated MutedGroupMemberParam param) {
log.info("选择禁言入参 {}", JSON.toJSONString(param));
if (CollectionUtils.isEmpty(param.getClientIds())) {
return WsResponse.fail(ApiCode.PARAMETER_EXCEPTION, null);
......@@ -192,7 +193,7 @@ public class ConversationAction {
*/
@ActionMapping("/info")
@ApiOperation(value = "根据会话id查询指定会话信息", notes = "根据会话id查询指定会话信息 与每个会话的未读条数")
public WsResponse<ConversationVo> info(@Validated ImConversationQueryParam param) throws Exception {
public WsResponse<ConversationVo> info(@RequestParam(value = "data") @Validated ImConversationQueryParam param) throws Exception {
ConversationVo conversationVo = imConversationService.infoImConversationAndMsgCount(param);
return WsResponse.ok(conversationVo);
}
......@@ -202,7 +203,7 @@ public class ConversationAction {
*/
@ActionMapping("/displayUpdate")
@ApiOperation(value = "批量修改单向隐藏或显示会话", notes = "拉取会话列表不展示已隐藏状态的会话,云端聊天记录不删除;假设有A和B两个用户,A删会话,B还能发; 如果B发了消息,A这边要重新把会话显示出来,并能显示之前的聊天记录")
public ApiResult<Boolean> updateDisplayConversation(ImConversationDisplayUpdate imConversationDisplayUpdate) throws Exception {
public ApiResult<Boolean> updateDisplayConversation(@RequestParam(value = "data") ImConversationDisplayUpdate imConversationDisplayUpdate) throws Exception {
imConversationService.updateDisplayConversation(imConversationDisplayUpdate);
return ApiResult.result(true);
......
core/src/main/java/com/wecloud/im/action/ConversationMembersAction.java
package com.wecloud.im.action;
import com.wecloud.dispatch.annotation.ActionMapping;
import com.wecloud.im.param.ImConvMemeClientRemarkNameParam;
import com.wecloud.im.param.ListConversationMembersParam;
import com.wecloud.im.param.add.ImConversationMemAttrUpdate;
import com.wecloud.im.service.ImConversationMembersService;
import com.wecloud.im.vo.ConversationMemberVo;
import com.wecloud.im.ws.model.WsResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import com.wecloud.dispatch.annotation.ActionMapping;
import com.wecloud.im.param.ImConvMemeClientRemarkNameParam;
import com.wecloud.im.param.ListConversationMembersParam;
import com.wecloud.im.param.add.ImConversationMemAttrUpdate;
import com.wecloud.im.service.ImConversationMembersService;
import com.wecloud.im.vo.ConversationMemberVo;
import com.wecloud.im.ws.model.WsResponse;
/**
* @Author luozh
......@@ -34,8 +37,8 @@ public class ConversationMembersAction {
*/
@ActionMapping("/updateClientRemarkName")
@ApiOperation(value = "添加或修改会话成员备注", notes = "权限:目前只有client成员自己有权限操作")
public WsResponse<Boolean> saveOrUpdateClientRemarkName(ImConvMemeClientRemarkNameParam imConvMemeClientRemarkNameParam) throws Exception {
imConversationMembersService.saveOrUpdateClientRemarkName(imConvMemeClientRemarkNameParam);
public WsResponse<Boolean> saveOrUpdateClientRemarkName(@RequestParam(value = "data") ImConvMemeClientRemarkNameParam convMemeClientRemarkNameParam) throws Exception {
imConversationMembersService.saveOrUpdateClientRemarkName(convMemeClientRemarkNameParam);
return WsResponse.ok();
}
......@@ -45,8 +48,8 @@ public class ConversationMembersAction {
*/
@ActionMapping("/updateAttr")
@ApiOperation(value = "添加或修改会话成员拓展字段", notes = "权限:目前只有client成员自己有权限操作")
public WsResponse<Boolean> saveOrUpdateAttr(ImConversationMemAttrUpdate imConversationMemAttrUpdate) throws Exception {
boolean r = imConversationMembersService.saveOrUpdateAttr(imConversationMemAttrUpdate);
public WsResponse<Boolean> saveOrUpdateAttr(@RequestParam(value = "data") ImConversationMemAttrUpdate conversationMemAttrUpdate) throws Exception {
boolean r = imConversationMembersService.saveOrUpdateAttr(conversationMemAttrUpdate);
if (r) {
return WsResponse.ok();
} else {
......@@ -60,7 +63,7 @@ public class ConversationMembersAction {
*/
@ActionMapping("/getList")
@ApiOperation(value = "获取会话中成员表列表")
public WsResponse<List<ConversationMemberVo>> getImConversationMembersList(@Validated ListConversationMembersParam listConversationMembersParam) throws Exception {
public WsResponse<List<ConversationMemberVo>> getImConversationMembersList(@RequestParam(value = "data") @Validated ListConversationMembersParam listConversationMembersParam) throws Exception {
return WsResponse.ok(imConversationMembersService.getImConversationMembersList(listConversationMembersParam));
}
}
core/src/main/java/com/wecloud/im/action/InboxAction.java
......@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
/**
* @Author luozh
......@@ -35,7 +36,7 @@ public class InboxAction {
*/
@ActionMapping("/msgReceivedUpdate")
@ApiOperation(value = "消息修改为已接收状态")
public WsResponse<Boolean> updateImMsgReceived(@RequestBody @Validated ImMsgReceivedStatusUpdate imMsgReceivedUpdate) throws Exception {
public WsResponse<Boolean> updateImMsgReceived(@RequestParam(value = "data") @Validated ImMsgReceivedStatusUpdate imMsgReceivedUpdate) throws Exception {
imInboxService.updateImMsgReceived(imMsgReceivedUpdate);
return WsResponse.ok();
}
......@@ -45,7 +46,7 @@ public class InboxAction {
*/
@ActionMapping("/msgReadUpdate")
@ApiOperation(value = "消息修改为已读状态")
public WsResponse<Boolean> updateInMsgReadUpdate(@RequestBody MsgReadStatusUpdateParam msgReadStatusUpdateParam) throws Exception {
public WsResponse<Boolean> updateInMsgReadUpdate(@RequestParam(value = "data") MsgReadStatusUpdateParam msgReadStatusUpdateParam) throws Exception {
if (CollectionUtils.isEmpty(msgReadStatusUpdateParam.getMsgIds())) {
return WsResponse.fail(ApiCode.PARAMETER_EXCEPTION);
}
......@@ -58,7 +59,7 @@ public class InboxAction {
*/
@ActionMapping("/updateMsgReadStatusByConversation")
@ApiOperation(value = "会话消息修改为已读状态")
public WsResponse<Boolean> updateMsgReadStatusByConversation(@RequestBody UpdateMsgReadStatusByConversationParam param) throws Exception {
public WsResponse<Boolean> updateMsgReadStatusByConversation(@RequestParam(value = "data") UpdateMsgReadStatusByConversationParam param) throws Exception {
if (param.getConversationId() == null) {
return WsResponse.fail(ApiCode.PARAMETER_EXCEPTION);
}
......
core/src/main/java/com/wecloud/im/action/MultiMeetAction.java
......@@ -13,6 +13,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestParam;
@Slf4j
@Component
......@@ -28,7 +29,7 @@ public class MultiMeetAction {
*/
@ActionMapping("/invite")
@ApiOperation(value = "邀请加入多人音视频会议", notes = "邀请加入多人音视频会议")
public WsResponse<Boolean> invite(@Validated InviteToMultiMeetParam param) {
public WsResponse<Boolean> invite(@RequestParam(value = "data") @Validated InviteToMultiMeetParam param) {
log.info("邀请加入多人音视频会议入参 {}", JSON.toJSONString(param));
if (CollectionUtils.isEmpty(param.getToClients())) {
return WsResponse.fail(ApiCode.PARAMETER_EXCEPTION);
......@@ -39,7 +40,7 @@ public class MultiMeetAction {
@ActionMapping("/reject")
@ApiOperation(value = "拒接进入会议", notes = "拒接进入会议")
public WsResponse<Boolean> reject(RejectToMultiMeetParam param) {
public WsResponse<Boolean> reject(@RequestParam(value = "data") RejectToMultiMeetParam param) {
log.info("拒绝加入多人音视频会议入参 {}", JSON.toJSONString(param));
multiMeetService.reject(param);
return WsResponse.ok();
......@@ -47,7 +48,7 @@ public class MultiMeetAction {
@ActionMapping("/agree")
@ApiOperation(value = "同意进入会议", notes = "同意进入会议")
public WsResponse<Boolean> agree(AgreeToMultiMeetParam param) {
public WsResponse<Boolean> agree(@RequestParam(value = "data") AgreeToMultiMeetParam param) {
log.info("同意进入多人音视频会议入参 {}", JSON.toJSONString(param));
multiMeetService.agree(param);
return WsResponse.ok();
......@@ -55,7 +56,7 @@ public class MultiMeetAction {
@ActionMapping("/leave")
@ApiOperation(value = "主动挂断(离开会议)", notes = "主动挂断(离开会议)")
public WsResponse<Boolean> leave(LeaveFromMultiMeetParam param) {
public WsResponse<Boolean> leave(@RequestParam(value = "data") LeaveFromMultiMeetParam param) {
log.info("主动挂断多人音视频会议入参 {}", JSON.toJSONString(param));
multiMeetService.leave(param);
return WsResponse.ok();
......@@ -63,7 +64,7 @@ public class MultiMeetAction {
@ActionMapping("/notAnswered")
@ApiOperation(value = "未接听", notes = "未接听")
public WsResponse<Boolean> notAnswered(NotAnsweredMultiMeetParam param) {
public WsResponse<Boolean> notAnswered(@RequestParam(value = "data") NotAnsweredMultiMeetParam param) {
log.info("多人音视频会议未接听入参 {}", JSON.toJSONString(param));
multiMeetService.notAnswered(param);
return WsResponse.ok();
......@@ -71,7 +72,7 @@ public class MultiMeetAction {
@ActionMapping("/heartbeat")
@ApiOperation(value = "发送心跳", notes = "发送心跳")
public WsResponse<Boolean> heartbeat(HeartbeatMultiMeetParam param) {
public WsResponse<Boolean> heartbeat(@RequestParam(value = "data") HeartbeatMultiMeetParam param) {
multiMeetService.heartbeat(param);
return WsResponse.ok();
}
......
core/src/main/java/com/wecloud/im/action/RtcAction.java
......@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@Slf4j
@Component
......@@ -28,7 +29,7 @@ public class RtcAction {
*/
@ActionMapping("/createAndCall")
@ApiOperation(value = "创建频道,并邀请客户端加入", notes = "创建频道,并邀请客户端加入")
public WsResponse<CreateRtcChannelResult> createAndCall(@RequestBody CreateRtcChannelParam createRtcChannelParam) {
public WsResponse<CreateRtcChannelResult> createAndCall(@RequestParam(value = "data") CreateRtcChannelParam createRtcChannelParam) {
if (BaseEnum.valueOf(CallTypeEnum.class, createRtcChannelParam.getCallType()) == null) {
return WsResponse.fail(ApiCode.PARAMETER_EXCEPTION);
}
......@@ -38,35 +39,35 @@ public class RtcAction {
@ActionMapping("/join")
@ApiOperation(value = "同意进入频道", notes = "")
public WsResponse<Boolean> join(@RequestBody JoinRtcChannelParam joinRtcChannelParam) {
public WsResponse<Boolean> join(@RequestParam(value = "data") JoinRtcChannelParam joinRtcChannelParam) {
rtcService.join(joinRtcChannelParam);
return WsResponse.ok();
}
@ActionMapping("/reject")
@ApiOperation(value = "拒接进入频道", notes = "")
public WsResponse<Boolean> reject(@RequestBody RejectRtcChannelParam rejectRtcChannelParam) {
public WsResponse<Boolean> reject(@RequestParam(value = "data") RejectRtcChannelParam rejectRtcChannelParam) {
rtcService.reject(rejectRtcChannelParam);
return WsResponse.ok();
}
@ActionMapping("/leave")
@ApiOperation(value = "主动挂断(离开频道)", notes = "")
public WsResponse<Boolean> leave(@RequestBody LeaveRtcChannelParam leaveRtcChannelParam) {
public WsResponse<Boolean> leave(@RequestParam(value = "data") LeaveRtcChannelParam leaveRtcChannelParam) {
rtcService.leave(leaveRtcChannelParam);
return WsResponse.ok();
}
@ActionMapping("/sdpForward")
@ApiOperation(value = "SDP数据转发", notes = "")
public WsResponse<Boolean> sdpForward(@RequestBody SdpForwardParam sdpForwardParam) {
public WsResponse<Boolean> sdpForward(@RequestParam(value = "data") SdpForwardParam sdpForwardParam) {
rtcService.sdpForward(sdpForwardParam);
return WsResponse.ok();
}
@ActionMapping("/candidateForward")
@ApiOperation(value = "candidate候选者数据转发", notes = "")
public WsResponse<Boolean> candidateForward(@RequestBody CandidateForwardParam candidateForwardParam) {
public WsResponse<Boolean> candidateForward(@RequestParam(value = "data") CandidateForwardParam candidateForwardParam) {
rtcService.candidateForward(candidateForwardParam);
return WsResponse.ok();
}
......
core/src/main/java/com/wecloud/im/service/impl/ContextServiceImpl.java
package com.wecloud.im.service.impl;
import io.geekidea.springbootplus.framework.common.exception.BusinessException;
import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
......@@ -34,14 +36,7 @@ public class ContextServiceImpl implements ContextService {
@Override
public ImClient getImClientIfNotNullOrThrow() {
ImClient currentClient;
if (ActionRequestHolder.getActionRequest() != null) {
ActionRequest request = ActionRequestHolder.getActionRequest();
currentClient = imClientService.getCacheImClient(request.getSenderClientId());
} else {
currentClient = imClientService.getCurrentClient();
}
ImClient currentClient = imClientService.getCurrentClient();
if (currentClient == null) {
throw new BusinessException("当前用户登录信息失效");
......
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