123

xx-universal/xx-universal-api/pom.xml

@@ -76,7 +76,7 @@
         <dependency>
             <groupId>cn.jpush.api</groupId>
             <artifactId>jpush-client</artifactId>
-            <version>3.3.7</version>
+            <version>3.3.9</version>
         </dependency>
         <dependency>
             <groupId>cn.jpush.api</groupId>

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/entity/MessagePush.java

+package com.xxfc.platform.universal.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+
+/**
+ * 消息推送表
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-05-28 16:17:42
+ */
+@Data
+@Table(name = "message_push")
+public class MessagePush implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    //
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("")
+    private Integer id;
+	
+
+	@ApiModelProperty(value = "1-手动推送；2-系统自动推送")
+    private Integer type;
+
+	@Column(name = "send_type")
+	@ApiModelProperty(value = "系统发送类型：1-支付完成")
+	private Integer sendType;
+
+	@ApiModelProperty(value = "通知标题")
+    private String title;
+	
+
+	@ApiModelProperty(value = "通知内容")
+    private String alert;
+
+
+	@ApiModelProperty(value = "通知栏样式类型:1-大文本；2-文本条目；3-大图片")
+    private Integer style;
+	
+
+    @Column(name = "big_text")
+	@ApiModelProperty(value = "大文本通知栏样式")
+    private String bigText;
+	
+
+	@ApiModelProperty(value = "文本条目通知栏样式")
+    private String inbox;
+	
+
+    @Column(name = "big_pic_path")
+	@ApiModelProperty(value = "大图片通知栏样式")
+    private String bigPicPath;
+	
+
+	@ApiModelProperty(value = "指定跳转页面")
+    private String intent;
+
+
+	@Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+	private Long crtTime;
+
+
+	@Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+	private Long updTime;
+	
+
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "是否删除")
+    private Integer isDel;
+
+
+	
+
+}

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/utils/PushExample.java

