model调整

customer-service/src/main/java/com/ym/im/controller/StaffController.java

 package com.ym.im.controller;
 package com.ym.im.controller;
 
 
-import com.ym.im.entity.IdModel;
+import com.ym.im.entity.model.IdModel;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.service.StaffService;
 import com.ym.im.service.StaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

customer-service/src/main/java/com/ym/im/controller/UserController.java

 package com.ym.im.controller;
 package com.ym.im.controller;
 
 
-import com.ym.im.entity.IdModel;
+import com.ym.im.entity.model.IdModel;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.service.UserService;
 import com.ym.im.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;

customer-service/src/main/java/com/ym/im/entity/StaffSocketInfo.java

 package com.ym.im.entity;
 package com.ym.im.entity;
 
 
+import com.ym.im.entity.base.BaseSocketInfo;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;

customer-service/src/main/java/com/ym/im/entity/UserSocketInfo.java

 package com.ym.im.entity;
 package com.ym.im.entity;
 
 
-import com.ym.im.entity.model.PushTokenAndTypeModel;
+import com.ym.im.entity.base.BaseSocketInfo;
+import com.ym.im.entity.model.PushToken;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
@@ -20,7 +21,7 @@ public class UserSocketInfo extends BaseSocketInfo {
 
 
     private Integer scope;
     private Integer scope;
 
 
-    private PushTokenAndTypeModel pushToken;
+    private PushToken pushToken;
 
 
     private String col;
     private String col;
 
 

customer-service/src/main/java/com/ym/im/entity/BaseSocketInfo.java → customer-service/src/main/java/com/ym/im/entity/base/BaseSocketInfo.java

-package com.ym.im.entity;
+package com.ym.im.entity.base;
 
 
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import lombok.Data;
 import lombok.Data;

customer-service/src/main/java/com/ym/im/entity/IdModel.java → customer-service/src/main/java/com/ym/im/entity/model/IdModel.java

-package com.ym.im.entity;
+package com.ym.im.entity.model;
 
 
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;

customer-service/src/main/java/com/ym/im/entity/model/PushTokenAndTypeModel.java → customer-service/src/main/java/com/ym/im/entity/model/PushToken.java

@@ -8,7 +8,7 @@ import lombok.Data;
  * @date 2019/11/18
  * @date 2019/11/18
  */
  */
 @Data
 @Data
-public class PushTokenAndTypeModel {
+public class PushToken {
     private String pushToken;
     private String pushToken;
     private String pushType;
     private String pushType;
 }
 }

customer-service/src/main/java/com/ym/im/handler/WebSocketHandshakerHandler.java

 package com.ym.im.handler;
 package com.ym.im.handler;
 
 
-import com.ym.im.entity.BaseSocketInfo;
+import com.ym.im.entity.base.BaseSocketInfo;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.NettyConstant;
 import com.ym.im.entity.NettyConstant;
 import com.ym.im.entity.enums.PlatformEnum;
 import com.ym.im.entity.enums.PlatformEnum;

customer-service/src/main/java/com/ym/im/mq/Receiver.java

@@ -2,6 +2,7 @@ package com.ym.im.mq;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.ym.im.entity.*;
 import com.ym.im.entity.*;
+import com.ym.im.entity.model.IdModel;
 import com.ym.im.entity.model.OrderModel;
 import com.ym.im.entity.model.OrderModel;
 import com.ym.im.service.ChannelGroupService;
 import com.ym.im.service.ChannelGroupService;
 import com.ym.im.service.StaffService;
 import com.ym.im.service.StaffService;

customer-service/src/main/java/com/ym/im/service/StaffService.java

 package com.ym.im.service;
 package com.ym.im.service;
 
 
-import com.ym.im.entity.IdModel;
+import com.ym.im.entity.model.IdModel;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.StaffSocketInfo;
 import com.ym.im.entity.StaffSocketInfo;
 
 

customer-service/src/main/java/com/ym/im/service/UserService.java

 package com.ym.im.service;
 package com.ym.im.service;
 
 
-import com.ym.im.entity.IdModel;
+import com.ym.im.entity.model.IdModel;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.MsgBody;
 
 
 /**
 /**

customer-service/src/main/java/com/ym/im/service/impl/StaffServiceImpl.java

 package com.ym.im.service.impl;
 package com.ym.im.service.impl;
 
 
-import com.ym.im.entity.IdModel;
+import com.ym.im.entity.model.IdModel;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.StaffSocketInfo;
 import com.ym.im.entity.StaffSocketInfo;
 import com.ym.im.entity.UserSocketInfo;
 import com.ym.im.entity.UserSocketInfo;

customer-service/src/main/java/com/ym/im/service/impl/StaffSingleChatServiceImpl.java

@@ -3,6 +3,7 @@ package com.ym.im.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.ym.im.entity.*;
 import com.ym.im.entity.*;
+import com.ym.im.entity.model.IdModel;
 import com.ym.im.mq.Queue;
 import com.ym.im.mq.Queue;
 import com.ym.im.service.ChannelGroupService;
 import com.ym.im.service.ChannelGroupService;
 import com.ym.im.service.ChatRecordService;
 import com.ym.im.service.ChatRecordService;

customer-service/src/main/java/com/ym/im/service/impl/UserServiceImpl.java

@@ -2,6 +2,7 @@ package com.ym.im.service.impl;
 
 
 import com.ym.im.entity.*;
 import com.ym.im.entity.*;
 import com.ym.im.entity.base.ResultStatus;
 import com.ym.im.entity.base.ResultStatus;
+import com.ym.im.entity.model.IdModel;
 import com.ym.im.service.ChannelGroupService;
 import com.ym.im.service.ChannelGroupService;
 import com.ym.im.service.UserService;
 import com.ym.im.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

customer-service/src/main/java/com/ym/im/service/impl/UserSingleChatServiceImpl.java

@@ -3,6 +3,7 @@ package com.ym.im.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.ym.im.entity.*;
 import com.ym.im.entity.*;
+import com.ym.im.entity.model.IdModel;
 import com.ym.im.service.*;
 import com.ym.im.service.*;
 import com.ym.im.util.JsonUtils;
 import com.ym.im.util.JsonUtils;
 import com.ym.im.validation.group.ChatRecordReceiveGroup;
 import com.ym.im.validation.group.ChatRecordReceiveGroup;