1:完善MQ配置和逻辑

2:删除重发逻辑

customer-service/src/main/java/com/ym/im/config/RabbitConfig.java

@@ -22,30 +22,22 @@ import java.util.Map;
 @ConfigurationProperties(prefix = "spring.rabbitmq")
 public class RabbitConfig {
 
-    private String delayQueueName;
-
-    private String staffOfflineQueueName;
-
     private String exchangeName;
 
     private String orderQueueName;
 
+    private String staffOfflineQueueName;
+
     @Bean
     public Queue orderQueue() {
         return new Queue(orderQueueName);
     }
 
     @Bean
-    public Queue delayQueue() {
-        return new Queue(delayQueueName);
-    }
-
-    @Bean
     public Queue staffOfflineQueue() {
         return new Queue(staffOfflineQueueName);
     }
 
-
     /**
      * 配置默认的交换机
      */
@@ -60,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();
     }

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;
 }

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

@@ -17,6 +17,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.Set;
 
 /**
@@ -63,7 +64,6 @@ public class Receiver {
     }
 
 
-
     /**
      * 订单相关处理
      *
@@ -73,17 +73,19 @@ public class Receiver {
     @RabbitListener(queues = "#{orderQueue.name}")
     public void orderHandler(String json) {
         final Stroke stroke = JsonUtils.json2Obj(json, Stroke.class);
+        log.info("订单信息: " + json);
         final Long mcId = stroke.getMcId();
         final Long userId = stroke.getUserId();
         final UserSocketInfo userSocketInfo = channelGroup.USER_GROUP.get(userId);
         if (userSocketInfo == null) {
             return;
         }
+        stroke.setSendTime(new Date());
         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);
         }
     }
 

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);
     }

customer-service/src/main/resources/application-dev.yml

@@ -28,7 +28,6 @@ spring:
     port: 5672
     username: root
     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

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:

customer-service/src/main/resources/application-test.yml

@@ -29,7 +29,6 @@ spring:
     port: 5672
     username: root
     password: root
-    delay-queue-name: delay.ack.dev
     staff-offline-Queue-Name: staff.offline.dev
     exchange-name: delay.exchange.dev
     listener: