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