+package com.xxfc.platform.universal.utils;
+
+import cn.jiguang.common.ClientConfig;
+import cn.jiguang.common.ServiceHelper;
+import cn.jiguang.common.connection.NativeHttpClient;
+import cn.jiguang.common.connection.NettyHttpClient;
+import cn.jiguang.common.resp.APIConnectionException;
+import cn.jiguang.common.resp.APIRequestException;
+import cn.jiguang.common.resp.ResponseWrapper;
+import cn.jpush.api.JPushClient;
+import cn.jpush.api.push.CIDResult;
+import cn.jpush.api.push.GroupPushClient;
+import cn.jpush.api.push.PushResult;
+import cn.jpush.api.push.model.*;
+import cn.jpush.api.push.model.audience.Audience;
+import cn.jpush.api.push.model.audience.AudienceTarget;
+import cn.jpush.api.push.model.notification.*;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import io.netty.handler.codec.http.HttpMethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.*;
+
+public class PushExample {
+    protected static final Logger LOG = LoggerFactory.getLogger(PushExample.class);
+
+    // demo App defined in resources/jpush-api.conf 
+    protected static final String APP_KEY = "7b4b94cca0d185d611e53cca";
+    protected static final String MASTER_SECRET = "860803cf613ed54aa3b941a8";
+    protected static final String GROUP_PUSH_KEY = "2c88a01e073a0fe4fc7b167c";
+    protected static final String GROUP_MASTER_SECRET = "b11314807507e2bcfdeebe2e";
+
+    public static final String TITLE = "Test from API example";
+    public static final String ALERT = "Test from API Example - alert";
+    public static final String MSG_CONTENT = "Test from API Example - msgContent";
+    public static final String REGISTRATION_ID = "0900e8d85ef";
+    public static final String TAG = "tag_api";
+    public static long sendCount = 0;
+    private static long sendTotalTime = 0;
+
+
+    // 使用 NettyHttpClient 异步接口发送请求
+    public static void testSendPushWithCallback() {
+        ClientConfig clientConfig = ClientConfig.getInstance();
+        String host = (String) clientConfig.get(ClientConfig.PUSH_HOST_NAME);
+        final NettyHttpClient client = new NettyHttpClient(ServiceHelper.getBasicAuthorization(APP_KEY, MASTER_SECRET),
+                null, clientConfig);
+        try {
+            URI uri = new URI(host + clientConfig.get(ClientConfig.PUSH_PATH));
+            PushPayload payload = buildPushObject_all_alias_alert();
+            client.sendRequest(HttpMethod.POST, payload.toString(), uri, new NettyHttpClient.BaseCallback() {
+                @Override
+                public void onSucceed(ResponseWrapper responseWrapper) {
+                    LOG.info("Got result: " + responseWrapper.responseContent);
+                }
+            });
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void testSendPush() {
+        ClientConfig clientConfig = ClientConfig.getInstance();
+        final JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, clientConfig);
+//        String authCode = ServiceHelper.getBasicAuthorization(APP_KEY, MASTER_SECRET);
+        // Here you can use NativeHttpClient or NettyHttpClient or ApacheHttpClient.
+        // Call setHttpClient to set httpClient,
+        // If you don't invoke this method, default httpClient will use NativeHttpClient.
+
+//        ApacheHttpClient httpClient = new ApacheHttpClient(authCode, null, clientConfig);
+//        NettyHttpClient httpClient =new NettyHttpClient(authCode, null, clientConfig);
+//        jpushClient.getPushClient().setHttpClient(httpClient);
+        final PushPayload payload = buildPushObject_android_and_ios();
+//        // For push, all you need do is to build PushPayload object.
+//        PushPayload payload = buildPushObject_all_alias_alert();
+        try {
+            PushResult result = jpushClient.sendPush(payload);
+            LOG.info("Got result - " + result);
+            System.out.println(result);
+            // 如果使用 NettyHttpClient，需要手动调用 close 方法退出进程
+            // If uses NettyHttpClient, call close when finished sending request, otherwise process will not exit.
+            // jpushClient.close();
+        } catch (APIConnectionException e) {
+            LOG.error("Connection error. Should retry later. ", e);
+            LOG.error("Sendno: " + payload.getSendno());
+
+        } catch (APIRequestException e) {
+            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+            LOG.info("HTTP Status: " + e.getStatus());
+            LOG.info("Error Code: " + e.getErrorCode());
+            LOG.info("Error Message: " + e.getErrorMessage());
+            LOG.info("Msg ID: " + e.getMsgId());
+            LOG.error("Sendno: " + payload.getSendno());
+        }
+    }
+
+    //use String to build PushPayload instance
+    public static void testSendPush_fromJSON() {
+        ClientConfig clientConfig = ClientConfig.getInstance();
+        JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, clientConfig);
+        Gson gson = new GsonBuilder()
+                .registerTypeAdapter(PlatformNotification.class, new InterfaceAdapter<PlatformNotification>())
+                .create();
+        // Since the type of DeviceType is enum, thus the value should be uppercase, same with the AudienceType.
+        String payloadString = "{\"platform\":{\"all\":false,\"deviceTypes\":[\"IOS\"]},\"audience\":{\"all\":true,\"targets\":[{\"audienceType\":\"TAG_AND\",\"values\":[\"tag1\",\"tag_all\"]}]},\"notification\":{\"notifications\":[{\"soundDisabled\":false,\"badgeDisabled\":false,\"sound\":\"happy\",\"badge\":\"5\",\"contentAvailable\":false,\"alert\":\"Test from API Example - alert\",\"extras\":{\"from\":\"JPush\"},\"type\":\"cn.jpush.api.push.model.notification.IosNotification\"}]},\"message\":{\"msgContent\":\"Test from API Example - msgContent\"},\"options\":{\"sendno\":1429488213,\"overrideMsgId\":0,\"timeToLive\":-1,\"apnsProduction\":true,\"bigPushDuration\":0}}";
+        PushPayload payload = gson.fromJson(payloadString, PushPayload.class);
+        try {
+            PushResult result = jpushClient.sendPush(payloadString);
+            LOG.info("Got result - " + result);
+
+        } catch (APIConnectionException e) {
+            LOG.error("Connection error. Should retry later. ", e);
+            // LOG.error("Sendno: " + payload.getSendno());
+
+        } catch (APIRequestException e) {
+            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+            LOG.info("HTTP Status: " + e.getStatus());
+            LOG.info("Error Code: " + e.getErrorCode());
+            LOG.info("Error Message: " + e.getErrorMessage());
+            LOG.info("Msg ID: " + e.getMsgId());
+            //LOG.error("Sendno: " + payload.getSendno());
+        }
+    }
+
+    /**
+     * 测试多线程发送 2000 条推送耗时
+     */
+    public static void testSendPushes() {
+        ClientConfig clientConfig = ClientConfig.getInstance();
+        final JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, clientConfig);
+        String authCode = ServiceHelper.getBasicAuthorization(APP_KEY, MASTER_SECRET);
+        // Here you can use NativeHttpClient or NettyHttpClient or ApacheHttpClient.
+        NativeHttpClient httpClient = new NativeHttpClient(authCode, null, clientConfig);
+        // Call setHttpClient to set httpClient,
+        // If you don't invoke this method, default httpClient will use NativeHttpClient.
+//        ApacheHttpClient httpClient = new ApacheHttpClient(authCode, null, clientConfig);
+        jpushClient.getPushClient().setHttpClient(httpClient);
+        final PushPayload payload = buildPushObject_ios_tagAnd_alertWithExtrasAndMessage();
+        for (int i = 0; i < 10; i++) {
+            Thread thread = new Thread() {
+                public void run() {
+                    for (int j = 0; j < 200; j++) {
+                        long start = System.currentTimeMillis();
+                        try {
+                            PushResult result = jpushClient.sendPush(payload);
+                            LOG.info("Got result - " + result);
+
+                        } catch (APIConnectionException e) {
+                            LOG.error("Connection error. Should retry later. ", e);
+                            LOG.error("Sendno: " + payload.getSendno());
+
+                        } catch (APIRequestException e) {
+                            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+                            LOG.info("HTTP Status: " + e.getStatus());
+                            LOG.info("Error Code: " + e.getErrorCode());
+                            LOG.info("Error Message: " + e.getErrorMessage());
+                            LOG.info("Msg ID: " + e.getMsgId());
+                            LOG.error("Sendno: " + payload.getSendno());
+                        }
+
+                        System.out.println("耗时" + (System.currentTimeMillis() - start) + "毫秒 sendCount:" + (++sendCount));
+                    }
+                }
+            };
+            thread.start();
+        }
+    }
+
+    public void testSendGroupPush() {
+        GroupPushClient groupPushClient = new GroupPushClient(GROUP_MASTER_SECRET, GROUP_PUSH_KEY);
+        final PushPayload payload = buildPushObject_android_and_ios();
+        try {
+            Map<String, PushResult> result = groupPushClient.sendGroupPush(payload);
+            for (Map.Entry<String, PushResult> entry : result.entrySet()) {
+                PushResult pushResult = entry.getValue();
+                PushResult.Error error = pushResult.error;
+                if (error != null) {
+                    LOG.info("AppKey: " + entry.getKey() + " error code : " + error.getCode() + " error message: " + error.getMessage());
+                } else {
+                    LOG.info("AppKey: " + entry.getKey() + " sendno: " + pushResult.sendno + " msg_id:" + pushResult.msg_id);
+                }
+
+            }
+        } catch (APIConnectionException e) {
+            LOG.error("Connection error. Should retry later. ", e);
+            LOG.error("Sendno: " + payload.getSendno());
+
+        } catch (APIRequestException e) {
+            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+            LOG.info("HTTP Status: " + e.getStatus());
+            LOG.info("Error Code: " + e.getErrorCode());
+            LOG.info("Error Message: " + e.getErrorMessage());
+            LOG.info("Msg ID: " + e.getMsgId());
+            LOG.error("Sendno: " + payload.getSendno());
+        }
+    }
+
+    public static PushPayload buildPushObject_all_all_alert() {
+        return PushPayload.alertAll(ALERT);
+    }
+
+    public static PushPayload buildPushObject_all_alias_alert() {
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.all())
+                .setAudience(Audience.alias("alias1"))
+                .setNotification(Notification.alert(ALERT))
+                .build();
+    }
+
+    public static PushPayload buildPushObject_android_tag_alertWithTitle() {
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.android())
+                .setAudience(Audience.tag("tag1"))
+                .setNotification(Notification.android(ALERT, TITLE, null))
+                .build();
+    }
+
+    public static PushPayload buildPushObject_android_and_ios() {
+        Map<String, String> extras = new HashMap<String, String>();
+        extras.put("test", "https://community.jiguang.cn/push");
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.android_ios())
+                .setAudience(Audience.all())
+                .setNotification(Notification.newBuilder()
+                        .setAlert("alert content")
+                        .addPlatformNotification(AndroidNotification.newBuilder()
+                                .setTitle("Android Title")
+                                .addExtras(extras).build())
+                        .addPlatformNotification(IosNotification.newBuilder()
+                                .incrBadge(1)
+                                .addExtra("extra_key", "extra_value").build())
+                        .build())
+                .build();
+    }
+
+    public static void buildPushObject_with_extra() {
+
+        JsonObject jsonExtra = new JsonObject();
+        jsonExtra.addProperty("extra1", 1);
+        jsonExtra.addProperty("extra2", false);
+
+        Map<String, String> extras = new HashMap<String, String>();
+        extras.put("extra_1", "val1");
+        extras.put("extra_2", "val2");
+
+        PushPayload payload = PushPayload.newBuilder()
+                .setPlatform(Platform.android_ios())
+                .setAudience(Audience.tag("tag1"))
+                .setNotification(Notification.newBuilder()
+                        .setAlert("alert content")
+                        .addPlatformNotification(AndroidNotification.newBuilder()
+                                .setTitle("Android Title")
+                                .addExtras(extras)
+                                .addExtra("booleanExtra", false)
+                                .addExtra("numberExtra", 1)
+                                .addExtra("jsonExtra", jsonExtra)
+                                .build())
+                        .addPlatformNotification(IosNotification.newBuilder()
+                                .incrBadge(1)
+                                .addExtra("extra_key", "extra_value").build())
+                        .build())
+                .build();
+
+        System.out.println(payload.toJSON());
+    }
+
+    public static PushPayload buildPushObject_ios_tagAnd_alertWithExtrasAndMessage() {
+        JsonObject sound = new JsonObject();
+        sound.add("critical", new JsonPrimitive(1));
+        sound.add("name", new JsonPrimitive("default"));
+        sound.add("volume", new JsonPrimitive(0.2));
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.ios())
+                .setAudience(Audience.tag_and("tag1", "tag_all"))
+                .setNotification(Notification.newBuilder()
+                        .addPlatformNotification(IosNotification.newBuilder()
+                                .setAlert(ALERT)
+                                .setBadge(5)
+                                .setMutableContent(false)
+//                                .setSound("happy")
+                                .setSound(sound)
+                                .addExtra("from", "JPush")
+                                .build())
+                        .build())
+                .setMessage(Message.content(MSG_CONTENT))
+                .setOptions(Options.newBuilder()
+                        .setApnsProduction(true)
+                        .build())
+                .build();
+    }
+
+    public static PushPayload buildPushObject_android_newly_support() {
+
+        JsonObject inbox = new JsonObject();
+        inbox.add("line1", new JsonPrimitive("line1 string"));
+        inbox.add("line2", new JsonPrimitive("line2 string"));
+        inbox.add("contentTitle", new JsonPrimitive("title string"));
+        inbox.add("summaryText", new JsonPrimitive("+3 more"));
+
+        JsonObject intent = new JsonObject();
+        intent.add("url", new JsonPrimitive("intent:#Intent;component=com.jiguang.push/com.example.jpushdemo.SettingActivity;end"));
+
+        Notification notification = Notification.newBuilder()
+                .addPlatformNotification(AndroidNotification.newBuilder()
+                        .setAlert(ALERT)
+                        .setBigPicPath("path to big picture")
+                        .setBigText("long text")
+                        .setBuilderId(1)
+                        .setCategory("CATEGORY_SOCIAL")
+                        .setInbox(inbox)
+                        .setStyle(1)
+                        .setTitle("Alert test")
+                        .setPriority(1)
+                        .setLargeIcon("http://www.jiguang.cn/largeIcon.jpg")
+                        .setIntent(intent)
+                        .build())
+                .build();
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.all())
+                .setAudience(Audience.all())
+                .setNotification(notification)
+                .setOptions(Options.newBuilder()
+                        .setApnsProduction(true)
+                        .setSendno(ServiceHelper.generateSendno())
+                        .build())
+                .build();
+    }
+
+    public static PushPayload buildPushObject_ios_audienceMore_messageWithExtras() {
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.android_ios())
+                .setAudience(Audience.newBuilder()
+                        .addAudienceTarget(AudienceTarget.tag("tag1", "tag2"))
+                        .addAudienceTarget(AudienceTarget.alias("alias1", "alias2"))
+                        .build())
+                .setMessage(Message.newBuilder()
+                        .setMsgContent(MSG_CONTENT)
+                        .addExtra("from", "JPush")
+                        .build())
+                .build();
+    }
+
+    public static PushPayload buildPushObject_all_tag_not() {
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.all())
+                .setAudience(Audience.tag_not("abc", "123"))
+                .setNotification(Notification.alert(ALERT))
+                .build();
+    }
+
+    public static PushPayload buildPushObject_android_cid() {
+        Collection<String> list = new LinkedList<String>();
+        list.add("1507bfd3f79558957de");
+        list.add("1507bfd3f79554957de");
+        list.add("1507bfd3f79555957de");
+        list.add("1507bfd3f79556957de");
+        list.add("1507ffd3f79545957de");
+        list.add("1507ffd3f79457957de");
+        list.add("1507ffd3f79456757de");
+
+
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.android())
+//                .setAudience(Audience.registrationId("1507bfd3f79558957de"))
+                .setAudience(Audience.registrationId(list))
+                .setNotification(Notification.alert(ALERT))
+                .setCid("cid")
+                .build();
+    }
+
+    public static void testSendPushWithCustomConfig() {
+        ClientConfig config = ClientConfig.getInstance();
+        // Setup the custom hostname
+        config.setPushHostName("https://api.jpush.cn");
+
+        JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, config);
+
+        // For push, all you need do is to build PushPayload object.
+        PushPayload payload = buildPushObject_all_all_alert();
+
+        try {
+            PushResult result = jpushClient.sendPush(payload);
+            LOG.info("Got result - " + result);
+
+        } catch (APIConnectionException e) {
+            LOG.error("Connection error. Should retry later. ", e);
+
+        } catch (APIRequestException e) {
+            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+            LOG.info("HTTP Status: " + e.getStatus());
+            LOG.info("Error Code: " + e.getErrorCode());
+            LOG.info("Error Message: " + e.getErrorMessage());
+            LOG.info("Msg ID: " + e.getMsgId());
+        }
+    }
+
+    public static void testSendIosAlert() {
+        JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY);
+
+        IosAlert alert = IosAlert.newBuilder()
+                .setTitleAndBody("test alert", "subtitle", "test ios alert json")
+                .setActionLocKey("PLAY")
+                .build();
+        try {
+            PushResult result = jpushClient.sendIosNotificationWithAlias(alert, new HashMap<String, String>(), "alias1");
+            LOG.info("Got result - " + result);
+        } catch (APIConnectionException e) {
+            LOG.error("Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+            LOG.info("HTTP Status: " + e.getStatus());
+            LOG.info("Error Code: " + e.getErrorCode());
+            LOG.info("Error Message: " + e.getErrorMessage());
+        }
+    }
+
+    public static void testSendWithSMS() {
+        JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY);
+        try {
+//            SMS sms = SMS.content(1, 10);
+            SMS sms = SMS.newBuilder()
+                    .setDelayTime(1000)
+                    .setTempID(2000)
+                    .addPara("Test", 1)
+                    .build();
+            PushResult result = jpushClient.sendAndroidMessageWithAlias("Test SMS", "test sms", sms, "alias1");
+            LOG.info("Got result - " + result);
+        } catch (APIConnectionException e) {
+            LOG.error("Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+            LOG.info("HTTP Status: " + e.getStatus());
+            LOG.info("Error Code: " + e.getErrorCode());
+            LOG.info("Error Message: " + e.getErrorMessage());
+        }
+    }
+
+    public static void testGetCidList() {
+        JPushClient jPushClient = new JPushClient(MASTER_SECRET, APP_KEY);
+        try {
+            CIDResult result = jPushClient.getCidList(3, "push");
+            LOG.info("Got result - " + result);
+        } catch (APIConnectionException e) {
+            LOG.error("Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+            LOG.info("HTTP Status: " + e.getStatus());
+            LOG.info("Error Code: " + e.getErrorCode());
+            LOG.info("Error Message: " + e.getErrorMessage());
+        }
+    }
+
+    public static void testSendPushWithCid() {
+        JPushClient jPushClient = new JPushClient(MASTER_SECRET, APP_KEY);
+        PushPayload pushPayload = buildPushObject_android_cid();
+        try {
+            PushResult result = jPushClient.sendPush(pushPayload);
+            LOG.info("Got result - " + result);
+        } catch (APIConnectionException e) {
+            LOG.error("Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+            LOG.error("Error response from JPush server. Should review and fix it. ", e);
+            LOG.info("HTTP Status: " + e.getStatus());
+            LOG.info("Error Code: " + e.getErrorCode());
+            LOG.info("Error Message: " + e.getErrorMessage());
+        }
+    }
+
+}
+

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/JPushBiz.java

@@ -2,22 +2,35 @@ package com.xxfc.platform.universal.biz;
 
 
 import cn.jiguang.common.ClientConfig;
+import cn.jiguang.common.ServiceHelper;
 import cn.jiguang.common.resp.APIConnectionException;
 import cn.jiguang.common.resp.APIRequestException;
 import cn.jpush.api.JPushClient;
 import cn.jpush.api.push.PushResult;
+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.AndroidNotification;
+import cn.jpush.api.push.model.notification.Notification;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.xxfc.platform.universal.service.SmsService;
-import com.xxfc.platform.universal.utils.CCPRestSmsUtils;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.xxfc.platform.universal.entity.MessagePush;
+import com.xxfc.platform.universal.mapper.MessagePushMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
 
 @Service
 @Slf4j
-public class JPushBiz {
+public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
 
 
     @Value("${universal.MASTER_SECRET}")
@@ -25,6 +38,8 @@ public class JPushBiz {
     @Value("${universal.APP_KEY}")
     private  String APP_KEY;
 
+    public static final String ALERT = "Test from API Example - alert";
+
     //推送给所有平台设备
     public ObjectRestResponse jpushToAllPlat(String title){
         ClientConfig clientConfig = ClientConfig.getInstance();
@@ -48,5 +63,179 @@ public class JPushBiz {
         }
     }
 
+    //推送给所有平台设备
+    public ObjectRestResponse jpushToAllPlat1(){
+        ClientConfig clientConfig = ClientConfig.getInstance();
+        final JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, clientConfig);
+        PushPayload payload = buildPushObject_android_newly_support();
+        try {
+            PushResult result = jpushClient.sendPush(payload);
+            log.debug("\n推送结果:"+result);
+            return  ObjectRestResponse.succ();
+        } catch (APIConnectionException e) {
+            // Connection error, should retry later
+            log.debug("\nConnection error, should retry later"+e);
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,e.getMessage());
+        } catch (APIRequestException e) {
+            // Should review the error, and fix the request
+            log.debug("\nShould review the error, and fix the request"+ e);
+            log.debug("\nHTTP Status: " + e.getStatus());
+            log.debug("\nError Code: " + e.getErrorCode());
+            log.debug("\nError Message: " + e.getErrorMessage());
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,e.getMessage());
+        }
+    }
+
+
+    public static PushPayload buildPushObject_android_newly_support() {
+
+        JsonObject inbox = new JsonObject();
+        inbox.add("line1", new JsonPrimitive("line1 string"));
+        inbox.add("line2", new JsonPrimitive("line2 string"));
+        inbox.add("contentTitle", new JsonPrimitive("title string"));
+        inbox.add("summaryText", new JsonPrimitive("+3 more"));
+
+        JsonObject intent = new JsonObject();
+        intent.add("url", new JsonPrimitive("intent:#Intent;component=com.jiguang.push/com.example.jpushdemo.SettingActivity;end"));
+
+        Notification notification = Notification.newBuilder()
+                .addPlatformNotification(AndroidNotification.newBuilder()
+                        .setAlert("测试通知内容")
+                        .setBigPicPath("https://xxtest.upyuns.com/image/app/oyI48qqcy3m38iCFffFc3UeZLcm1s3.png")
+                        .setBigText("long text")
+                        .setBuilderId(1)
+                        .setCategory("CATEGORY_SOCIAL")
+                        .setInbox(inbox)
+                        .setStyle(3)
+                        .setTitle("测试通知标题")
+                        .setPriority(1)
+                        .setLargeIcon("https://xxtest.upyuns.com/image/admin/stock.jpg")
+                        .setIntent(intent)
+                        .build())
+                .build();
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.all())
+                .setAudience(Audience.all())
+                .setNotification(notification)
+                .setOptions(Options.newBuilder()
+                        .setApnsProduction(true)
+                        .setSendno(ServiceHelper.generateSendno())
+                        .build())
+                .build();
+    }
+
+
+    //推送
+    public ObjectRestResponse jpushToAlias(Integer id,String userIds){
+        ClientConfig clientConfig = ClientConfig.getInstance();
+        final JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, clientConfig);
+        PushPayload payload = buildPushObject_android_id(id,userIds);
+        if (payload==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"参数无效");
+        }
+        try {
+            PushResult result = jpushClient.sendPush(payload);
+            log.debug("\n推送结果:"+result);
+            return  ObjectRestResponse.succ();
+        } catch (APIConnectionException e) {
+            // Connection error, should retry later
+            log.debug("\nConnection error, should retry later"+e);
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,e.getMessage());
+        } catch (APIRequestException e) {
+            // Should review the error, and fix the request
+            log.debug("\nShould review the error, and fix the request"+ e);
+            log.debug("\nHTTP Status: " + e.getStatus());
+            log.debug("\nError Code: " + e.getErrorCode());
+            log.debug("\nError Message: " + e.getErrorMessage());
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,e.getMessage());
+        }
+    }
+
+
+    public  PushPayload buildPushObject_android_id(Integer id,String userIds) {
+        Example example =new Example(MessagePush.class);
+        example.createCriteria().andEqualTo("id",id).andEqualTo("isDel",0);
+        MessagePush messagePush=mapper.selectOneByExample(example);
+        if (messagePush==null||messagePush.getType()==null){
+            log.info("无有效数据--id=="+id);
+            return  null;
+        }
+        Audience audience=Audience.all();
+        if (messagePush.getType()==2){
+            if (StringUtils.isBlank(userIds)){
+                log.info("无有效数据--type=="+messagePush.getType()+"------userId=="+userIds);
+                return  null;
+            }
+            audience=Audience.alias(userIds);
+        }
+        JsonObject intent = new JsonObject();
+        if (StringUtils.isNotBlank(messagePush.getIntent())){
+            intent= getJsonObject(messagePush.getIntent());
+        }
+        Notification notification = Notification.newBuilder()
+                .addPlatformNotification(AndroidNotification.newBuilder()
+                        .setAlert(messagePush.getAlert())
+                        .setBigPicPath(messagePush.getBigPicPath())
+                        .setBigText(messagePush.getBigText())
+                        .setBuilderId(1)
+                        .setCategory("CATEGORY_SOCIAL")
+                        .setInbox(messagePush.getInbox())
+                        .setStyle(messagePush.getStyle())
+                        .setTitle(messagePush.getTitle())
+                        .setPriority(1)
+                        .setIntent(intent)
+                        .build())
+                .build();
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.all())
+                .setAudience(audience)
+                .setNotification(notification)
+                .setOptions(Options.newBuilder()
+                        .setApnsProduction(true)
+                        .setSendno(ServiceHelper.generateSendno())
+                        .build())
+                .build();
+    }
+
+    //字符串转JsonObject
+    public  JsonObject  getJsonObject(String json){
+        Gson g = new Gson();
+        return  g.fromJson(json, JsonObject.class);
+
+    }
+
+    //编辑推送内容
+    public  ObjectRestResponse updMessagePush(MessagePush messagePush){
+       Integer id= messagePush.getId();
+       if (id==null){
+           insertSelective(messagePush);
+       }else {
+           updateSelectiveById(messagePush);
+       }
+       return  ObjectRestResponse.succ();
+    }
+
+    //删除推送内容
+    public  ObjectRestResponse delMessagePush(MessagePush messagePush){
+        messagePush.setIsDel(1);
+        updateSelectiveById(messagePush);
+        return  ObjectRestResponse.succ();
+    }
+
+    //获取列表
+    public  ObjectRestResponse getList(Integer page,Integer limit,String title,Integer type){
+        Example example =new Example(MessagePush.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel",0);
+        if (StringUtils.isNotBlank(title)){
+            criteria.andLike("title","%"+title+"%");
+        }
+        if (type!=null&&type!=0){
+            criteria.andEqualTo("type",type);
+        }
+        return  ObjectRestResponse.succ(PageDataVO.pageInfo(page, limit, ()->mapper.selectByExample(example)));
+    }
+
+
 
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/JPushController.java

@@ -5,6 +5,7 @@ package com.xxfc.platform.universal.controller;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.universal.biz.JPushBiz;
+import com.xxfc.platform.universal.entity.MessagePush;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,5 +28,42 @@ public class JPushController {
 
         return jPushBiz.jpushToAllPlat(title);
     }
+
+    @RequestMapping(value = "/app/unauth/alls", method = RequestMethod.GET) //匹配的是href中的download请求
+    public ObjectRestResponse alls() throws Exception {
+        return jPushBiz.jpushToAllPlat1();
+    }
+
+    @RequestMapping(value = "/stype", method = RequestMethod.GET)
+    public ObjectRestResponse stype(@RequestParam(value = "id",defaultValue = "0") Integer id,
+                                   @RequestParam(value = "userIds",defaultValue = "") String userIds) throws Exception {
+        return jPushBiz.jpushToAlias(id,userIds);
+    }
+
+    @RequestMapping(value = "/addMessagePush", method = RequestMethod.POST)
+    public ObjectRestResponse addMessagePush(@RequestBody MessagePush messagePush){
+        return jPushBiz.updMessagePush(messagePush);
+    }
+
+    @RequestMapping(value = "/udpMessagePush", method = RequestMethod.POST)
+    public ObjectRestResponse udpMessagePush(@RequestBody MessagePush messagePush){
+        return jPushBiz.updMessagePush(messagePush);
+    }
+
+
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    public ObjectRestResponse delMessagePush(@RequestBody MessagePush messagePush){
+        return jPushBiz.delMessagePush(messagePush);
+    }
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public ObjectRestResponse getList(@RequestParam(value = "page",defaultValue = "1") Integer page,
+                                      @RequestParam(value = "limit",defaultValue = "10") Integer limit,
+                                      @RequestParam(value = "title",defaultValue = "") String title,
+                                      @RequestParam(value = "type",defaultValue = "0") Integer type){
+        return jPushBiz.getList(page,limit,title,type);
+    }
+
+
+
 }
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/mapper/MessagePushMapper.java

+package com.xxfc.platform.universal.mapper;
+
+import com.xxfc.platform.universal.entity.MessagePush;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 消息推送表
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-05-28 16:17:42
+ */
+public interface MessagePushMapper extends Mapper<MessagePush> {
+	
+}