diff --git a/src/main/java/com/ifish/bean/Tbl_User.java b/src/main/java/com/ifish/bean/Tbl_User.java index 57cb9af..ac1cecf 100644 --- a/src/main/java/com/ifish/bean/Tbl_User.java +++ b/src/main/java/com/ifish/bean/Tbl_User.java @@ -24,7 +24,7 @@ public class Tbl_User implements java.io.Serializable { /** * 版本号 */ - private static final long serialVersionUID = -3293426131332327827L; + private static final long serialVersionUID = -7318879296790573758L; /** * 用户Id @@ -99,6 +99,11 @@ public class Tbl_User implements java.io.Serializable { @Column(name = "create_time", nullable = true) private Date createTime; + /** + * */ + @Column(name = "phone_type", nullable = true, length = 10) + private String phoneType; + /** * 登陆手机类型 */ @@ -147,6 +152,11 @@ public class Tbl_User implements java.io.Serializable { @Column(name = "jiguang_userid", nullable = true, length = 50) private String jiguangUserid; + /** + * */ + @Column(name = "token", nullable = true, length = 50) + private String token; + /** * 经度 */ @@ -375,6 +385,25 @@ public class Tbl_User implements java.io.Serializable { this.createTime = createTime; } + /** + * 获取 + * + * @return + */ + public String getPhoneType() { + return this.phoneType; + } + + /** + * 设置 + * + * @param phoneType + * + */ + public void setPhoneType(String phoneType) { + this.phoneType = phoneType; + } + /** * 获取登陆手机类型 * @@ -519,6 +548,25 @@ public class Tbl_User implements java.io.Serializable { this.jiguangUserid = jiguangUserid; } + /** + * 获取 + * + * @return + */ + public String getToken() { + return this.token; + } + + /** + * 设置 + * + * @param token + * + */ + public void setToken(String token) { + this.token = token; + } + /** * 获取经度 * diff --git a/src/main/java/com/ifish/helper/JpushHelper.java b/src/main/java/com/ifish/helper/JpushHelper.java index a919b9e..854cfd1 100644 --- a/src/main/java/com/ifish/helper/JpushHelper.java +++ b/src/main/java/com/ifish/helper/JpushHelper.java @@ -7,9 +7,12 @@ package com.ifish.helper; import cn.jpush.api.JPushClient; import cn.jpush.api.push.PushResult; +import cn.jpush.api.push.model.Message; +import cn.jpush.api.push.model.Options; import cn.jpush.api.push.model.Platform; import cn.jpush.api.push.model.PushPayload; import cn.jpush.api.push.model.audience.Audience; +import cn.jpush.api.push.model.notification.IosNotification; import cn.jpush.api.push.model.notification.Notification; import java.util.Map; import org.springframework.stereotype.Component; @@ -46,6 +49,7 @@ public class JpushHelper implements JpushHelperI { .setPlatform(Platform.android()) .setAudience(Audience.alias(userId)) .setNotification(Notification.android(title, message, map)) + .setMessage(Message.newBuilder().setTitle(title).setMsgContent(message).addExtras(map).build()) .build(); PushResult result = jPushClient.sendPush(payload); @@ -70,7 +74,9 @@ public class JpushHelper implements JpushHelperI { PushPayload payload = PushPayload.newBuilder() .setPlatform(Platform.ios()) .setAudience(Audience.alias(userId)) - .setNotification(Notification.ios(message, map)) + .setNotification(Notification.newBuilder().addPlatformNotification(IosNotification.newBuilder().setSound("happy").setAlert(message).build()).build()) + .setMessage(Message.newBuilder().setTitle(title).setMsgContent(message).addExtras(map).build()) + .setOptions(Options.newBuilder().setApnsProduction(false).build()) .build(); PushResult result = jPushClient.sendPush(payload);