update

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

@@ -1,77 +0,0 @@
-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

@@ -1,5 +1,6 @@
 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;

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

@@ -1,5 +1,6 @@
 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;
@@ -13,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/block")
-public class BlockController extends BaseController{
+public class BlockController extends BaseController {
 
     @Autowired
     UserService userService;

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

@@ -1,5 +1,6 @@
 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;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/chatroom")
-public class ChatroomController extends BaseController{
+public class ChatroomController extends BaseController {
 
     @Autowired
     MessageService messageService;

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

@@ -1,9 +1,8 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.GroupService;
-import io.rong.models.Result;
 import io.rong.models.conversation.ConversationModel;
-import io.rong.models.group.GroupModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/conversation")
-public class ConversationController extends BaseController{
+public class ConversationController extends BaseController {
 
     @Autowired
     GroupService groupService;

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

@@ -1,8 +1,7 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.ChatroomService;
-import io.rong.models.response.ChatroomDemotionMsgResult;
-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;
@@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/demotion")
-public class DemotionController extends BaseController{
+public class DemotionController extends BaseController {
 
     @Autowired
     ChatroomService chatroomService;

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

@@ -1,9 +1,8 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.ChatroomService;
 import io.rong.models.chatroom.ChatroomModel;
-import io.rong.models.response.ChatroomDemotionMsgResult;
-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;
@@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/distribute")
-public class DistributeController extends BaseController{
+public class DistributeController extends BaseController {
 
     @Autowired
     ChatroomService chatroomService;

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

@@ -1,12 +1,13 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.GroupService;
 import com.ym.service.MessageService;
-import io.rong.methods.group.Group;
-import io.rong.models.Result;
 import io.rong.models.group.GroupModel;
 import io.rong.models.group.UserGroup;
-import io.rong.models.message.*;
+import io.rong.models.message.GroupMessage;
+import io.rong.models.message.MentionMessage;
+import io.rong.models.message.RecallMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/group")
-public class GroupController extends BaseController{
+public class GroupController extends BaseController {
 
     @Autowired
     MessageService messageService;

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

@@ -1,10 +1,7 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.MessageService;
-import io.rong.models.Result;
-import io.rong.models.message.GroupMessage;
-import io.rong.models.message.MentionMessage;
-import io.rong.models.message.RecallMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/history")
-public class HistoryController extends BaseController{
+public class HistoryController extends BaseController {
 
     @Autowired
     MessageService messageService;

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

@@ -1,11 +1,8 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.ChatroomService;
-import io.rong.models.Result;
 import io.rong.models.chatroom.ChatroomModel;
-import io.rong.models.group.GroupModel;
-import io.rong.models.response.ChatroomKeepaliveResult;
-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;
@@ -17,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/keepAlive")
-public class KeepAliveController extends BaseController{
+public class KeepAliveController extends BaseController {
 
     @Autowired
     ChatroomService chatroomService;

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

@@ -1,8 +1,7 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.GroupService;
-import io.rong.models.Result;
-import io.rong.models.group.GroupModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteAllMembers")
-public class MuteAllMembersController extends BaseController{
+public class MuteAllMembersController extends BaseController {
 
     @Autowired
     GroupService groupService;

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

@@ -1,7 +1,7 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.UserService;
-import io.rong.models.Result;
 import io.rong.models.chatroom.ChatroomModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteChatrooms")
-public class MuteChatroomsController extends BaseController{
+public class MuteChatroomsController extends BaseController {
 
     @Autowired
     UserService userService;

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

@@ -1,9 +1,8 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.UserService;
-import io.rong.models.Result;
 import io.rong.models.group.GroupModel;
-import io.rong.models.user.UserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteGroups")
-public class MuteGroupsController extends BaseController{
+public class MuteGroupsController extends BaseController {
 
     @Autowired
     UserService userService;

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

@@ -1,7 +1,7 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.GroupService;
-import io.rong.models.Result;
 import io.rong.models.group.GroupModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteMembers")
-public class MuteMembersController extends BaseController{
+public class MuteMembersController extends BaseController {
 
     @Autowired
     GroupService groupService;

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

@@ -1,7 +1,7 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.GroupService;
-import io.rong.models.Result;
 import io.rong.models.group.GroupModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/muteWhite")
-public class MuteWhiteController extends BaseController{
+public class MuteWhiteController extends BaseController {
 
     @Autowired
     GroupService groupService;

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

@@ -1,7 +1,7 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.MessageService;
-import io.rong.models.Result;
 import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
 import io.rong.models.message.TemplateMessage;
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/private")
-public class PrivateController extends BaseController{
+public class PrivateController extends BaseController {
 
     @Autowired
     MessageService messageService;

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

@@ -1,8 +1,7 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.MessageService;
-import io.rong.models.Result;
-import io.rong.models.message.BroadcastMessage;
 import io.rong.models.push.BroadcastModel;
 import io.rong.models.push.PushModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/push")
-public class PushController extends BaseController{
+public class PushController extends BaseController {
 
     @Autowired
     MessageService messageService;

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

@@ -3,6 +3,7 @@ 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;
@@ -15,7 +16,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/room")
-public class RoomController extends BaseController{
+public class RoomController extends BaseController {
     @Autowired
     RoomService roomService;
 

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

@@ -1,8 +1,7 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.ChatroomService;
-import io.rong.models.response.ListWordfilterResult;
-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;
@@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/sensitive")
-public class SensitiveController extends BaseController{
+public class SensitiveController extends BaseController {
 
     @Autowired
     ChatroomService chatroomService;

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

@@ -1,8 +1,10 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.MessageService;
-import io.rong.models.Result;
-import io.rong.models.message.*;
+import io.rong.models.message.BroadcastMessage;
+import io.rong.models.message.SystemMessage;
+import io.rong.models.message.TemplateMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/system")
-public class SystemController extends BaseController{
+public class SystemController extends BaseController {
 
     @Autowired
     MessageService messageService;

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

@@ -1,7 +1,7 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.UserService;
-import io.rong.models.Result;
 import io.rong.models.user.BatchTagModel;
 import io.rong.models.user.GetTagModel;
 import io.rong.models.user.TagModel;
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/tag")
-public class TagController extends BaseController{
+public class TagController extends BaseController {
 
     @Autowired
     UserService userService;

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

@@ -2,18 +2,22 @@ package com.ym.controller;
 
 import com.ym.common.ApiException;
 import com.ym.common.BaseResponse;
+import com.ym.mec.common.controller.BaseController;
 import com.ym.pojo.ReqUserData;
 import com.ym.service.UserService;
 import io.rong.models.user.UserModel;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Created by weiqinxiao on 2019/2/25.
  */
 @RestController
 @RequestMapping("/user")
-public class UserController extends BaseController{
+public class UserController extends BaseController {
 
     @Autowired
     UserService userService;

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

@@ -1,10 +1,8 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.ChatroomService;
-import io.rong.models.Result;
 import io.rong.models.chatroom.ChatroomModel;
-import io.rong.models.response.ChatroomWhitelistMsgResult;
-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;
@@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/whitelist")
-public class WhitelistController extends BaseController{
+public class WhitelistController extends BaseController {
 
     @Autowired
     ChatroomService chatroomService;