update

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -34,11 +34,11 @@ public class SysUser {
 	private Integer organId;
 
 	/** 创建时间 */
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private java.util.Date createTime;
 
 	/** 修改时间 */
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private java.util.Date updateTime;
 
 	/** 0-正常，9-锁定 */

mec-im/src/main/java/com/ym/config/WebMvcConfig.java

@@ -0,0 +1,99 @@
+package com.ym.config;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.ym.mec.common.config.EnumConverterFactory;
+import com.ym.mec.common.enums.BaseEnum;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+	/**
+	 * 枚举类的转换器 addConverterFactory
+	 */
+	@Override
+	public void addFormatters(FormatterRegistry registry) {
+		registry.addConverterFactory(new EnumConverterFactory());
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Bean
+	@Primary
+	public ObjectMapper ObjectMapper() {
+		ObjectMapper objectMapper = new ObjectMapper();
+		// 对于空的对象转json的时候不抛出错误
+		objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+		// 禁用遇到未知属性抛出异常
+		objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+		// 序列化BigDecimal时不使用科学计数法输出
+		objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+		// 日期和时间格式化
+		JavaTimeModule javaTimeModule = new JavaTimeModule();
+		javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+		javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+		javaTimeModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
+		javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+		javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+		javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
+
+		// BaseEnum序列化
+		javaTimeModule.addSerializer(BaseEnum.class, new JsonSerializer<BaseEnum>() {
+
+			@Override
+			public void serialize(BaseEnum enumObj, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
+				jsonGenerator.writeString(enumObj.getCode().toString());
+			}
+
+		});
+
+		// Date序列化和反序列化
+		javaTimeModule.addSerializer(Date.class, new JsonSerializer<Date>() {
+			@Override
+			public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+				SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				String formattedDate = formatter.format(date);
+				jsonGenerator.writeString(formattedDate);
+			}
+		});
+
+		javaTimeModule.addDeserializer(Date.class, new JsonDeserializer<Date>() {
+			@Override
+			public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+				SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				String date = jsonParser.getText();
+				try {
+					return format.parse(date);
+				} catch (ParseException e) {
+					throw new RuntimeException(e);
+				}
+			}
+		});
+
+		objectMapper.registerModule(javaTimeModule);
+		return objectMapper;
+	}
+
+}

mec-im/src/main/java/com/ym/controller/BlackListController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.UserService;
 import io.rong.models.user.UserModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,23 +13,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/blackList")
