Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into dev/lanpingxiong

c8b94410 · lpx · 5aead0b6 · a1a82214 · c8b94410 · c8b94410
Commit c8b94410 authored Nov 05, 2020 by lpx
23 changed files
--- a/api-app/src/main/java/com/jumeirah/api/app/controller/AppUserController.java
+++ b/api-app/src/main/java/com/jumeirah/api/app/controller/AppUserController.java
@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Set;

--- a/bootstrap/src/main/java/io/geekidea/springbootplus/config/JacksonConfig.java
+++ b/bootstrap/src/main/java/io/geekidea/springbootplus/config/JacksonConfig.java
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 import io.geekidea.springbootplus.config.constant.DatePattern;
 import io.geekidea.springbootplus.framework.config.jackson.deserializer.JacksonDoubleDeserializer;
-import io.geekidea.springbootplus.framework.config.jackson.serializer.JacksonIntegerDeserializer;
+import io.geekidea.springbootplus.framework.config.jackson.deserializer.JacksonIntegerDeserializer;
 import io.geekidea.springbootplus.framework.core.xss.XssJacksonDeserializer;
 import io.geekidea.springbootplus.framework.core.xss.XssJacksonSerializer;
 import org.springframework.beans.factory.annotation.Value;
@@ -76,6 +76,10 @@ public class JacksonConfig implements WebMvcConfigurer {
 //        simpleModule.addSerializer(Date.class, new JacksonDateSerializer());
 //        simpleModule.addDeserializer(Date.class, new JacksonDateDeserializer());
+//   response数据Long型转String     simpleModule.addSerializer(Long.class, new JacksonLongSerializer());
        simpleModule.addDeserializer(Integer.class, new JacksonIntegerDeserializer());
        simpleModule.addDeserializer(Double.class, new JacksonDoubleDeserializer());

--- a/common/src/main/java/com/jumeirah/common/mq/Queue.java
+++ b/common/src/main/java/com/jumeirah/common/mq/Queue.java
 package com.jumeirah.common.mq;
-import com.jumeirah.common.entity.Stroke;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -18,30 +17,17 @@ public class Queue {
    @Autowired
    private AmqpTemplate rabbitTemplate;
-    @Value("${spring.rabbitmq.user-queue-name}")
-    private String userQueueName;
    @Value("${spring.rabbitmq.order-queue-name}")
    private String orderQueueName;
    /**
     * 推送订单状态到客服系统
     *
     * @param orderInteractionModel
     */
-    public void pushOrder(Stroke stroke) {
+    public void pushOrder(String stroke) {
        rabbitTemplate.convertAndSend(orderQueueName, stroke);
    }
-    /**
-     * 禁用用户
-     *
-     * @param userId
-     */
-    public void disableUserQueue(String userId) {
-        rabbitTemplate.convertAndSend(userQueueName, userId);
-    }
 }
\ No newline at end of file
--- a/common/src/main/java/com/jumeirah/common/service/impl/MerchantServiceImpl.java
+++ b/common/src/main/java/com/jumeirah/common/service/impl/MerchantServiceImpl.java
@@ -67,7 +67,6 @@ public class MerchantServiceImpl extends BaseServiceImpl<MerchantMapper, Merchan
        return baseMapper.selectList(new QueryWrapper<Merchant>().lambda()
                .eq(Merchant::getState, 1)
                .eq(Merchant::getDeleted, 0)
-                .eq(Merchant::getAuditRegisterStatus, 1)
                .orderByDesc(Merchant::getCreateTime));
    }

--- a/common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java
+++ b/common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java
 package com.jumeirah.common.service.impl;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,6 +16,7 @@ import com.jumeirah.common.vo.McStrokePaymentQueryVo;
 import com.jumeirah.common.vo.McStrokeQueryVo;
 import com.jumeirah.common.vo.StrokeDetailVo;
 import com.jumeirah.common.vo.StrokeQueryVo;
+import com.rabbitmq.tools.json.JSONUtil;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
 import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
@@ -46,7 +48,7 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
    public boolean saveStroke(Stroke stroke) throws Exception {
        final boolean save = super.save(stroke);
        if (save) {//推送订单到客服系统
-            queue.pushOrder(stroke);
+            queue.pushOrder(JSON.toJSONString(stroke));
        }
        return save;
    }

--- a/common/src/main/java/com/jumeirah/common/vo/CharterIntroductionQueryForAppVo.java
+++ b/common/src/main/java/com/jumeirah/common/vo/CharterIntroductionQueryForAppVo.java
@@ -38,4 +38,7 @@ public class CharterIntroductionQueryForAppVo implements Serializable {
    @ApiModelProperty("包机标题")
    private String title;
+    @ApiModelProperty("推荐:  0不推荐  1推荐")
+    private Integer recommend;
 }
\ No newline at end of file
--- a/common/src/main/resources/mapper/CharterIntroductionMapper.xml
+++ b/common/src/main/resources/mapper/CharterIntroductionMapper.xml
@@ -4,10 +4,10 @@
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
-        id, mc_id, status, create_time,update_time,type,text,img_url
+        id, mc_id, status, create_time,update_time,type,text,img_url,recommend
    </sql>
    <sql id="Base_Column_ListForApp">
-        title,text,img_url,m.head AS mcHead,m.name AS mcName
+        title,text,img_url,m.head AS mcHead,m.name AS mcName,ci.recommend
    </sql>
    <select id="getCharterIntroductionById" resultType="com.jumeirah.common.vo.CharterIntroductionQueryVo">
@@ -33,6 +33,7 @@
        where ci.type = #{param.type}
        AND m.state=1 and m.audit_register_status=1
+        ORDER BY ci.recommend DESC
    </select>

--- a/config/src/main/resources/config/application-dev.yml
+++ b/config/src/main/resources/config/application-dev.yml
@@ -30,8 +30,7 @@ spring:
    port: 5672
    username: root
    password: root
-    user-queue-name: disable.user.dev
+    order-queue-name: push.order.dev
-    order-queue-name: push.order
 # 打印SQL语句和结果集，本地开发环境可开启，线上注释掉
 mybatis-plus:

--- a/customer-service/pom.xml
+++ b/customer-service/pom.xml
@@ -2,10 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-        <groupId>io.geekidea.springbootplus</groupId>
+        <groupId>org.springframework.boot</groupId>
-        <artifactId>parent</artifactId>
+        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0</version>
+        <version>2.2.5.RELEASE</version>
+        <relativePath/>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -47,30 +49,23 @@
        </dependency>
        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>httpclient</artifactId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpmime</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
-            <optional>true</optional>
        </dependency>
        <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>httpclient</artifactId>
-            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
+            <artifactId>httpmime</artifactId>
        </dependency>
        <dependency>
@@ -81,6 +76,7 @@
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.10</version>
        </dependency>
        <dependency>
@@ -92,39 +88,39 @@
        <dependency>
            <groupId>com.github.pagehelper</groupId>
            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.2.3</version>
        </dependency>
        <dependency>
            <groupId>org.mybatis.spring.boot</groupId>
            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.0.1</version>
        </dependency>
        <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>com.baomidou</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.3.1</version>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
        </dependency>
        <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>org.projectlombok</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
+            <artifactId>lombok</artifactId>
-            <optional>true</optional>
+            <version>1.18.12</version>
        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
    </dependencies>
    <build>

--- a/customer-service/src/main/java/com/ym/im/config/RabbitConfig.java
+++ b/customer-service/src/main/java/com/ym/im/config/RabbitConfig.java
@@ -22,15 +22,15 @@ import java.util.Map;
 @ConfigurationProperties(prefix = "spring.rabbitmq")
 public class RabbitConfig {
-    private String delayQueueName;
+    private String exchangeName;
-    private String staffOfflineQueueName;
+    private String orderQueueName;
-    private String exchangeName;
+    private String staffOfflineQueueName;
    @Bean
-    public Queue delayQueue() {
+    public Queue orderQueue() {
-        return new Queue(delayQueueName);
+        return new Queue(orderQueueName);
    }
    @Bean
@@ -38,7 +38,6 @@ public class RabbitConfig {
        return new Queue(staffOfflineQueueName);
    }
    /**
     * 配置默认的交换机
     */
@@ -53,14 +52,6 @@ public class RabbitConfig {
     * 绑定队列到交换器
     */
    @Bean
-    Binding bindingDelayQueue(Queue delayQueue, CustomExchange customExchange) {
-        return BindingBuilder.bind(delayQueue).to(customExchange).with(delayQueueName).noargs();
-    }
-    /**
-     * 绑定队列到交换器
-     */
-    @Bean
    Binding bindingStaffOfflineQueue(Queue staffOfflineQueue, CustomExchange customExchange) {
        return BindingBuilder.bind(staffOfflineQueue).to(customExchange).with(staffOfflineQueueName).noargs();
    }

--- a/customer-service/src/main/java/com/ym/im/entity/Stroke.java
+++ b/customer-service/src/main/java/com/ym/im/entity/Stroke.java
 package com.ym.im.entity;
+import com.ym.im.validation.group.ChatRecordSaveGroup;
+import com.ym.im.validation.group.ChatRecordSendGroup;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import javax.validation.constraints.NotNull;
+import javax.validation.groups.Default;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.Date;
 /**
 * 行程表
@@ -139,4 +144,6 @@ public class Stroke implements Serializable {
    @ApiModelProperty("是否是优惠调机，0-否，1-是")
    private Boolean isDiscount;
+    @ApiModelProperty(value = "发送时间")
+    private Date sendTime;
 }
--- a/customer-service/src/main/java/com/ym/im/entity/model/OrderModel.java
+++ b/customer-service/src/main/java/com/ym/im/entity/model/OrderModel.java
-package com.ym.im.entity.model;
-import lombok.Data;
-import java.io.Serializable;
-/**
- * @author: JJww
- * @Date:2019-07-19
- */
-@Data
-public class OrderModel implements Serializable {
-    private static final long serialVersionUID = 1L;
-    /**
-     * 订单类型
-     */
-    private String type;
-    /**
-     * 订单ID
-     */
-    private String orderId;
-    /**
-     * 订单状态
-     */
-    private String orderStatus;
-    /**
-     * 用户Id
-     */
-    private String userId;
-    private Long merchantId;
-}
--- a/customer-service/src/main/java/com/ym/im/handler/BaseHandler.java
+++ b/customer-service/src/main/java/com/ym/im/handler/BaseHandler.java
 package com.ym.im.handler;
 import com.ym.im.entity.base.ChannelAttributeKey;
-import com.ym.im.exception.HttpException;
 import com.ym.im.factory.SingleChatFactory;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -30,10 +29,10 @@ public abstract class BaseHandler<T> extends SimpleChannelInboundHandler<T> {
    @Override
    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        if (cause instanceof HttpException) {
+//        if (cause instanceof HttpException) {
-            return;
+//            return;
-        }
+//        }
-        singleChatFactory.getService(ctx.channel().attr(ChannelAttributeKey.ROLE_TYPE).get()).offline(ctx);
+//        singleChatFactory.getService(ctx.channel().attr(ChannelAttributeKey.ROLE_TYPE).get()).offline(ctx);
    }
 }
--- a/customer-service/src/main/java/com/ym/im/mq/Queue.java
+++ b/customer-service/src/main/java/com/ym/im/mq/Queue.java
 package com.ym.im.mq;
 import com.ym.im.config.RabbitConfig;
-import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.StaffSocketInfo;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,19 +20,6 @@ public class Queue {
    private RabbitConfig rabbitConfig;
    /**
-     * 延迟队列 重发未回应消息
-     *
-     * @param msgBody
-     */
-    public void delaysQueue(MsgBody msgBody) {
-        // 通过广播模式发布延时消息 延时3秒 消费后销毁 这里无需指定路由，会广播至每个绑定此交换机的队列
-        rabbitTemplate.convertAndSend(rabbitConfig.getExchangeName(), rabbitConfig.getDelayQueueName(), msgBody, message -> {
-            message.getMessageProperties().setDelay(3 * 1000);   // 毫秒为单位，指定此消息的延时时长
-            return message;
-        });
-    }
-    /**
     * 客服离线 队列
     *
     * @param msgBody

--- a/customer-service/src/main/java/com/ym/im/mq/Receiver.java
+++ b/customer-service/src/main/java/com/ym/im/mq/Receiver.java
 package com.ym.im.mq;
-import com.alibaba.fastjson.JSON;
-import com.ym.im.entity.ChatRecord;
 import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.StaffSocketInfo;
+import com.ym.im.entity.Stroke;
 import com.ym.im.entity.UserSocketInfo;
 import com.ym.im.entity.base.NettyConstant;
-import com.ym.im.entity.enums.RoleEnum;
 import com.ym.im.entity.model.IdModel;
-import com.ym.im.entity.model.OrderModel;
 import com.ym.im.handler.ChannelGroupHandler;
 import com.ym.im.service.StaffService;
 import com.ym.im.util.JsonUtils;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import java.io.IOException;
+import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Set;
@@ -34,7 +31,7 @@ public class Receiver {
    @Autowired
    private Queue queue;
-    @Autowired
+    @Resource(name = "myRedisTemplate")
    private RedisTemplate redisTemplate;
    @Autowired
@@ -43,23 +40,6 @@ public class Receiver {
    @Autowired
    private ChannelGroupHandler channelGroup;
-    /**
-     * 禁用用户 队列名称
-     */
-    public static final String USER_QUEUE_NAME = "disable.user";
-    /**
-     * 订单队列
-     */
-    public static final String ORDER_QUEUE_NAME = "push.order";
-    @RabbitListener(queues = "#{delayQueue.name}")
-    public void delayAckHandler(MsgBody msgBody) throws IOException {
-        log.info("接收时间:" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "  消息内容：" + JsonUtils.obj2Json(msgBody));
-        retry(msgBody);
-    }
    @RabbitListener(queues = "#{staffOfflineQueue.name}")
    public void offlineHandler(StaffSocketInfo staffSocketInfo) {
@@ -68,9 +48,10 @@ public class Receiver {
        redisTemplate.delete(NettyConstant.STAFF_USERIDS_KEY + staffId);
        //客服真离线后 才转发
        if (channelGroup.getMerchantStaff(staffId) == null) {
-            final Set<Long> userIds = staffSocketInfo.getUserIds();
+            final Set userIds = staffSocketInfo.getUserIds();
            log.info("客服离线队列: " + "ID: " + "UserIds:" + userIds);
-            userIds.forEach((Long userId) -> {
+            userIds.forEach(uid -> {
+                Long userId = Long.valueOf(uid.toString());
                //用户在线才重新分配和转发
                if (channelGroup.USER_GROUP.get(userId) != null) {
                    final StaffSocketInfo idleStaff = staffService.getIdleStaff(staffSocketInfo.getMerchantId(), userId);
@@ -84,111 +65,29 @@ public class Receiver {
    /**
-     * 禁用用户后 关闭socket
-     *
-     * @param userId
-     * @throws IOException
-     */
-    @RabbitListener(queues = USER_QUEUE_NAME)
-    public void disableUserHandler(String userId) {
-        final UserSocketInfo userSocketInfo = channelGroup.USER_GROUP.get(Long.valueOf(userId));
-        if (userSocketInfo != null) {
-            userSocketInfo.writeAndFlush(new MsgBody<>().setCode(MsgBody.LOGOUT));
-            userSocketInfo.close();
-            log.info("用户: " + userId + "被禁用");
-        }
-    }
-    /**
     * 订单相关处理
     *
     * @param orderModel
     */
-    @RabbitListener(queues = ORDER_QUEUE_NAME)
+    @SneakyThrows
-    public void orderHandler(OrderModel orderModel) {
+    @RabbitListener(queues = "#{orderQueue.name}")
+    public void orderHandler(String json) {
-        log.info("Constants.ORDER_QUEUE_NAME: " + JSON.toJSONString(orderModel));
+        final Stroke stroke = JsonUtils.json2Obj(json, Stroke.class);
+        log.info("订单信息: " + json);
-        final UserSocketInfo userSocketInfo = channelGroup.USER_GROUP.get(Long.valueOf(orderModel.getUserId()));
+        final Long mcId = stroke.getMcId();
+        final Long userId = stroke.getUserId();
+        final UserSocketInfo userSocketInfo = channelGroup.USER_GROUP.get(userId);
        if (userSocketInfo == null) {
            return;
        }
-        StaffSocketInfo staffSocketInfo = channelGroup.getMerchantStaff(userSocketInfo.getStaffId(orderModel.getMerchantId()));
+        stroke.setSendTime(new Date());
-        final MsgBody<OrderModel> orderInfo = new MsgBody<OrderModel>().setCode(MsgBody.ORDER).setData(orderModel);
+        final MsgBody<Stroke> orderInfo = new MsgBody<Stroke>().setCode(MsgBody.ORDER).setData(stroke);
-        /**
+        final StaffSocketInfo staffSocketInfo = channelGroup.getMerchantStaff(userSocketInfo.getStaffId(stroke.getMcId())) == null ? staffService.getIdleStaff(mcId, userId) : channelGroup.getMerchantStaff(userSocketInfo.getStaffId(stroke.getMcId()));
-         * 绑定客服在线,发送订单信息
-         */
        if (staffSocketInfo != null) {
            staffSocketInfo.writeAndFlush(orderInfo);
-            log.info("客服订单: " + "给客服(" + staffSocketInfo.getStaffId() + ")发送订单:" + orderInfo.toString());
+            log.info("客服订单: " + "给客服(" + staffSocketInfo.getStaffId() + ")发送订单:" + json);
-            return;
-        }
-        /**
-         * 绑定客服不在线,给历史客服发送订单信息
-         */
-        final Long staffId = (Long) redisTemplate.opsForHash().get(NettyConstant.IM_USERS, orderModel.getUserId());
-        if (staffId != null) {
-            log.info("客服订单: " + "尝试给历史客服(" + staffId + ")发送订单:" + orderInfo.toString());
-            staffSocketInfo = channelGroup.getMerchantStaff(staffId);
-            if (staffSocketInfo != null) {
-                staffSocketInfo.writeAndFlush(orderInfo);
-                log.info("客服订单: " + "给历史客服(" + staffId + ")发送订单:" + orderInfo.toString());
-            }
        }
    }
-    /**
-     * 重发未回执的消息
-     *
-     * @param msgBody
-     * @throws IOException
-     */
-    public void retry(MsgBody<ChatRecord> msgBody) throws IOException {
-        final ChatRecord chatRecord = msgBody.getData();
-        final Long userId = Long.valueOf(chatRecord.getUserId());
-        final String recordId = String.valueOf(chatRecord.getId());
-        if (msgBody != null && chatRecord.getRetryCount().intValue() < NettyConstant.RETRY_COUNT.intValue()) {
-            UserSocketInfo userSocketInfo = channelGroup.USER_GROUP.get(userId);
-            if (userSocketInfo == null) {
-                return;
-            }
-            MsgBody<ChatRecord> msg = JsonUtils.json2Obj(String.valueOf(redisTemplate.opsForHash().get(NettyConstant.MSG_KEY + userId, recordId)), JsonUtils.getJavaType(MsgBody.class, ChatRecord.class));
-            if (msg != null && msg.getCode().equals(MsgBody.HAVE_READ)) {
-                redisTemplate.opsForHash().delete(NettyConstant.MSG_KEY + userId, recordId);
-                return;
-            }
-            final Integer sendReceive = chatRecord.getSendReceive();
-            switch (RoleEnum.get(sendReceive)) {
-                case APP:
-                    Long staffId = userSocketInfo.getStaffId(chatRecord.getMerchantId());
-                    StaffSocketInfo staffSocketInfo = channelGroup.getMerchantStaff(staffId);
-                    if (staffSocketInfo != null) {
-                        staffSocketInfo.writeAndFlush(msgBody);
-                    }
-                    break;
-                case merchant:
-                    userSocketInfo.writeAndFlush(msgBody);
-                    break;
-                default:
-            }
-            //重发三次
-            chatRecord.setRetryCount(chatRecord.getRetryCount() + 1);
-            queue.delaysQueue(msgBody);
-        } else {
-            //移除失败消息
-            redisTemplate.opsForHash().delete(NettyConstant.MSG_KEY + userId, recordId);
-        }
-    }
 }
\ No newline at end of file
--- a/customer-service/src/main/java/com/ym/im/service/impl/MsgBodyServiceImpl.java
+++ b/customer-service/src/main/java/com/ym/im/service/impl/MsgBodyServiceImpl.java
@@ -6,7 +6,6 @@ import com.ym.im.entity.MsgBody;
 import com.ym.im.entity.base.ChannelAttributeKey;
 import com.ym.im.entity.base.NettyConstant;
 import com.ym.im.factory.SingleChatFactory;
-import com.ym.im.mq.Queue;
 import com.ym.im.service.ChatService;
 import com.ym.im.service.MsgBodyService;
 import com.ym.im.util.JsonUtils;
@@ -36,15 +35,11 @@ import static com.ym.im.entity.MsgBody.SEND_MSG;
 @Validated({MsgBodyGroup.class})
 public class MsgBodyServiceImpl implements MsgBodyService {
-    @Autowired
-    private Queue queue;
-    @Autowired
-    private SingleChatFactory singleChatFactory;
    @Resource(name = "myRedisTemplate")
    private RedisTemplate redisTemplate;
+    @Autowired
+    private SingleChatFactory singleChatFactory;
    @Override
    public void msgBodyHandle(@NotNull ChannelHandlerContext ctx, @Valid MsgBody<ChatRecord> msgBody) throws JsonProcessingException {
@@ -85,8 +80,6 @@ public class MsgBodyServiceImpl implements MsgBodyService {
        msgBody.setCode(SEND_MSG);
        // 先保存消息至Redis
        redisTemplate.opsForHash().put(NettyConstant.MSG_KEY + msgBody.getData().getUserId(), msgBody.getData().getId(), JsonUtils.obj2Json(msgBody));
-        // 再默认以用户没有收到消息为前提，做循环、延迟通知
-        queue.delaysQueue(msgBody);
        // 最后发送聊天信息
        channel.writeAndFlush(msgBody);
    }

--- a/customer-service/src/main/java/com/ym/im/service/impl/StaffServiceImpl.java
+++ b/customer-service/src/main/java/com/ym/im/service/impl/StaffServiceImpl.java
@@ -28,10 +28,10 @@ public class StaffServiceImpl implements StaffService {
    @Override
    public StaffSocketInfo getIdleStaff(Long merchantId, Long userId) {
-//        final LinkedHashMap<Long, StaffSocketInfo> socketInfoMap = channelGroup.STAFF_GROUP.get(merchantId);
+        if (channelGroup.STAFF_GROUP.get(merchantId) == null) {
-//        if (socketInfoMap == null || socketInfoMap.size() == 0) {
+            return null;
-//            return null;
+        }
-//        }
        final LinkedHashMap<Long, StaffSocketInfo> collect = channelGroup.STAFF_GROUP.get(merchantId)
                .entrySet()
                .stream()

--- a/customer-service/src/main/resources/application-dev.yml
+++ b/customer-service/src/main/resources/application-dev.yml
@@ -24,12 +24,12 @@ spring:
  jackson:
    default-property-inclusion: non_null
  rabbitmq:
-    host: 127.0.0.1
+    host: 47.99.47.225
    port: 5672
-    username: admin
+    username: root
-    password: admin
+    password: root
-    delay-queue-name: delay.ack.dev
    staff-offline-Queue-Name: staff.offline.dev
+    order-queue-name: push.order.dev
    exchange-name: delay.exchange.dev
    listener:
      simple:

--- a/customer-service/src/main/resources/application-prd.yml
+++ b/customer-service/src/main/resources/application-prd.yml
@@ -29,7 +29,6 @@ spring:
    port: 5672
    username: admin
    password: Yum123456
-    delay-queue-name: delay.ack
    staff-offline-Queue-Name: staff.offline
    exchange-name: delayAck
    listener:

--- a/customer-service/src/main/resources/application-test.yml
+++ b/customer-service/src/main/resources/application-test.yml
@@ -29,9 +29,8 @@ spring:
    port: 5672
    username: root
    password: root
-    delay-queue-name: delay.ack-Jw
+    staff-offline-Queue-Name: staff.offline.dev
-    staff-offline-Queue-Name: staff.offline-Jw
+    exchange-name: delay.exchange.dev
-    exchange-name: delay.exchange
    listener:
      simple:
        default-requeue-rejected: false

--- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonIntegerDeserializer.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonIntegerDeserializer.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package io.geekidea.springbootplus.framework.config.jackson.serializer;
+package io.geekidea.springbootplus.framework.config.jackson.deserializer;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;

--- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonLongDeserializer.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonLongDeserializer.java
+/*
+ * Copyright 2019-2029 geekidea(https://github.com/geekidea)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.geekidea.springbootplus.framework.config.jackson.deserializer;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import io.geekidea.springbootplus.framework.config.converter.StringToDoubleUtil;
+import java.io.IOException;
+/**
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class JacksonLongDeserializer extends JsonDeserializer<Double> {
+    @Override
+    public Double deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        String string = jsonParser.getText();
+        return StringToDoubleUtil.convert(string);
+    }
+}
--- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonLongSerializer.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonLongSerializer.java
+/*
+ * Copyright 2019-2029 geekidea(https://github.com/geekidea)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.geekidea.springbootplus.framework.config.jackson.serializer;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import java.io.IOException;
+/**
+ * <p>
+ * Jackson Long反序列化器
+ * </p>
+ *
+ * @author geekidea
+ * @date 2018-11-08
+ */
+public class JacksonLongSerializer extends JsonSerializer<Long> {
+    @Override
+    public void serialize(Long aLong, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+        String string = null;
+        if (aLong != null) {
+            string = aLong.toString();
+        }
+        jsonGenerator.writeString(string);
+    }
+}