From f2f9580d1f50f6f3bd48a8675782a2c45b7b3887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E7=84=B1?= <thelongcode@163.com>
Date: Sun, 2 Jun 2019 22:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=BF=E9=87=8C=E4=BA=91=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ifish/action/UpdateUserAction.java |  3 ++-
 src/main/java/com/ifish/entity/AliyunDeviceInfo.java | 11 +++++++++++
 src/main/resources/mq.properties                     |  3 +--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ifish/action/UpdateUserAction.java b/src/main/java/com/ifish/action/UpdateUserAction.java
index 5a19a1e..b4f386f 100644
--- a/src/main/java/com/ifish/action/UpdateUserAction.java
+++ b/src/main/java/com/ifish/action/UpdateUserAction.java
@@ -86,12 +86,13 @@ public class UpdateUserAction {
 
 	@RequestMapping(value = "/bindDevice.do")
 	@ResponseBody
-	public Object bindDevice(@RequestParam String deviceId,@RequestParam Integer userId){
+	public Object bindDevice(@RequestParam String deviceId,@RequestParam Integer userId,@RequestParam String phoneType){
 		AliyunDeviceInfo aliyunDeviceInfo = baseService.getAliyunDeviceInfo(deviceId);
 		if (aliyunDeviceInfo == null) {
 			aliyunDeviceInfo = new AliyunDeviceInfo();
 			aliyunDeviceInfo.setAliyunDeviceId(deviceId);
 			aliyunDeviceInfo.setUserId(userId);
+			aliyunDeviceInfo.setPhoneType(phoneType);
 			aliyunDeviceInfo.setBindTime(new Date());
 			aliyunDeviceInfo.setLastUpdateTime(new Date());
 		} else {
diff --git a/src/main/java/com/ifish/entity/AliyunDeviceInfo.java b/src/main/java/com/ifish/entity/AliyunDeviceInfo.java
index d1e3af5..3f0aa18 100644
--- a/src/main/java/com/ifish/entity/AliyunDeviceInfo.java
+++ b/src/main/java/com/ifish/entity/AliyunDeviceInfo.java
@@ -21,6 +21,9 @@ public class AliyunDeviceInfo implements Serializable{
     @Column(name = "user_id")
     private Integer userId;
 
+    @Column(name = "phone_type")
+    private String phoneType;
+
     @Column(name="bind_time",columnDefinition="timestamp")
     private Date bindTime;
 
@@ -43,6 +46,14 @@ public class AliyunDeviceInfo implements Serializable{
         this.userId = userId;
     }
 
+    public String getPhoneType() {
+        return phoneType;
+    }
+
+    public void setPhoneType(String phoneType) {
+        this.phoneType = phoneType;
+    }
+
     public Date getBindTime() {
         return bindTime;
     }
diff --git a/src/main/resources/mq.properties b/src/main/resources/mq.properties
index a5dcb67..77df9ed 100644
--- a/src/main/resources/mq.properties
+++ b/src/main/resources/mq.properties
@@ -1,5 +1,4 @@
-#broker_url=tcp://test.ifish7.com:61616
-broker_url=tcp://www.ifish7.com:61616
+broker_url=tcp://localhost:61616
 username=admin
 #password=admin
 password=adminifish7