-public class BlackListController extends BaseController {
+public class BlackListController{
 
     @Autowired
     UserService userService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Object add(@RequestBody UserModel userModel) throws Exception {
-        return succeed(userService.blackListAdd(userModel));
+        return userService.blackListAdd(userModel);
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody UserModel userModel) throws Exception {
-        return succeed(userService.blackListRemove(userModel));
+        return userService.blackListRemove(userModel);
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
     public Object getList(@RequestBody UserModel userModel) throws Exception {
-        return succeed(userService.blackListGetList(userModel));
+        return userService.blackListGetList(userModel);
     }
 }

mec-im/src/main/java/com/ym/controller/BlockController.java

@@ -14,23 +14,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/block")
-public class BlockController extends BaseController {
+public class BlockController{
 
     @Autowired
     UserService userService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Object add(@RequestBody UserModel userModel) throws Exception {
-        return succeed(userService.blockAdd(userModel));
+        return userService.blockAdd(userModel);
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody String id) throws Exception {
-        return succeed(userService.blockRemove(id));
+        return userService.blockRemove(id);
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
     public Object getList() throws Exception {
-        return succeed(userService.blockGetList());
+        return userService.blockGetList();
     }
 }

mec-im/src/main/java/com/ym/controller/ChatroomController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.ChatroomService;
 import com.ym.service.MessageService;
 import io.rong.models.chatroom.ChatroomMember;
@@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/chatroom")
-public class ChatroomController extends BaseController {
+public class ChatroomController{
 
     @Autowired
     MessageService messageService;
@@ -26,61 +25,61 @@ public class ChatroomController extends BaseController {
 
     @RequestMapping(value = "/send", method = RequestMethod.POST)
     public Object send(@RequestBody ChatroomMessage chatroomMessage) throws Exception {
-        return succeed(messageService.chatroomSend(chatroomMessage));
+        return messageService.chatroomSend(chatroomMessage);
     }
 
     @RequestMapping(value = "/broadcast", method = RequestMethod.POST)
     public Object broadcast(@RequestBody ChatroomMessage chatroomMessage) throws Exception {
-        return succeed(messageService.chatroomBroadcast(chatroomMessage));
+        return messageService.chatroomBroadcast(chatroomMessage);
     }
 
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     public Object create(@RequestBody ChatroomModel[] chatroomModels) throws Exception {
-        return succeed(chatroomCreate.chatroomCreate(chatroomModels));
+        return chatroomCreate.chatroomCreate(chatroomModels);
     }
 
     @RequestMapping(value = "/destory", method = RequestMethod.POST)
     public Object destory(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomCreate.chatroomDestory(chatroomModel));
+        return chatroomCreate.chatroomDestory(chatroomModel);
     }
 
     @RequestMapping(value = "/get", method = RequestMethod.POST)
     public Object get(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomCreate.chatroomGet(chatroomModel));
+        return chatroomCreate.chatroomGet(chatroomModel);
     }
 
     @RequestMapping(value = "/isExist", method = RequestMethod.POST)
     public Object isExist(@RequestBody ChatroomMember chatroomMember) throws Exception {
-        return succeed(chatroomCreate.chatroomIsExit(chatroomMember));
+        return chatroomCreate.chatroomIsExit(chatroomMember);
     }
 
     @RequestMapping(value = "/block/add", method = RequestMethod.POST)
     public Object blockAdd(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomCreate.chatroomBlockAdd(chatroomModel));
+        return chatroomCreate.chatroomBlockAdd(chatroomModel);
     }
 
     @RequestMapping(value = "/block/remove", method = RequestMethod.POST)
     public Object blockRemove(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomCreate.chatroomBlockRemove(chatroomModel));
+        return chatroomCreate.chatroomBlockRemove(chatroomModel);
     }
 
     @RequestMapping(value = "/block/getList", method = RequestMethod.POST)
     public Object blockGetList(@RequestBody String chatroomId) throws Exception {
-        return succeed(chatroomCreate.chatroomBlockGetList(chatroomId));
+        return chatroomCreate.chatroomBlockGetList(chatroomId);
     }
 
     @RequestMapping(value = "/muteMembers/add", method = RequestMethod.POST)
     public Object muteMembersAdd(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomCreate.chatroomMuteMembersAdd(chatroomModel));
+        return chatroomCreate.chatroomMuteMembersAdd(chatroomModel);
     }
 
     @RequestMapping(value = "/muteMembers/remove", method = RequestMethod.POST)
     public Object muteMembersRemove(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomCreate.chatroomMuteMembersRemove(chatroomModel));
+        return chatroomCreate.chatroomMuteMembersRemove(chatroomModel);
     }
 
     @RequestMapping(value = "/muteMembers/getList", method = RequestMethod.POST)
     public Object muteMembersGetList(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomCreate.chatroomMuteMembersGetList(chatroomModel));
+        return chatroomCreate.chatroomMuteMembersGetList(chatroomModel);
     }
 }

mec-im/src/main/java/com/ym/controller/ConversationController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.GroupService;
 import io.rong.models.conversation.ConversationModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,18 +13,18 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/conversation")
