Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ifish7/mq/push/AliyunPushApi.java
#	src/main/java/com/ifish7/mq/queues/event/PushNotifcationEvent.java
#	src/main/java/com/ifish7/mq/queues/listener/IfishPushQueueMessageListener.java

ifishMQ.iml

@@ -32,6 +32,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.8" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.8.RELEASE" level="project" />

src/main/java/com/ifish7/mq/business/user/entity/TblPushUserDevice.java

@@ -0,0 +1,50 @@
+package com.ifish7.mq.business.user.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yan.y
+ * @since 2019-04-11
+ */
+@Data
+@Accessors(chain = true)
+@TableName("tbl_push_user_device")
+public class TblPushUserDevice {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Integer pushId;
+
+    /**
+     * 用户ID
+     */
+    private Integer pushUserId;
+
+    /**
+     * 设备ID
+     */
+    private String pushDeviceId;
+
+    /**
+     * 设备绑定时间
+     */
+    private LocalTime pushBindTime;
+
+    /**
+     * 设备绑定类型
+     */
+    private String pushBindType;
+
+
+}

src/main/java/com/ifish7/mq/business/user/mapper/TblPushUserDeviceMapper.java

@@ -0,0 +1,16 @@
+package com.ifish7.mq.business.user.mapper;
+
+import com.ifish7.mq.business.user.entity.TblPushUserDevice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yan.y
+ * @since 2019-04-11
+ */
+public interface TblPushUserDeviceMapper extends BaseMapper<TblPushUserDevice> {
+
+}

src/main/java/com/ifish7/mq/business/user/service/ITblPushUserDeviceService.java

@@ -0,0 +1,16 @@
+package com.ifish7.mq.business.user.service;
+
+import com.ifish7.mq.business.user.entity.TblPushUserDevice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author yan.y
+ * @since 2019-04-11
+ */
+public interface ITblPushUserDeviceService extends IService<TblPushUserDevice> {
+
+}

src/main/java/com/ifish7/mq/business/user/service/impl/TblPushUserDeviceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ifish7.mq.business.user.service.impl;
+
+import com.ifish7.mq.business.user.entity.TblPushUserDevice;
+import com.ifish7.mq.business.user.mapper.TblPushUserDeviceMapper;
+import com.ifish7.mq.business.user.service.ITblPushUserDeviceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author yan.y
+ * @since 2019-04-11
+ */
+@Service
+public class TblPushUserDeviceServiceImpl extends ServiceImpl<TblPushUserDeviceMapper, TblPushUserDevice> implements ITblPushUserDeviceService {
+
+}

src/main/java/com/ifish7/mq/queues/event/DeviceInfoEvent.java

@@ -61,6 +61,7 @@ public class DeviceInfoEvent {
      * 			"macAddress" : "5ccf7f006686",
      * 			"deviceIp" : "172.16.119.128",
      * 			"hardwareType" : "02",
+     * 		    "factoryCode" : "2a",
      * 			"softwareVersion" : "02"
      *       }
      *   }

src/main/resources/mapper/user/TblPushUserDeviceMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ifish7.mq.business.user.mapper.TblPushUserDeviceMapper">
+
+</mapper>