update

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

@@ -61,6 +61,16 @@ public class SysUser {
 
 	private String email;
 
+	private String imToken;
+
+	public String getImToken() {
+		return imToken;
+	}
+
+	public void setImToken(String imToken) {
+		this.imToken = imToken;
+	}
+
 	public Integer getId() {
 		return id;
 	}

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -25,6 +25,7 @@
         <result column="nation_" property="nation"/>
         <result column="birthdate_" property="birthdate"/>
         <result column="email_" property="email"/>
+        <result column="im_token_" property="imToken"/>
     </resultMap>
 
     <!-- 查询条件 -->
@@ -62,8 +63,8 @@
         </selectKey>
         -->
         INSERT INTO sys_user
-        (id_,username_,password_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,lock_flag_,del_flag_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_)
-        VALUES(#{id},#{username},#{password},#{salt},#{phone},#{avatar},#{organId},#{createTime},#{updateTime},#{lockFlag},#{delFlag},#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{gender, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{nation},#{birthdate},#{email})
+        (im_token_,id_,username_,password_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,lock_flag_,del_flag_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_)
+        VALUES(#{imToken},#{id},#{username},#{password},#{salt},#{phone},#{avatar},#{organId},#{createTime},#{updateTime},#{lockFlag},#{delFlag},#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{gender, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{nation},#{birthdate},#{email})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -118,6 +119,9 @@
             <if test="organId != null">
                 organ_id_ = #{organId},
             </if>
+            <if test="imToken != null">
+                im_token_ = #{imToken},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -0,0 +1,77 @@
+package com.ym.controller;
+
+import com.ym.mec.common.entity.HttpResponseResult;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import javax.servlet.http.HttpServletRequest;
+
+@ControllerAdvice
+public class BaseController {
+	
+	private final static Logger logger = LoggerFactory.getLogger(BaseController.class);
+
+	public static HttpResponseResult succeed(Object object) {
+		return getResponseData(true, HttpStatus.OK, object, "");
+	}
+
+	public static HttpResponseResult succeed() {
+		return getResponseData(true, HttpStatus.OK, null, "");
+	}
+
+	public static HttpResponseResult succeed(String message) {
+		return failed(HttpStatus.OK, message);
+	}
+
+	public static HttpResponseResult succeedData(Object obj) {
+		return getResponseData(true, HttpStatus.OK, obj, "操作成功");
+	}
+
+	public static HttpResponseResult warned(String message) {
+		return failed(HttpStatus.MULTI_STATUS, message);
+	}
+
+	public static HttpResponseResult failed() {
+		return failed("");
+	}
+
+	public static HttpResponseResult failed(String msg) {
+		return failed(HttpStatus.INTERNAL_SERVER_ERROR, msg);
+	}
+
+	public static HttpResponseResult failed(HttpStatus statusCode, String msg) {
+		return getResponseData(false, statusCode, null, msg);
+	}
+
+	private static HttpResponseResult getResponseData(boolean status, HttpStatus statusCode, Object data, String message) {
+		HttpResponseResult obj = new HttpResponseResult();
+		obj.setStatus(status);
+		obj.setCode(statusCode.value());
+		obj.setData(data);
+		obj.setMsg(message);
+		return obj;
+	}
+	
+	/**
+	 * 处理一般异常
+	 * 
+	 * @param ex
+	 * @param request
+	 * @return
+	 */
+	@ExceptionHandler(Exception.class)
+	public HttpResponseResult handleException(Exception ex, HttpServletRequest request) {
+		Throwable e = ExceptionUtils.getRootCause(ex);
+		if (e == null) {
+			e = ex;
+		}
+
+		logger.error("System Error", e);
+		return failed(e.getMessage());
+	}
+
+}

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

@@ -13,23 +13,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/blackList")
-public class BlackListController {
+public class BlackListController extends BaseController {
 
     @Autowired
     UserService userService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Object add(@RequestBody UserModel userModel) throws Exception {
-        return userService.blackListAdd(userModel);
+        return succeed(userService.blackListAdd(userModel));
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Object remove(@RequestBody UserModel userModel) throws Exception {
-        return userService.blackListRemove(userModel);
+        return succeed(userService.blackListRemove(userModel));
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
     public Object getList(@RequestBody UserModel userModel) throws Exception {
-        return userService.blackListGetList(userModel);
+        return succeed(userService.blackListGetList(userModel));
     }
 }

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

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

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

@@ -2,13 +2,9 @@ package com.ym.controller;
 
 import com.ym.service.ChatroomService;
 import com.ym.service.MessageService;
-import io.rong.models.Result;
 import io.rong.models.chatroom.ChatroomMember;
 import io.rong.models.chatroom.ChatroomModel;
 import io.rong.models.message.ChatroomMessage;
-import io.rong.models.response.CheckChatRoomUserResult;
-import io.rong.models.response.ListGagChatroomUserResult;
-import io.rong.models.response.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/chatroom")
-public class ChatroomController {
+public class ChatroomController extends BaseController{
 
     @Autowired
     MessageService messageService;
@@ -28,62 +24,62 @@ public class ChatroomController {
     ChatroomService chatroomCreate;
 
     @RequestMapping(value = "/send", method = RequestMethod.POST)
-    public Result send(@RequestBody ChatroomMessage chatroomMessage) throws Exception {
-        return messageService.chatroomSend(chatroomMessage);
+    public Object send(@RequestBody ChatroomMessage chatroomMessage) throws Exception {
+        return succeed(messageService.chatroomSend(chatroomMessage));
     }
 
     @RequestMapping(value = "/broadcast", method = RequestMethod.POST)
-    public Result broadcast(@RequestBody ChatroomMessage chatroomMessage) throws Exception {
-        return messageService.chatroomBroadcast(chatroomMessage);
+    public Object broadcast(@RequestBody ChatroomMessage chatroomMessage) throws Exception {
+        return succeed(messageService.chatroomBroadcast(chatroomMessage));
     }
 
     @RequestMapping(value = "/create", method = RequestMethod.POST)
-    public Result create(@RequestBody ChatroomModel[] chatroomModels) throws Exception {
-        return chatroomCreate.chatroomCreate(chatroomModels);
+    public Object create(@RequestBody ChatroomModel[] chatroomModels) throws Exception {
+        return succeed(chatroomCreate.chatroomCreate(chatroomModels));
     }
 
     @RequestMapping(value = "/destory", method = RequestMethod.POST)
-    public Result destory(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomCreate.chatroomDestory(chatroomModel);
+    public Object destory(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomCreate.chatroomDestory(chatroomModel));
     }
 
     @RequestMapping(value = "/get", method = RequestMethod.POST)
-    public Result get(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomCreate.chatroomGet(chatroomModel);
+    public Object get(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomCreate.chatroomGet(chatroomModel));
     }
 
     @RequestMapping(value = "/isExist", method = RequestMethod.POST)
-    public CheckChatRoomUserResult isExist(@RequestBody ChatroomMember chatroomMember) throws Exception {
-        return chatroomCreate.chatroomIsExit(chatroomMember);
+    public Object isExist(@RequestBody ChatroomMember chatroomMember) throws Exception {
+        return succeed(chatroomCreate.chatroomIsExit(chatroomMember));
     }
 
     @RequestMapping(value = "/block/add", method = RequestMethod.POST)
-    public Result blockAdd(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomCreate.chatroomBlockAdd(chatroomModel);
+    public Object blockAdd(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomCreate.chatroomBlockAdd(chatroomModel));
     }
 
     @RequestMapping(value = "/block/remove", method = RequestMethod.POST)
-    public Result blockRemove(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomCreate.chatroomBlockRemove(chatroomModel);
+    public Object blockRemove(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomCreate.chatroomBlockRemove(chatroomModel));
     }
 
     @RequestMapping(value = "/block/getList", method = RequestMethod.POST)
-    public Result blockGetList(@RequestBody String chatroomId) throws Exception {
-        return chatroomCreate.chatroomBlockGetList(chatroomId);
+    public Object blockGetList(@RequestBody String chatroomId) throws Exception {
+        return succeed(chatroomCreate.chatroomBlockGetList(chatroomId));
     }
 
     @RequestMapping(value = "/muteMembers/add", method = RequestMethod.POST)
-    public ResponseResult muteMembersAdd(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomCreate.chatroomMuteMembersAdd(chatroomModel);
+    public Object muteMembersAdd(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomCreate.chatroomMuteMembersAdd(chatroomModel));
     }
 
     @RequestMapping(value = "/muteMembers/remove", method = RequestMethod.POST)
-    public ResponseResult muteMembersRemove(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomCreate.chatroomMuteMembersRemove(chatroomModel);
+    public Object muteMembersRemove(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomCreate.chatroomMuteMembersRemove(chatroomModel));
     }
 
     @RequestMapping(value = "/muteMembers/getList", method = RequestMethod.POST)
-    public ListGagChatroomUserResult muteMembersGetList(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomCreate.chatroomMuteMembersGetList(chatroomModel);
+    public Object muteMembersGetList(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomCreate.chatroomMuteMembersGetList(chatroomModel));
     }
 }

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

@@ -15,18 +15,18 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/conversation")
-public class ConversationController {
+public class ConversationController extends BaseController{
 
     @Autowired
     GroupService groupService;
 
     @RequestMapping(value = "/mute", method = RequestMethod.POST)
-    public Result mute(@RequestBody ConversationModel conversationModel) throws Exception {
-        return groupService.conversationMute(conversationModel);
+    public Object mute(@RequestBody ConversationModel conversationModel) throws Exception {
+        return succeed(groupService.conversationMute(conversationModel));
     }
 
     @RequestMapping(value = "/unmute", method = RequestMethod.POST)
-    public Result unmute(@RequestBody ConversationModel conversationModel) throws Exception {
-        return groupService.conversationUnmute(conversationModel);
+    public Object unmute(@RequestBody ConversationModel conversationModel) throws Exception {
+        return succeed(groupService.conversationUnmute(conversationModel));
     }
 }

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

@@ -14,23 +14,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/demotion")
-public class DemotionController {
+public class DemotionController extends BaseController{
 
     @Autowired
     ChatroomService chatroomService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public ResponseResult add(@RequestBody String[] objectNames) throws Exception {
-        return chatroomService.demotionAdd(objectNames);
+    public Object add(@RequestBody String[] objectNames) throws Exception {
+        return succeed(chatroomService.demotionAdd(objectNames));
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public ResponseResult remove(@RequestBody String[] objectNames) throws Exception {
-        return chatroomService.demotionRemove(objectNames);
+    public Object remove(@RequestBody String[] objectNames) throws Exception {
+        return succeed(chatroomService.demotionRemove(objectNames));
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
-    public ChatroomDemotionMsgResult getList() throws Exception {
-        return chatroomService.demotionGetList();
+    public Object getList() throws Exception {
+        return succeed(chatroomService.demotionGetList());
     }
 }

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

@@ -15,18 +15,18 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/distribute")
-public class DistributeController {
+public class DistributeController extends BaseController{
 
     @Autowired
     ChatroomService chatroomService;
 
     @RequestMapping(value = "/stop", method = RequestMethod.POST)
-    public ResponseResult stop(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomService.distributeStop(chatroomModel);
+    public Object stop(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomService.distributeStop(chatroomModel));
     }
 
     @RequestMapping(value = "/resume", method = RequestMethod.POST)
-    public ResponseResult resume(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomService.distributeResume(chatroomModel);
+    public Object resume(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomService.distributeResume(chatroomModel));
     }
 }

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

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/group")
-public class GroupController {
+public class GroupController extends BaseController{
 
     @Autowired
     MessageService messageService;
@@ -26,57 +26,57 @@ public class GroupController {
     GroupService groupService;
 
     @RequestMapping(value = "/send", method = RequestMethod.POST)
-    public Result send(@RequestBody GroupMessage groupMessage) throws Exception {
-        return messageService.groupSend(groupMessage);
+    public Object send(@RequestBody GroupMessage groupMessage) throws Exception {
+        return succeed(messageService.groupSend(groupMessage));
     }
 
     @RequestMapping(value = "/sendDirection", method = RequestMethod.POST)
-    public Result sendDirection(@RequestBody GroupMessage groupMessage) throws Exception {
-        return messageService.groupSendDirection(groupMessage);
+    public Object sendDirection(@RequestBody GroupMessage groupMessage) throws Exception {
+        return succeed(messageService.groupSendDirection(groupMessage));
     }
 
     @RequestMapping(value = "/sendMention", method = RequestMethod.POST)
-    public Result sendMention(@RequestBody MentionMessage mentionMessage) throws Exception {
-        return messageService.groupSendMention(mentionMessage);
+    public Object sendMention(@RequestBody MentionMessage mentionMessage) throws Exception {
+        return succeed(messageService.groupSendMention(mentionMessage));
     }
 
     @RequestMapping(value = "/recall", method = RequestMethod.POST)
-    public Result recall(@RequestBody RecallMessage recallMessage) throws Exception {
-        return messageService.groupRecall(recallMessage);
+    public Object recall(@RequestBody RecallMessage recallMessage) throws Exception {
+        return succeed(messageService.groupRecall(recallMessage));
     }
 
     @RequestMapping(value = "/sync", method = RequestMethod.POST)
-    public Result sync(@RequestBody UserGroup userGroup) throws Exception {
-        return groupService.groupSync(userGroup);
+    public Object sync(@RequestBody UserGroup userGroup) throws Exception {
+        return succeed(groupService.groupSync(userGroup));
     }
 
     @RequestMapping(value = "/create", method = RequestMethod.POST)
-    public Result create(@RequestBody GroupModel groupModel) throws Exception {
-        return groupService.groupCreate(groupModel);
+    public Object create(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(groupService.groupCreate(groupModel));
     }
 
     @RequestMapping(value = "/get", method = RequestMethod.POST)
-    public Result get(@RequestBody GroupModel groupModel) throws Exception {
-        return groupService.groupGet(groupModel);
+    public Object get(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(groupService.groupGet(groupModel));
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public Result update(@RequestBody GroupModel groupModel) throws Exception {
-        return groupService.groupUpdate(groupModel);
+    public Object update(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(groupService.groupUpdate(groupModel));
     }
 
     @RequestMapping(value = "/join", method = RequestMethod.POST)
-    public Result join(@RequestBody GroupModel groupModel) throws Exception {
-        return groupService.groupJoin(groupModel);
+    public Object join(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(groupService.groupJoin(groupModel));
     }
 
     @RequestMapping(value = "/quit", method = RequestMethod.POST)
-    public Result quit(@RequestBody GroupModel groupModel) throws Exception {
-        return groupService.groupQuit(groupModel);
+    public Object quit(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(groupService.groupQuit(groupModel));
     }
 
     @RequestMapping(value = "/dismiss", method = RequestMethod.POST)
-    public Result dismiss(@RequestBody GroupModel groupModel) throws Exception {
-        return groupService.groupDismiss(groupModel);
+    public Object dismiss(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(groupService.groupDismiss(groupModel));
     }
 }

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

@@ -16,18 +16,18 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/history")
-public class HistoryController {
+public class HistoryController extends BaseController{
 
     @Autowired
     MessageService messageService;
 
     @RequestMapping(value = "/get", method = RequestMethod.POST)
-    public Result get(@RequestBody String date) throws Exception {
-        return messageService.historyGet(date);
+    public Object get(@RequestBody String date) throws Exception {
+        return succeed(messageService.historyGet(date));
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public Result remove(@RequestBody String date) throws Exception {
-        return messageService.historyRemove(date);
+    public Object remove(@RequestBody String date) throws Exception {
+        return succeed(messageService.historyRemove(date));
     }
 }

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

@@ -17,23 +17,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/keepAlive")
-public class KeepAliveController {
+public class KeepAliveController extends BaseController{
 
     @Autowired
     ChatroomService chatroomService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public ResponseResult add(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomService.keepAliveAdd(chatroomModel);
+    public Object add(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomService.keepAliveAdd(chatroomModel));
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public ResponseResult remove(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomService.keepAliveRemove(chatroomModel);
+    public Object remove(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomService.keepAliveRemove(chatroomModel));
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
-    public ChatroomKeepaliveResult getList() throws Exception {
-        return chatroomService.keepAliveGetList();
+    public Object getList() throws Exception {
+        return succeed(chatroomService.keepAliveGetList());
     }
 }

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

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

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

@@ -14,23 +14,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteChatrooms")
-public class MuteChatroomsController {
+public class MuteChatroomsController extends BaseController{
 
     @Autowired
     UserService userService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public Result add(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return userService.muteChatroomsAdd(chatroomModel);
+    public Object add(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(userService.muteChatroomsAdd(chatroomModel));
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public Result remove(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return userService.muteChatroomsRemove(chatroomModel);
+    public Object remove(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(userService.muteChatroomsRemove(chatroomModel));
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
-    public Result getList() throws Exception {
-        return userService.muteChatroomsGetList();
+    public Object getList() throws Exception {
+        return succeed(userService.muteChatroomsGetList());
     }
 }

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

@@ -15,23 +15,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteGroups")
-public class MuteGroupsController {
+public class MuteGroupsController extends BaseController{
 
     @Autowired
     UserService userService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public Result add(@RequestBody GroupModel groupModel) throws Exception {
-        return userService.muteGroupsAdd(groupModel);
+    public Object add(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(userService.muteGroupsAdd(groupModel));
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public Result remove(@RequestBody GroupModel groupModel) throws Exception {
-        return userService.muteGroupsRemove(groupModel);
+    public Object remove(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(userService.muteGroupsRemove(groupModel));
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
-    public Result getList() throws Exception {
-        return userService.muteGroupsGetList();
+    public Object getList() throws Exception {
+        return succeed(userService.muteGroupsGetList());
     }
 }

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

@@ -14,23 +14,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteMembers")
-public class MuteMembersController {
+public class MuteMembersController extends BaseController{
 
     @Autowired
     GroupService groupService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public Result add(@RequestBody GroupModel groupModel) throws Exception {
-        return groupService.muteMembersAdd(groupModel);
+    public Object add(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(groupService.muteMembersAdd(groupModel));
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public Result remove(@RequestBody GroupModel groupModel) throws Exception {
-        return groupService.muteMembersRemove(groupModel);
+    public Object remove(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(groupService.muteMembersRemove(groupModel));
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
-    public Result getList(String groupId) throws Exception {
-        return groupService.muteMembersGetList(groupId);
+    public Object getList(String groupId) throws Exception {
+        return succeed(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 {
+public class MuteWhiteController extends BaseController{
 
     @Autowired
     GroupService groupService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public Result add(@RequestBody GroupModel groupModel) throws Exception {
-        return groupService.muteWhiteAdd(groupModel);
+    public Object add(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(groupService.muteWhiteAdd(groupModel));
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public Result remove(@RequestBody GroupModel groupModel) throws Exception {
-        return groupService.muteWhiteRemove(groupModel);
+    public Object remove(@RequestBody GroupModel groupModel) throws Exception {
+        return succeed(groupService.muteWhiteRemove(groupModel));
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
-    public Result getList(@RequestBody String groupId) throws Exception {
-        return groupService.muteWhiteGetList(groupId);
+    public Object getList(@RequestBody String groupId) throws Exception {
+        return succeed(groupService.muteWhiteGetList(groupId));
     }
 }

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

@@ -16,23 +16,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/private")
-public class PrivateController {
+public class PrivateController extends BaseController{
 
     @Autowired
     MessageService messageService;
 
     @RequestMapping(value = "/send", method = RequestMethod.POST)
-    public Result send(@RequestBody PrivateMessage privateMessage) throws Exception {
-        return messageService.privateSend(privateMessage);
+    public Object send(@RequestBody PrivateMessage privateMessage) throws Exception {
+        return succeed(messageService.privateSend(privateMessage));
     }
 
     @RequestMapping(value = "/recall", method = RequestMethod.POST)
-    public Result recall(@RequestBody RecallMessage recallMessage) throws Exception {
-        return messageService.privateRecall(recallMessage);
+    public Object recall(@RequestBody RecallMessage recallMessage) throws Exception {
+        return succeed(messageService.privateRecall(recallMessage));
     }
 
     @RequestMapping(value = "/sendTemplate", method = RequestMethod.POST)
-    public Result sendTemplate(@RequestBody TemplateMessage templateMessage) throws Exception {
-        return messageService.privateSendTemplate(templateMessage);
+    public Object sendTemplate(@RequestBody TemplateMessage templateMessage) throws Exception {
+        return succeed(messageService.privateSendTemplate(templateMessage));
     }
 }

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

@@ -16,18 +16,18 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/push")
-public class PushController {
+public class PushController extends BaseController{
 
     @Autowired
     MessageService messageService;
 
     @RequestMapping(value = "/push", method = RequestMethod.POST)
-    public Result push(@RequestBody PushModel pushModel) throws Exception {
-        return messageService.pushPush(pushModel);
+    public Object push(@RequestBody PushModel pushModel) throws Exception {
+        return succeed(messageService.pushPush(pushModel));
     }
 
     @RequestMapping(value = "/message", method = RequestMethod.POST)
-    public Result message(@RequestBody BroadcastModel broadcastModel) throws Exception {
-        return messageService.pushMessage(broadcastModel);
+    public Object message(@RequestBody BroadcastModel broadcastModel) throws Exception {
+        return succeed(messageService.pushMessage(broadcastModel));
     }
 }

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

@@ -15,86 +15,86 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/room")
-public class RoomController {
+public class RoomController extends BaseController{
     @Autowired
     RoomService roomService;
 
     @RequestMapping(value = "/join", method = RequestMethod.POST)
-    public BaseResponse<RoomResult> joinRoom(@RequestBody ReqUserData data)
+    public Object joinRoom(@RequestBody ReqUserData data)
             throws ApiException, Exception {
         RoomResult roomResult = roomService.joinRoom(data.getUserName(), data.getRoomId(), data.isAudience(), data.isDisableCamera());
-        return new BaseResponse<>(roomResult);
+        return succeed(new BaseResponse<>(roomResult));
     }
 
     @RequestMapping(value = "/leave", method = RequestMethod.POST)
-    public BaseResponse<Boolean> leaveRoom(@RequestBody ReqUserData data)
+    public Object leaveRoom(@RequestBody ReqUserData data)
             throws ApiException, Exception {
         boolean result = roomService.leaveRoom(data.getRoomId());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/downgrade", method = RequestMethod.POST)
-    public BaseResponse<Boolean> downRole(@RequestBody ReqChangeUserRoleData data)
+    public Object downRole(@RequestBody ReqChangeUserRoleData data)
             throws ApiException, Exception {
         boolean result = roomService.downgrade(data.getRoomId(), data.getUsers());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/kick", method = RequestMethod.POST)
-    public BaseResponse<Boolean> kickMember(@RequestBody ReqUserData data)
+    public Object kickMember(@RequestBody ReqUserData data)
             throws ApiException, Exception {
         boolean result = roomService.kickMember(data.getRoomId(), data.getUserId());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     //only teacher
     @RequestMapping(value = "/display", method = RequestMethod.POST)
-    public BaseResponse<Boolean> display(@RequestBody ReqDisplayData data)
+    public Object display(@RequestBody ReqDisplayData data)
             throws ApiException, Exception {
         boolean result = roomService.display(data.getRoomId(), data.getType(), data.getUserId(), data.getUri());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/whiteboard/create", method = RequestMethod.POST)
-    public BaseResponse<String> createWhiteBoard(@RequestBody ReqWhiteboardData data)
+    public Object createWhiteBoard(@RequestBody ReqWhiteboardData data)
             throws ApiException, Exception {
         String result = roomService.createWhiteBoard(data.getRoomId());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
 
     @RequestMapping(value = "/whiteboard/delete", method = RequestMethod.POST)
-    public BaseResponse<Boolean> destroyWhiteBoard(@RequestBody ReqWhiteboardData data)
+    public Object destroyWhiteBoard(@RequestBody ReqWhiteboardData data)
             throws ApiException, Exception {
         boolean result = roomService.deleteWhiteboard(data.getRoomId(), data.getWhiteboardId());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/whiteboard/list", method = RequestMethod.GET)
-    public BaseResponse<List<RoomResult.WhiteboardResult>> getWhiteBoard(@RequestParam String roomId)
+    public Object getWhiteBoard(@RequestParam String roomId)
             throws ApiException, Exception {
         List<RoomResult.WhiteboardResult> whiteboards = roomService.getWhiteboard(roomId);
-        return new BaseResponse<>(whiteboards);
+        return succeed(new BaseResponse<>(whiteboards));
     }
 
     @RequestMapping(value = "/device/approve", method = RequestMethod.POST)
-    public BaseResponse<Boolean> approveControlDevice(@RequestBody ReqDeviceControlData data)
+    public Object approveControlDevice(@RequestBody ReqDeviceControlData data)
             throws ApiException, Exception {
         boolean result;
         result = roomService.approveControlDevice(data.getRoomId(), data.getTicket());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/device/reject", method = RequestMethod.POST)
-    public BaseResponse<Boolean> rejectControlDevice(@RequestBody ReqDeviceControlData data)
+    public Object rejectControlDevice(@RequestBody ReqDeviceControlData data)
             throws ApiException, Exception {
         boolean result;
         result = roomService.rejectControlDevice(data.getRoomId(), data.getTicket());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/device/control", method = RequestMethod.POST)
-    public BaseResponse<Boolean> controlDevice(@RequestBody ReqDeviceControlData data)
+    public Object controlDevice(@RequestBody ReqDeviceControlData data)
             throws ApiException, Exception {
         boolean result;
         if (data.getCameraOn() != null) {
@@ -104,11 +104,11 @@ public class RoomController {
         } else {
             throw new ApiException(ErrorEnum.ERR_REQUEST_PARA_ERR);
         }
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/device/sync", method = RequestMethod.POST)
-    public BaseResponse<Boolean> syncDeviceState(@RequestBody ReqDeviceControlData data)
+    public Object syncDeviceState(@RequestBody ReqDeviceControlData data)
             throws ApiException, Exception {
         boolean result;
         if (data.getCameraOn() != null) {
@@ -118,86 +118,86 @@ public class RoomController {
         } else {
             throw new ApiException(ErrorEnum.ERR_REQUEST_PARA_ERR);
         }
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/whiteboard/turn-page", method = RequestMethod.POST)
-    public BaseResponse<Boolean> turnPage(@RequestBody ReqWhiteboardData data)
+    public Object turnPage(@RequestBody ReqWhiteboardData data)
             throws ApiException, Exception {
         boolean result = roomService.turnWhiteBoardPage(data.getRoomId(), data.getWhiteboardId(), data.getPage());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/members", method = RequestMethod.GET)
-    public BaseResponse<List<RoomResult.MemberResult>> getMembers(@RequestParam String roomId)
+    public Object getMembers(@RequestParam String roomId)
             throws ApiException, Exception {
         List<RoomResult.MemberResult> whiteboards = roomService.getMembers(roomId);
-        return new BaseResponse<>(whiteboards);
+        return succeed(new BaseResponse<>(whiteboards));
     }
 
     @RequestMapping(value = "/speech/apply", method = RequestMethod.POST)
-    public BaseResponse<Boolean> apply(@RequestBody ReqSpeechData data)
+    public Object apply(@RequestBody ReqSpeechData data)
             throws ApiException, Exception {
         Boolean result = roomService.applySpeech(data.getRoomId());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/speech/approve", method = RequestMethod.POST)
-    public BaseResponse<Boolean> approval(@RequestBody ReqSpeechData data)
+    public Object approval(@RequestBody ReqSpeechData data)
             throws ApiException, Exception {
         Boolean result = roomService.approveSpeech(data.getRoomId(), data.getTicket());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/speech/reject", method = RequestMethod.POST)
-    public BaseResponse<Boolean> reject(@RequestBody ReqSpeechData data)
+    public Object reject(@RequestBody ReqSpeechData data)
             throws ApiException, Exception {
         Boolean result = roomService.rejectSpeech(data.getRoomId(), data.getTicket());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/transfer", method = RequestMethod.POST)
-    public BaseResponse<Boolean> transfer(@RequestBody ReqUpgradeRoleData data)
+    public Object transfer(@RequestBody ReqUpgradeRoleData data)
             throws ApiException, Exception {
         Boolean result = roomService.transfer(data.getRoomId(), data.getUserId());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/upgrade/invite", method = RequestMethod.POST)
-    public BaseResponse<Boolean> inviteUpgradeRole(@RequestBody ReqUpgradeRoleData data)
+    public Object inviteUpgradeRole(@RequestBody ReqUpgradeRoleData data)
             throws ApiException, Exception {
         Boolean result = roomService.inviteUpgradeRole(data.getRoomId(), data.getUserId(), data.getRole());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/upgrade/approve", method = RequestMethod.POST)
-    public BaseResponse<Boolean> approveUpgradeRole(@RequestBody ReqUpgradeRoleData data)
+    public Object approveUpgradeRole(@RequestBody ReqUpgradeRoleData data)
             throws ApiException, Exception {
         Boolean result = roomService.approveUpgradeRole(data.getRoomId(), data.getTicket());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/upgrade/reject", method = RequestMethod.POST)
-    public BaseResponse<Boolean> rejectUpgradeRole(@RequestBody ReqUpgradeRoleData data)
+    public Object rejectUpgradeRole(@RequestBody ReqUpgradeRoleData data)
             throws ApiException, Exception {
         Boolean result = roomService.rejectUpgradeRole(data.getRoomId(), data.getTicket());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/change-role", method = RequestMethod.POST)
-    public BaseResponse<Boolean> changeRole(@RequestBody ReqChangeRole data)
+    public Object changeRole(@RequestBody ReqChangeRole data)
             throws ApiException, Exception {
         Boolean result = roomService.changeRole(data.getRoomId(), data.getUserId(), data.getRole());
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 
     @RequestMapping(value = "/members/online-status", method = RequestMethod.POST)
-    public BaseResponse<Boolean> memberOnlineStatus(@RequestBody List<ReqMemberOnlineStatus> statusList,
+    public Object memberOnlineStatus(@RequestBody List<ReqMemberOnlineStatus> statusList,
                                                     @RequestParam(value = "timestamp", required = false) String timestamp,
                                                     @RequestParam(value = "nonce", required = false) String nonce,
                                                     @RequestParam(value = "signature", required = false) String signature)
             throws ApiException, Exception {
         Boolean result = roomService.memberOnlineStatus(statusList, nonce, timestamp, signature);
-        return new BaseResponse<>(result);
+        return succeed(new BaseResponse<>(result));
     }
 }

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

@@ -14,23 +14,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/sensitive")
-public class SensitiveController {
+public class SensitiveController extends BaseController{
 
     @Autowired
     ChatroomService chatroomService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public ResponseResult add(@RequestBody String word) throws Exception {
-        return chatroomService.sensitiveAdd(word);
+    public Object add(@RequestBody String word) throws Exception {
+        return succeed(chatroomService.sensitiveAdd(word));
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public ResponseResult remove(@RequestBody String word) throws Exception {
-        return chatroomService.sensitiveRemove(word);
+    public Object remove(@RequestBody String word) throws Exception {
+        return succeed(chatroomService.sensitiveRemove(word));
     }
 
     @RequestMapping(value = "/getList", method = RequestMethod.POST)
-    public ListWordfilterResult getList() throws Exception {
-        return chatroomService.sensitiveGetList();
+    public Object getList() throws Exception {
+        return succeed(chatroomService.sensitiveGetList());
     }
 }

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

@@ -14,23 +14,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/system")
-public class SystemController {
+public class SystemController extends BaseController{
 
     @Autowired
     MessageService messageService;
 
     @RequestMapping(value = "/send", method = RequestMethod.POST)
-    public Result send(@RequestBody SystemMessage systemMessage) throws Exception {
-        return messageService.systemSend(systemMessage);
+    public Object send(@RequestBody SystemMessage systemMessage) throws Exception {
+        return succeed(messageService.systemSend(systemMessage));
     }
 
     @RequestMapping(value = "/broadcast", method = RequestMethod.POST)
-    public Result broadcast(@RequestBody BroadcastMessage broadcastMessage) throws Exception {
-        return messageService.systemBroadcast(broadcastMessage);
+    public Object broadcast(@RequestBody BroadcastMessage broadcastMessage) throws Exception {
+        return succeed(messageService.systemBroadcast(broadcastMessage));
     }
 
     @RequestMapping(value = "/sendTemplate", method = RequestMethod.POST)
-    public Result sendTemplate(@RequestBody TemplateMessage templateMessage) throws Exception {
-        return messageService.systemSendTemplate(templateMessage);
+    public Object sendTemplate(@RequestBody TemplateMessage templateMessage) throws Exception {
+        return succeed(messageService.systemSendTemplate(templateMessage));
     }
 }

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

@@ -16,23 +16,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/tag")
-public class TagController {
+public class TagController extends BaseController{
 
     @Autowired
     UserService userService;
 
     @RequestMapping(value = "/set", method = RequestMethod.POST)
-    public Result add(@RequestBody TagModel tagModel) throws Exception {
-        return userService.tagSet(tagModel);
+    public Object add(@RequestBody TagModel tagModel) throws Exception {
+        return succeed(userService.tagSet(tagModel));
     }
 
     @RequestMapping(value = "/batchSet", method = RequestMethod.POST)
-    public Result remove(@RequestBody BatchTagModel batchTagModel) throws Exception {
-        return userService.tagBatchSet(batchTagModel);
+    public Object remove(@RequestBody BatchTagModel batchTagModel) throws Exception {
+        return succeed(userService.tagBatchSet(batchTagModel));
     }
 
     @RequestMapping(value = "/get", method = RequestMethod.POST)
-    public Result getList(GetTagModel getTagModel) throws Exception {
-        return userService.tagGet(getTagModel);
+    public Object getList(GetTagModel getTagModel) throws Exception {
+        return succeed(userService.tagGet(getTagModel));
     }
 }

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

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

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

@@ -16,38 +16,38 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/whitelist")
-public class WhitelistController {
+public class WhitelistController extends BaseController{
 
     @Autowired
     ChatroomService chatroomService;
 
     @RequestMapping(value = "/user/add", method = RequestMethod.POST)
-    public ResponseResult userAdd(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomService.whitelistUserAdd(chatroomModel);
+    public Object userAdd(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomService.whitelistUserAdd(chatroomModel));
     }
 
     @RequestMapping(value = "/user/remove", method = RequestMethod.POST)
-    public ResponseResult userRemove(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomService.whitelistUserRemove(chatroomModel);
+    public Object userRemove(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomService.whitelistUserRemove(chatroomModel));
     }
 
     @RequestMapping(value = "/user/getList", method = RequestMethod.POST)
-    public Result userGetList(@RequestBody ChatroomModel chatroomModel) throws Exception {
-        return chatroomService.whitelistUserGetList(chatroomModel);
+    public Object userGetList(@RequestBody ChatroomModel chatroomModel) throws Exception {
+        return succeed(chatroomService.whitelistUserGetList(chatroomModel));
     }
 
     @RequestMapping(value = "/message/add", method = RequestMethod.POST)
-    public ResponseResult messageAdd(@RequestBody String[] objectNames) throws Exception {
-        return chatroomService.whitelistMessageAdd(objectNames);
+    public Object messageAdd(@RequestBody String[] objectNames) throws Exception {
+        return succeed(chatroomService.whitelistMessageAdd(objectNames));
     }
 
     @RequestMapping(value = "/message/remove", method = RequestMethod.POST)
-    public ResponseResult messageRemove(@RequestBody String[] objectNames) throws Exception {
-        return chatroomService.whitelistMessageRemove(objectNames);
+    public Object messageRemove(@RequestBody String[] objectNames) throws Exception {
+        return succeed(chatroomService.whitelistMessageRemove(objectNames));
     }
 
     @RequestMapping(value = "/message/getList", method = RequestMethod.POST)
-    public ChatroomWhitelistMsgResult messageGetList() throws Exception {
-        return chatroomService.whitelistMessageGetList();
+    public Object messageGetList() throws Exception {
+        return succeed(chatroomService.whitelistMessageGetList());
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -0,0 +1,53 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.web.dal.entity.ClassGroup;
+import com.ym.mec.web.service.ClassGroupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+@RequestMapping("category")
+@Api(tags = "班级服务")
+@RestController
+public class ClassGroupController extends BaseController {
+
+    @Autowired
+    private ClassGroupService classGroupService;
+
+    @ApiOperation(value = "新增班级")
+    @PostMapping("/add")
+    public Object add(@RequestBody ClassGroup classGroup) {
+        Date date = new Date();
+        classGroup.setCreateTime(date);
+        classGroup.setUpdateTime(date);
+        classGroupService.insert(classGroup);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除班级")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "班级编号", required = true) @PathVariable("id") Integer id) {
+        classGroupService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改班级")
+    @PutMapping("/update")
+    public Object update(@RequestBody ClassGroup classGroup) {
+        classGroup.setUpdateTime(new Date());
+        classGroupService.update(classGroup);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询班级列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(@RequestBody QueryInfo queryInfo) {
+        return succeed(classGroupService.queryPage(queryInfo));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/GoodsController.java

@@ -10,6 +10,7 @@ import com.ym.mec.web.service.SubjectService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Date;
 import java.util.HashMap;

mec-web/src/main/java/com/ym/mec/web/dal/entity/Goods.java

@@ -14,7 +14,7 @@ public class Goods {
 	private Integer id;
 	
 	/** 产品分类 */
-	@ApiModelProperty(value = "产品分类",required = false)
+	@ApiModelProperty(value = "产品分类1乐器，2教材，3辅件",required = false)
 	private Integer goodsCategoryId;
 	
 	/** 商品货号 */