-public class ConversationController extends BaseController {
+public class ConversationController{
 
     @Autowired
     GroupService groupService;
 
     @RequestMapping(value = "/mute", method = RequestMethod.POST)
     public Object mute(@RequestBody ConversationModel conversationModel) throws Exception {
-        return succeed(groupService.conversationMute(conversationModel));
+        return groupService.conversationMute(conversationModel);
     }
 
     @RequestMapping(value = "/unmute", method = RequestMethod.POST)
     public Object unmute(@RequestBody ConversationModel conversationModel) throws Exception {
-        return succeed(groupService.conversationUnmute(conversationModel));
+        return groupService.conversationUnmute(conversationModel);
     }
 }

mec-im/src/main/java/com/ym/controller/DemotionController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.ChatroomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,23 +12,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/demotion")
-public class DemotionController extends BaseController {
+public class DemotionController{
 
     @Autowired
     ChatroomService chatroomService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Object add(@RequestBody String[] objectNames) throws Exception {
-        return succeed(chatroomService.demotionAdd(objectNames));
+        return chatroomService.demotionAdd(objectNames);
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody String[] objectNames) throws Exception {
-        return succeed(chatroomService.demotionRemove(objectNames));
+        return chatroomService.demotionRemove(objectNames);
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
     public Object getList() throws Exception {
-        return succeed(chatroomService.demotionGetList());
+        return chatroomService.demotionGetList();
     }
 }

mec-im/src/main/java/com/ym/controller/DistributeController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.ChatroomService;
 import io.rong.models.chatroom.ChatroomModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,18 +13,18 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/distribute")
-public class DistributeController extends BaseController {
+public class DistributeController{
 
     @Autowired
     ChatroomService chatroomService;
 
     @RequestMapping(value = "/stop", method = RequestMethod.POST)
     public Object stop(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomService.distributeStop(chatroomModel));
+        return chatroomService.distributeStop(chatroomModel);
     }
 
     @RequestMapping(value = "/resume", method = RequestMethod.POST)
     public Object resume(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomService.distributeResume(chatroomModel));
+        return chatroomService.distributeResume(chatroomModel);
     }
 }

mec-im/src/main/java/com/ym/controller/GroupController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.GroupService;
 import com.ym.service.MessageService;
 import io.rong.models.group.GroupModel;
@@ -19,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/group")
-public class GroupController extends BaseController {
+public class GroupController{
 
     @Autowired
     MessageService messageService;
@@ -28,56 +27,56 @@ public class GroupController extends BaseController {
 
     @RequestMapping(value = "/send", method = RequestMethod.POST)
     public Object send(@RequestBody GroupMessage groupMessage) throws Exception {
-        return succeed(messageService.groupSend(groupMessage));
+        return messageService.groupSend(groupMessage);
     }
 
     @RequestMapping(value = "/sendDirection", method = RequestMethod.POST)
     public Object sendDirection(@RequestBody GroupMessage groupMessage) throws Exception {
-        return succeed(messageService.groupSendDirection(groupMessage));
+        return messageService.groupSendDirection(groupMessage);
     }
 
     @RequestMapping(value = "/sendMention", method = RequestMethod.POST)
     public Object sendMention(@RequestBody MentionMessage mentionMessage) throws Exception {
-        return succeed(messageService.groupSendMention(mentionMessage));
+        return messageService.groupSendMention(mentionMessage);
     }
 
     @RequestMapping(value = "/recall", method = RequestMethod.POST)
     public Object recall(@RequestBody RecallMessage recallMessage) throws Exception {
-        return succeed(messageService.groupRecall(recallMessage));
+        return messageService.groupRecall(recallMessage);
     }
 
     @RequestMapping(value = "/sync", method = RequestMethod.POST)
     public Object sync(@RequestBody UserGroup userGroup) throws Exception {
-        return succeed(groupService.groupSync(userGroup));
+        return groupService.groupSync(userGroup);
     }
 
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     public Object create(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(groupService.groupCreate(groupModel));
+        return groupService.groupCreate(groupModel);
     }
 
     @RequestMapping(value = "/get", method = RequestMethod.POST)
     public Object get(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(groupService.groupGet(groupModel));
+        return groupService.groupGet(groupModel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public Object update(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(groupService.groupUpdate(groupModel));
+        return groupService.groupUpdate(groupModel);
     }
 
     @RequestMapping(value = "/join", method = RequestMethod.POST)
     public Object join(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(groupService.groupJoin(groupModel));
+        return groupService.groupJoin(groupModel);
     }
 
     @RequestMapping(value = "/quit", method = RequestMethod.POST)
     public Object quit(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(groupService.groupQuit(groupModel));
+        return groupService.groupQuit(groupModel);
     }
 
     @RequestMapping(value = "/dismiss", method = RequestMethod.POST)
     public Object dismiss(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(groupService.groupDismiss(groupModel));
+        return groupService.groupDismiss(groupModel);
     }
 }

mec-im/src/main/java/com/ym/controller/HistoryController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.MessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,18 +12,18 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/history")
-public class HistoryController extends BaseController {
+public class HistoryController{
 
     @Autowired
     MessageService messageService;
 
     @RequestMapping(value = "/get", method = RequestMethod.POST)
     public Object get(@RequestBody String date) throws Exception {
-        return succeed(messageService.historyGet(date));
+        return messageService.historyGet(date);
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody String date) throws Exception {
-        return succeed(messageService.historyRemove(date));
+        return messageService.historyRemove(date);
     }
 }

mec-im/src/main/java/com/ym/controller/KeepAliveController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.ChatroomService;
 import io.rong.models.chatroom.ChatroomModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,23 +13,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/keepAlive")
-public class KeepAliveController extends BaseController {
+public class KeepAliveController{
 
     @Autowired
     ChatroomService chatroomService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Object add(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomService.keepAliveAdd(chatroomModel));
+        return chatroomService.keepAliveAdd(chatroomModel);
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomService.keepAliveRemove(chatroomModel));
+        return chatroomService.keepAliveRemove(chatroomModel);
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
     public Object getList() throws Exception {
-        return succeed(chatroomService.keepAliveGetList());
+        return chatroomService.keepAliveGetList();
     }
 }

mec-im/src/main/java/com/ym/controller/MuteAllMembersController.java

@@ -13,23 +13,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteAllMembers")
-public class MuteAllMembersController extends BaseController {
+public class MuteAllMembersController{
 
     @Autowired
     GroupService groupService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Object add(@RequestBody String[] groupIds) throws Exception {
-        return succeed(groupService.muteAllMembersAdd(groupIds));
+        return groupService.muteAllMembersAdd(groupIds);
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody String[] groupIds) throws Exception {
-        return succeed(groupService.muteAllMembersRemove(groupIds));
+        return groupService.muteAllMembersRemove(groupIds);
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
     public Object getList() throws Exception {
-        return succeed(groupService.muteAllMembersGetList());
+        return groupService.muteAllMembersGetList();
     }
 }

mec-im/src/main/java/com/ym/controller/MuteChatroomsController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.UserService;
 import io.rong.models.chatroom.ChatroomModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,23 +13,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteChatrooms")
-public class MuteChatroomsController extends BaseController {
+public class MuteChatroomsController {
 
     @Autowired
     UserService userService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Object add(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(userService.muteChatroomsAdd(chatroomModel));
+        return userService.muteChatroomsAdd(chatroomModel);
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(userService.muteChatroomsRemove(chatroomModel));
+        return userService.muteChatroomsRemove(chatroomModel);
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
     public Object getList() throws Exception {
-        return succeed(userService.muteChatroomsGetList());
+        return userService.muteChatroomsGetList();
     }
 }

mec-im/src/main/java/com/ym/controller/MuteGroupsController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.UserService;
 import io.rong.models.group.GroupModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,23 +13,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteGroups")
-public class MuteGroupsController extends BaseController {
+public class MuteGroupsController {
 
     @Autowired
     UserService userService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Object add(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(userService.muteGroupsAdd(groupModel));
+        return userService.muteGroupsAdd(groupModel);
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(userService.muteGroupsRemove(groupModel));
+        return userService.muteGroupsRemove(groupModel);
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
     public Object getList() throws Exception {
-        return succeed(userService.muteGroupsGetList());
+        return userService.muteGroupsGetList();
     }
 }

mec-im/src/main/java/com/ym/controller/MuteMembersController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.GroupService;
 import io.rong.models.group.GroupModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,23 +13,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteMembers")
-public class MuteMembersController extends BaseController {
+public class MuteMembersController {
 
     @Autowired
     GroupService groupService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Object add(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(groupService.muteMembersAdd(groupModel));
+        return groupService.muteMembersAdd(groupModel);
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(groupService.muteMembersRemove(groupModel));
+        return groupService.muteMembersRemove(groupModel);
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
     public Object getList(String groupId) throws Exception {
-        return succeed(groupService.muteMembersGetList(groupId));
+        return groupService.muteMembersGetList(groupId);
     }
 }

mec-im/src/main/java/com/ym/controller/MuteWhiteController.java

@@ -14,23 +14,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteWhite")
-public class MuteWhiteController extends BaseController {
+public class MuteWhiteController {
 
     @Autowired
     GroupService groupService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Object add(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(groupService.muteWhiteAdd(groupModel));
+        return groupService.muteWhiteAdd(groupModel);
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody GroupModel groupModel) throws Exception {
-        return succeed(groupService.muteWhiteRemove(groupModel));
+        return groupService.muteWhiteRemove(groupModel);
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
     public Object getList(@RequestBody String groupId) throws Exception {
-        return succeed(groupService.muteWhiteGetList(groupId));
+        return groupService.muteWhiteGetList(groupId);
     }
 }

mec-im/src/main/java/com/ym/controller/PrivateController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.MessageService;
 import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
@@ -16,23 +15,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/private")
-public class PrivateController extends BaseController {
+public class PrivateController {
 
     @Autowired
     MessageService messageService;
 
     @RequestMapping(value = "/send", method = RequestMethod.POST)
     public Object send(@RequestBody PrivateMessage privateMessage) throws Exception {
-        return succeed(messageService.privateSend(privateMessage));
+        return messageService.privateSend(privateMessage);
     }
 
     @RequestMapping(value = "/recall", method = RequestMethod.POST)
     public Object recall(@RequestBody RecallMessage recallMessage) throws Exception {
-        return succeed(messageService.privateRecall(recallMessage));
+        return messageService.privateRecall(recallMessage);
     }
 
     @RequestMapping(value = "/sendTemplate", method = RequestMethod.POST)
     public Object sendTemplate(@RequestBody TemplateMessage templateMessage) throws Exception {
-        return succeed(messageService.privateSendTemplate(templateMessage));
+        return messageService.privateSendTemplate(templateMessage);
     }
 }

mec-im/src/main/java/com/ym/controller/PushController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.MessageService;
 import io.rong.models.push.BroadcastModel;
 import io.rong.models.push.PushModel;
@@ -15,18 +14,18 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/push")
-public class PushController extends BaseController {
+public class PushController {
 
     @Autowired
     MessageService messageService;
 
     @RequestMapping(value = "/push", method = RequestMethod.POST)
     public Object push(@RequestBody PushModel pushModel) throws Exception {
-        return succeed(messageService.pushPush(pushModel));
+        return messageService.pushPush(pushModel);
     }
 
     @RequestMapping(value = "/message", method = RequestMethod.POST)
     public Object message(@RequestBody BroadcastModel broadcastModel) throws Exception {
-        return succeed(messageService.pushMessage(broadcastModel));
+        return messageService.pushMessage(broadcastModel);
     }
 }

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -3,7 +3,6 @@ package com.ym.controller;
 import com.ym.common.ApiException;
 import com.ym.common.BaseResponse;
 import com.ym.common.ErrorEnum;
-import com.ym.mec.common.controller.BaseController;
 import com.ym.pojo.*;
 import com.ym.service.RoomService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +15,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/room")
-public class RoomController extends BaseController {
+public class RoomController{
     @Autowired
     RoomService roomService;
 
@@ -24,43 +23,43 @@ public class RoomController extends BaseController {
     public Object joinRoom(@RequestBody ReqUserData data)
             throws ApiException, Exception {
         RoomResult roomResult = roomService.joinRoom(data.getUserName(), data.getRoomId(), data.isAudience(), data.isDisableCamera());
-        return succeed(new BaseResponse<>(roomResult));
+        return new BaseResponse<>(roomResult);
     }
 
     @RequestMapping(value = "/leave", method = RequestMethod.POST)
     public Object leaveRoom(@RequestBody ReqUserData data)
             throws ApiException, Exception {
         boolean result = roomService.leaveRoom(data.getRoomId());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/downgrade", method = RequestMethod.POST)
     public Object downRole(@RequestBody ReqChangeUserRoleData data)
             throws ApiException, Exception {
         boolean result = roomService.downgrade(data.getRoomId(), data.getUsers());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/kick", method = RequestMethod.POST)
     public Object kickMember(@RequestBody ReqUserData data)
             throws ApiException, Exception {
-        boolean result = roomService.kickMember(data.getRoomId(), data.getUserId());
-        return succeed(new BaseResponse<>(result));
+        boolean result = roomService.kickMember(data.getRoomId());
+        return new BaseResponse<>(result);
     }
 
     //only teacher
     @RequestMapping(value = "/display", method = RequestMethod.POST)
     public Object display(@RequestBody ReqDisplayData data)
             throws ApiException, Exception {
-        boolean result = roomService.display(data.getRoomId(), data.getType(), data.getUserId(), data.getUri());
-        return succeed(new BaseResponse<>(result));
+        boolean result = roomService.display(data.getRoomId(), data.getType(), data.getUri());
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/whiteboard/create", method = RequestMethod.POST)
     public Object createWhiteBoard(@RequestBody ReqWhiteboardData data)
             throws ApiException, Exception {
         String result = roomService.createWhiteBoard(data.getRoomId());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
 
@@ -68,14 +67,14 @@ public class RoomController extends BaseController {
     public Object destroyWhiteBoard(@RequestBody ReqWhiteboardData data)
             throws ApiException, Exception {
         boolean result = roomService.deleteWhiteboard(data.getRoomId(), data.getWhiteboardId());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/whiteboard/list", method = RequestMethod.GET)
     public Object getWhiteBoard(@RequestParam String roomId)
             throws ApiException, Exception {
         List<RoomResult.WhiteboardResult> whiteboards = roomService.getWhiteboard(roomId);
-        return succeed(new BaseResponse<>(whiteboards));
+        return new BaseResponse<>(whiteboards);
     }
 
     @RequestMapping(value = "/device/approve", method = RequestMethod.POST)
@@ -83,7 +82,7 @@ public class RoomController extends BaseController {
             throws ApiException, Exception {
         boolean result;
         result = roomService.approveControlDevice(data.getRoomId(), data.getTicket());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/device/reject", method = RequestMethod.POST)
@@ -91,7 +90,7 @@ public class RoomController extends BaseController {
             throws ApiException, Exception {
         boolean result;
         result = roomService.rejectControlDevice(data.getRoomId(), data.getTicket());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/device/control", method = RequestMethod.POST)
@@ -105,7 +104,7 @@ public class RoomController extends BaseController {
         } else {
             throw new ApiException(ErrorEnum.ERR_REQUEST_PARA_ERR);
         }
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/device/sync", method = RequestMethod.POST)
@@ -119,77 +118,77 @@ public class RoomController extends BaseController {
         } else {
             throw new ApiException(ErrorEnum.ERR_REQUEST_PARA_ERR);
         }
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/whiteboard/turn-page", method = RequestMethod.POST)
     public Object turnPage(@RequestBody ReqWhiteboardData data)
             throws ApiException, Exception {
         boolean result = roomService.turnWhiteBoardPage(data.getRoomId(), data.getWhiteboardId(), data.getPage());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/members", method = RequestMethod.GET)
     public Object getMembers(@RequestParam String roomId)
             throws ApiException, Exception {
         List<RoomResult.MemberResult> whiteboards = roomService.getMembers(roomId);
-        return succeed(new BaseResponse<>(whiteboards));
+        return new BaseResponse<>(whiteboards);
     }
 
     @RequestMapping(value = "/speech/apply", method = RequestMethod.POST)
     public Object apply(@RequestBody ReqSpeechData data)
             throws ApiException, Exception {
         Boolean result = roomService.applySpeech(data.getRoomId());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/speech/approve", method = RequestMethod.POST)
     public Object approval(@RequestBody ReqSpeechData data)
             throws ApiException, Exception {
         Boolean result = roomService.approveSpeech(data.getRoomId(), data.getTicket());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/speech/reject", method = RequestMethod.POST)
     public Object reject(@RequestBody ReqSpeechData data)
             throws ApiException, Exception {
         Boolean result = roomService.rejectSpeech(data.getRoomId(), data.getTicket());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/transfer", method = RequestMethod.POST)
     public Object transfer(@RequestBody ReqUpgradeRoleData data)
             throws ApiException, Exception {
         Boolean result = roomService.transfer(data.getRoomId(), data.getUserId());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/upgrade/invite", method = RequestMethod.POST)
     public Object inviteUpgradeRole(@RequestBody ReqUpgradeRoleData data)
             throws ApiException, Exception {
         Boolean result = roomService.inviteUpgradeRole(data.getRoomId(), data.getUserId(), data.getRole());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/upgrade/approve", method = RequestMethod.POST)
     public Object approveUpgradeRole(@RequestBody ReqUpgradeRoleData data)
             throws ApiException, Exception {
         Boolean result = roomService.approveUpgradeRole(data.getRoomId(), data.getTicket());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/upgrade/reject", method = RequestMethod.POST)
     public Object rejectUpgradeRole(@RequestBody ReqUpgradeRoleData data)
             throws ApiException, Exception {
         Boolean result = roomService.rejectUpgradeRole(data.getRoomId(), data.getTicket());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/change-role", method = RequestMethod.POST)
     public Object changeRole(@RequestBody ReqChangeRole data)
             throws ApiException, Exception {
         Boolean result = roomService.changeRole(data.getRoomId(), data.getUserId(), data.getRole());
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 
     @RequestMapping(value = "/members/online-status", method = RequestMethod.POST)
@@ -199,6 +198,6 @@ public class RoomController extends BaseController {
                                                     @RequestParam(value = "signature", required = false) String signature)
             throws ApiException, Exception {
         Boolean result = roomService.memberOnlineStatus(statusList, nonce, timestamp, signature);
-        return succeed(new BaseResponse<>(result));
+        return new BaseResponse<>(result);
     }
 }

mec-im/src/main/java/com/ym/controller/SensitiveController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.ChatroomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,23 +12,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/sensitive")
-public class SensitiveController extends BaseController {
+public class SensitiveController {
 
     @Autowired
     ChatroomService chatroomService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Object add(@RequestBody String word) throws Exception {
-        return succeed(chatroomService.sensitiveAdd(word));
+        return chatroomService.sensitiveAdd(word);
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody String word) throws Exception {
-        return succeed(chatroomService.sensitiveRemove(word));
+        return chatroomService.sensitiveRemove(word);
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
     public Object getList() throws Exception {
-        return succeed(chatroomService.sensitiveGetList());
+        return chatroomService.sensitiveGetList();
     }
 }

mec-im/src/main/java/com/ym/controller/SystemController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.MessageService;
 import io.rong.models.message.BroadcastMessage;
 import io.rong.models.message.SystemMessage;
@@ -16,23 +15,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/system")
-public class SystemController extends BaseController {
+public class SystemController {
 
     @Autowired
     MessageService messageService;
 
     @RequestMapping(value = "/send", method = RequestMethod.POST)
     public Object send(@RequestBody SystemMessage systemMessage) throws Exception {
-        return succeed(messageService.systemSend(systemMessage));
+        return messageService.systemSend(systemMessage);
     }
 
     @RequestMapping(value = "/broadcast", method = RequestMethod.POST)
     public Object broadcast(@RequestBody BroadcastMessage broadcastMessage) throws Exception {
-        return succeed(messageService.systemBroadcast(broadcastMessage));
+        return messageService.systemBroadcast(broadcastMessage);
     }
 
     @RequestMapping(value = "/sendTemplate", method = RequestMethod.POST)
     public Object sendTemplate(@RequestBody TemplateMessage templateMessage) throws Exception {
-        return succeed(messageService.systemSendTemplate(templateMessage));
+        return messageService.systemSendTemplate(templateMessage);
     }
 }

mec-im/src/main/java/com/ym/controller/TagController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.UserService;
 import io.rong.models.user.BatchTagModel;
 import io.rong.models.user.GetTagModel;
@@ -16,23 +15,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/tag")
-public class TagController extends BaseController {
+public class TagController {
 
     @Autowired
     UserService userService;
 
     @RequestMapping(value = "/set", method = RequestMethod.POST)
     public Object add(@RequestBody TagModel tagModel) throws Exception {
-        return succeed(userService.tagSet(tagModel));
+        return userService.tagSet(tagModel);
     }
 
     @RequestMapping(value = "/batchSet", method = RequestMethod.POST)
     public Object remove(@RequestBody BatchTagModel batchTagModel) throws Exception {
-        return succeed(userService.tagBatchSet(batchTagModel));
+        return userService.tagBatchSet(batchTagModel);
     }
 
     @RequestMapping(value = "/get", method = RequestMethod.POST)
     public Object getList(GetTagModel getTagModel) throws Exception {
-        return succeed(userService.tagGet(getTagModel));
+        return userService.tagGet(getTagModel);
     }
 }

mec-im/src/main/java/com/ym/controller/UserController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/user")
-public class UserController extends BaseController {
+public class UserController {
 
     @Autowired
     UserService userService;
@@ -28,16 +28,16 @@ public class UserController extends BaseController {
         String token = userService.refreshToken(reqUserData.getUserId(), reqUserData.getUserId());
         BaseResponse<String> response = new BaseResponse<>();
         response.setData(token);
-        return succeed(response);
+        return response;
     }
 
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     public Object register(@RequestBody UserModel userModel) throws Exception {
-        return succeed(userService.register(userModel));
+        return userService.register(userModel);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public Object update(@RequestBody UserModel userModel) throws Exception {
-        return succeed(userService.update(userModel));
+        return userService.update(userModel);
     }
 }

mec-im/src/main/java/com/ym/controller/WhitelistController.java

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.ym.mec.common.controller.BaseController;
 import com.ym.service.ChatroomService;
 import io.rong.models.chatroom.ChatroomModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,38 +13,38 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/whitelist")
-public class WhitelistController extends BaseController {
+public class WhitelistController {
 
     @Autowired
     ChatroomService chatroomService;
 
     @RequestMapping(value = "/user/add", method = RequestMethod.POST)
     public Object userAdd(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomService.whitelistUserAdd(chatroomModel));
+        return chatroomService.whitelistUserAdd(chatroomModel);
     }
 
     @RequestMapping(value = "/user/remove", method = RequestMethod.POST)
     public Object userRemove(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomService.whitelistUserRemove(chatroomModel));
+        return chatroomService.whitelistUserRemove(chatroomModel);
     }
 
     @RequestMapping(value = "/user/getList", method = RequestMethod.POST)
     public Object userGetList(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return succeed(chatroomService.whitelistUserGetList(chatroomModel));
+        return chatroomService.whitelistUserGetList(chatroomModel);
     }
 
     @RequestMapping(value = "/message/add", method = RequestMethod.POST)
     public Object messageAdd(@RequestBody String[] objectNames) throws Exception {
-        return succeed(chatroomService.whitelistMessageAdd(objectNames));
+        return chatroomService.whitelistMessageAdd(objectNames);
     }
 
     @RequestMapping(value = "/message/remove", method = RequestMethod.POST)
     public Object messageRemove(@RequestBody String[] objectNames) throws Exception {
-        return succeed(chatroomService.whitelistMessageRemove(objectNames));
+        return chatroomService.whitelistMessageRemove(objectNames);
     }
 
     @RequestMapping(value = "/message/getList", method = RequestMethod.POST)
     public Object messageGetList() throws Exception {
-        return succeed(chatroomService.whitelistMessageGetList());
+        return chatroomService.whitelistMessageGetList();
     }
 }

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -376,7 +376,10 @@ public class RoomServiceImpl implements RoomService {
     }
 
     @Override
-    public Boolean kickMember(String roomId, String userId) throws ApiException, Exception {
+    public Boolean kickMember(String roomId) throws ApiException, Exception {
+        String token = SecurityUtils.getToken();
+        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        String userId = authUser.getId().toString();
         CheckUtils.checkArgument(userId != null, "userId must't be null");
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 
@@ -413,7 +416,10 @@ public class RoomServiceImpl implements RoomService {
     }
 
     @Override
-    public Boolean display(String roomId, int type, String userId, String uri) throws ApiException, Exception {
+    public Boolean display(String roomId, int type, String uri) throws ApiException, Exception {
+        String token = SecurityUtils.getToken();
+        SysUser authUser = sysUserFeignService.queryUserInfo(token);
+        String userId = authUser.getId().toString();
         log.info("display in room: {}, type = {}, uri = {}", roomId, type, uri);
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(type >= 0 && type < DisplayEnum.values().length, "type not exist");
@@ -969,6 +975,7 @@ public class RoomServiceImpl implements RoomService {
 
     @Override
     public Boolean changeRole(String roomId, String targetUserId, int targetRole) throws ApiException, Exception {
+
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(targetUserId != null, "userId must't be null");
         CheckUtils.checkArgument(roomDao.existsByRid(roomId), "room not exist");

mec-im/src/main/java/com/ym/service/RoomService.java

@@ -20,11 +20,11 @@ public interface RoomService {
     //only host
     public Boolean downgrade(String roomId, List<ReqChangeUserRoleData.ChangedUser> users) throws ApiException, Exception;
 
-    public Boolean kickMember(String roomId, String userId) throws ApiException, Exception;
+    public Boolean kickMember(String roomId) throws ApiException, Exception;
 
 
     //only teacher
-    public Boolean display(String roomId, int type, String userId, String uri) throws ApiException, Exception;
+    public Boolean display(String roomId, int type, String uri) throws ApiException, Exception;
 
     public String createWhiteBoard(String roomId) throws ApiException, Exception;