Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

.idea/jarRepositories.xml

@@ -2,8 +2,8 @@
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
     <remote-repository>
-      <option name="id" value="public" />
-      <option name="name" value="aliyun nexus" />
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
       <option name="url" value="https://maven.aliyun.com/repository/public" />
     </remote-repository>
     <remote-repository>
@@ -11,6 +11,16 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="public" />
+      <option name="name" value="aliyun nexus" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
@@ -26,11 +36,6 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="custom_group" />
       <option name="name" value="Nexus Repository" />
@@ -41,10 +46,5 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
   </component>
 </project>

business-service/src/main/java/com/ozs/service/entity/vo/MsgAppPushVo.java

@@ -1,6 +1,7 @@
 package com.ozs.service.entity.vo;
 
 import com.ozs.common.vo.PageVo;
+import com.ozs.service.entity.BaseCameraManagement;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -20,6 +21,44 @@ public class MsgAppPushVo extends PageVo implements Serializable {
      */
     private String alarmId;
 
+    /**
+     * 报警行别(1上行2下行)
+     */
+    private Integer lineDir;
+
+    /**
+     * 报警里程位置
+     */
+    private String alarmMile;
+
+    /**
+     * 报警病害类型（目前只有1泥石流，后续可扩展使用）
+     */
+    private Integer alarmType;
+
+    /**
+     * 报警病害属性（可以给出泥石流的框定范围）
+     */
+    private String alarmAttr;
+
+    /**
+     * 报警图片地址
+     */
+    private String imageUrl;
+
+    /**
+     * 相机
+     */
+    private BaseCameraManagement baseCameraManagement;
+
+    public BaseCameraManagement getBaseCameraManagement() {
+        return baseCameraManagement;
+    }
+
+    public void setBaseCameraManagement(BaseCameraManagement baseCameraManagement) {
+        this.baseCameraManagement = baseCameraManagement;
+    }
+
     /**
      * 接收人
      */

business-service/src/main/resources/mapper/service/MsgAppPushMapper.xml

@@ -11,18 +11,47 @@
         <result column="update_by" property="updateBy"/>
         <result column="update_time" property="updateTime"/>
         <result column="remark" property="remark"/>
+        <result column="lineDir" property="lineDir"/>
+        <result column="alarmMile" property="alarmMile"/>
+        <result column="alarmType" property="alarmType"/>
+        <result column="alarmAttr" property="alarmAttr"/>
+        <result column="imageUrl" property="imageUrl"/>
+        <association property="baseCameraManagement" javaType="com.ozs.service.entity.BaseCameraManagement">
+            <id column="id" property="id"/>
+            <result column="railway_code" property="railwayCode"/>
+            <result column="channel" property="channel"/>
+            <result column="install_mile" property="installMile"/>
+            <result column="begin_mile" property="beginMile"/>
+            <result column="end_mile" property="endMile"/>
+            <result column="install_longitude" property="installLongitude"/>
+            <result column="install_latitude" property="installLatitude"/>
+        </association>
     </resultMap>
     <select id="alarmPushMsg" resultMap="MsgAppPushVoResult">
         select
-        alarm_id,
-        receive_by,
-        status,
-        create_by,
-        create_time,
-        update_by,
-        update_time,
-        remark
-        from msg_app_push
+        m.alarm_id,
+        m.receive_by,
+        a.line_dir AS lineDir,
+        a.alarm_mile AS alarmMile,
+        a.alarm_type AS alarmType,
+        a.alarm_attr AS alarmAttr,
+        a.image_url AS imageUrl,
+        m.status,
+        m.create_by,
+        m.create_time,
+        m.update_by,
+        m.update_time,
+        m.remark,
+        b.railway_code AS railway_code,
+        b.channel AS channel,
+        b.install_mile AS install_mile,
+        b.begin_mile AS begin_mile,
+        b.end_mile AS end_mile,
+        b.install_longitude AS install_longitude,
+        b.install_latitude AS install_latitude
+        from msg_app_push m left join
+        msg_alarm AS a on m.alarm_id=a.alarm_id left join
+        base_camera_management AS b on a.camera_code=b.camera_code
         <where>
             <if test="status != null and status != 0">
                 and UPPER(status) like UPPER(CONCAT('%',#{status},'%'))

hazard-admin/pom.xml

@@ -19,17 +19,32 @@
 
     <dependencies>
         <!-- webSocket web端 消息推送 -->
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
 
+        <!-- 极光推送 -->
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jpush-client</artifactId>
+            <version>3.3.8</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jmessage-client</artifactId>
+            <version>1.1.8</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jiguang-common</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

hazard-admin/src/main/java/com/ozs/web/controller/system/SysLoginController.java

@@ -2,6 +2,9 @@ package com.ozs.web.controller.system;
 
 import java.util.List;
 import java.util.Set;
+
+import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ozs.common.constant.Constants;
@@ -22,8 +25,7 @@ import com.ozs.system.service.ISysMenuService;
 @RestController
 //@RequestMapping("/app")
 @RequestMapping("")
-public class SysLoginController
-{
+public class SysLoginController {
     @Autowired
     private SysLoginService loginService;
 
@@ -33,6 +35,9 @@ public class SysLoginController
     @Autowired
     private SysPermissionService permissionService;
 
+    @Autowired
+    private TokenService tokenService;
+
     /**
      * 登录方法
      *
@@ -40,13 +45,18 @@ public class SysLoginController
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
-    {
+    public AjaxResult login(@RequestBody LoginBody loginBody) {
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
+        LoginUser loginedUser = tokenService.getLoginedUserByToken(token);
+        if (loginedUser != null) {
+            ajax.put("userId", loginedUser.getUserId());
+            ajax.put("username", loginedUser.getUsername());
+            ajax.put("avatar", loginedUser.getUser() != null ? loginedUser.getUser().getAvatar() : "");
+        }
         return ajax;
     }
 

hazard-admin/src/main/java/com/ozs/web/controller/websocket/JPushUtil.java

@@ -0,0 +1,377 @@
+package com.ozs.web.controller.websocket;
+
+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.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.AndroidNotification;
+import cn.jpush.api.push.model.notification.IosNotification;
+import cn.jpush.api.push.model.notification.Notification;
+import cn.jpush.api.schedule.ScheduleResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Author : sunhh
+ * @create 2023/3/14 11:20
+ */
+@Slf4j
+@Component
+public class JPushUtil {
+
+    // app
+    // AppKey ： 1712ced750e33d75d18cb577
+    // Master Secret ： e4b8ba2eda2acd0f75177b88
+    private final static String APPKER = "1712ced750e33d75d18cb577";
+    private final static String MASTERSECRET = "e4b8ba2eda2acd0f75177b88";
+    // 极光demo
+    // private final static String APPKER = "2a59ed096611fb4b82f08a44";
+    // private final static String MASTERSECRET = "a121413e4b89b0a4b3998fe0";
+
+    /**
+     * 推送给设备标识参数的用户
+     */
+    public static int sendToRegistrationId(List<String> alias, String notification_title, String msg_title, String msg_content, String extrasparam) {
+        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+        int result = 0;
+        try {
+            PushPayload pushPayload = JPushUtil.buildPushObjectAllAliasAlertWithTitle(alias, notification_title, msg_title, msg_content, extrasparam);
+            PushResult pushResult = jPushClient.sendPush(pushPayload);
+            if (pushResult.getResponseCode() == 200) {
+                result = 1;
+            }
+            log.info("[极光推送]PushResult result is " + pushResult);
+        } 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());
+        }
+        return result;
+    }
+
+    /**
+     * 推送给设备标识参数的用户（定时）
+     */
+    public static int sendToRegistrationId2(List<String> alias, String notification_title, String msg_title, String msg_content, String extrasparam, String time) {
+        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+        int result = 0;
+        try {
+            PushPayload pushPayload = JPushUtil.buildPushObjectAllAliasAlertWithTitle(alias, notification_title, msg_title, msg_content, extrasparam);
+            ScheduleResult scheduleResult = jPushClient.createSingleSchedule("测试", time, pushPayload);
+            if (scheduleResult.getResponseCode() == 200) {
+                result = 1;
+            }
+            log.info("[极光推送]ScheduleResult result is " + scheduleResult);
+        } 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());
+        }
+        return result;
+    }
+
+    /**
+     * 发送给所有安卓用户
+     */
+    public static int sendToAllAndroid(String notification_title, String msg_title, String msg_content, String extrasparam) {
+        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+        int result = 0;
+        try {
+            PushPayload pushPayload = JPushUtil.buildPushObjectAndroidAllAlertWithTitle(notification_title, msg_title, msg_content, extrasparam);
+            PushResult pushResult = jPushClient.sendPush(pushPayload);
+            if (pushResult.getResponseCode() == 200) {
+                result = 1;
+            }
+            log.info("[极光推送]PushResult result is " + pushResult);
+        } 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());
+        }
+        return result;
+    }
+
+    /**
+     * 发送给所有IOS用户
+     */
+    public static int sendToAllIos(String notification_title, String msg_title, String msg_content, String extrasparam) {
+        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+        int result = 0;
+        try {
+            PushPayload pushPayload = JPushUtil.buildPushObjectIosAllAlertWithTitle(notification_title, msg_title, msg_content, extrasparam);
+            PushResult pushResult = jPushClient.sendPush(pushPayload);
+            if (pushResult.getResponseCode() == 200) {
+                result = 1;
+            }
+            log.info("[极光推送]PushResult result is " + pushResult);
+        } 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());
+        }
+        return result;
+    }
+
+    /**
+     * 发送给所有用户
+     */
+    public static int sendToAll(String notification_title, String msg_title, String msg_content, String extrasparam) {
+        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+        int result = 0;
+        try {
+            PushPayload pushPayload = JPushUtil.buildPushObjectAndroidAndIos(notification_title, msg_title, msg_content, extrasparam);
+            PushResult pushResult = jPushClient.sendPush(pushPayload);
+            if (pushResult.getResponseCode() == 200) {
+                result = 1;
+            }
+            log.info("[极光推送]PushResult result is " + pushResult);
+        } 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());
+        }
+        return result;
+    }
+
+    /**
+     * 发送给所有用户(定时推送)
+     */
+    public static int sendToAll2(String notification_title, String msg_title, String msg_content, String extrasparam, String time) {
+        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+        int result = 0;
+        try {
+            PushPayload pushPayload = JPushUtil.buildPushObjectAndroidAndIos(notification_title, msg_title, msg_content, extrasparam);
+            ScheduleResult scheduleResult = jPushClient.createSingleSchedule("测试", time, pushPayload);
+            if (scheduleResult.getResponseCode() == 200) {
+                result = 1;
+            }
+            log.info("[极光推送]scheduleResult result is " + scheduleResult);
+        } 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());
+        }
+        return result;
+    }
+
+    public static PushPayload buildPushObjectAndroidAndIos(String notification_title, String msg_title, String msg_content, String extrasparam) {
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.android_ios())
+                .setAudience(Audience.all())
+                .setNotification(Notification.newBuilder()
+                        .setAlert(msg_content)
+                        .addPlatformNotification(AndroidNotification.newBuilder()
+                                .setAlert(msg_content)
+                                .setTitle(notification_title)
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url", extrasparam)
+                                .build()
+                        )
+                        .addPlatformNotification(IosNotification.newBuilder()
+                                //传一个IosAlert对象，指定apns title、title、subtitle等
+                                .setAlert(msg_content)
+                                //直接传alert
+                                //此项是指定此推送的badge自动加1
+                                .incrBadge(1)
+                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
+                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
+                                .setSound("sound.caf")
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url", extrasparam)
+                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
+                                // .setContentAvailable(true)
+                                .build()
+                        )
+                        .build()
+                )
+                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
+                .setMessage(Message.newBuilder()
+                        .setMsgContent(msg_content)
+                        .setTitle(msg_title)
+                        .addExtra("url", extrasparam)
+                        .build())
+                .setOptions(Options.newBuilder()
+                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+                        .setApnsProduction(true)
+                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+                        .setSendno(1)
+                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
+                        .setTimeToLive(86400)
+                        .build()
+                )
+                .build();
+    }
+
+    private static PushPayload buildPushObjectAllAliasAlertWithTitle(List<String> alias, String notification_title, String msg_title, String msg_content, String extrasparam) {
+        //创建一个IosAlert对象，可指定APNs的alert、title等字段
+        //IosAlert iosAlert =  IosAlert.newBuilder().setTitleAndBody("title", "alert body").build();
+        return PushPayload.newBuilder()
+                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
+                .setPlatform(Platform.all())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.registrationId(alias))
+//                .setAudience(Audience.registrationId(registrationId))
+                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
+                .setNotification(Notification.newBuilder()
+                        //指定当前推送的android通知
+                        .addPlatformNotification(AndroidNotification.newBuilder()
+                                .setAlert(msg_content)
+                                .setTitle(notification_title)
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url", extrasparam)
+                                .build())
+                        //指定当前推送的iOS通知
+                        .addPlatformNotification(IosNotification.newBuilder()
+                                //传一个IosAlert对象，指定apns title、title、subtitle等
+                                .setAlert(msg_content)
+                                //直接传alert
+                                //此项是指定此推送的badge自动加1
+                                .incrBadge(1)
+                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
+                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
+                                .setSound("sound.caf")
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url", extrasparam)
+                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
+                                //取消此注释，消息推送时ios将无法在锁屏情况接收
+                                // .setContentAvailable(true)
+                                .build())
+                        .build())
+                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
+                .setMessage(Message.newBuilder()
+                        .setMsgContent(msg_content)
+                        .setTitle(msg_title)
+                        .addExtra("url", extrasparam)
+                        .build())
+                .setOptions(Options.newBuilder()
+                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+                        .setApnsProduction(true)
+                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+                        .setSendno(1)
+                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天；
+                        .setTimeToLive(86400)
+                        .build())
+                .build();
+    }
+
+    private static PushPayload buildPushObjectAndroidAllAlertWithTitle(String notification_title, String msg_title, String msg_content, String extrasparam) {
+        return PushPayload.newBuilder()
+                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
+                .setPlatform(Platform.android())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.all())
+                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
+                .setNotification(Notification.newBuilder()
+                        //指定当前推送的android通知
+                        .addPlatformNotification(AndroidNotification.newBuilder()
+                                .setAlert(msg_content)
+                                .setTitle(notification_title)
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url", extrasparam)
+                                .build())
+                        .build()
+                )
+                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
+                .setMessage(Message.newBuilder()
+                        .setMsgContent(msg_content)
+                        .setTitle(msg_title)
+                        .addExtra("url", extrasparam)
+                        .build())
+                .setOptions(Options.newBuilder()
+                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+                        .setApnsProduction(true)
+                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+                        .setSendno(1)
+                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
+                        .setTimeToLive(86400)
+                        .build())
+                .build();
+    }
+
+    private static PushPayload buildPushObjectIosAllAlertWithTitle(String notification_title, String msg_title, String msg_content, String extrasparam) {
+        return PushPayload.newBuilder()
+                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
+                .setPlatform(Platform.ios())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.all())
+                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
+                .setNotification(Notification.newBuilder()
+                        //指定当前推送的android通知
+                        .addPlatformNotification(IosNotification.newBuilder()
+                                //传一个IosAlert对象，指定apns title、title、subtitle等
+                                .setAlert(msg_content)
+                                //直接传alert
+                                //此项是指定此推送的badge自动加1
+                                .incrBadge(1)
+                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
+                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
+                                .setSound("sound.caf")
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url", extrasparam)
+                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
+                                // .setContentAvailable(true)
+                                .build())
+                        .build()
+                )
+                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
+                .setMessage(Message.newBuilder()
+                        .setMsgContent(msg_content)
+                        .setTitle(msg_title)
+                        .addExtra("url", extrasparam)
+                        .build())
+                .setOptions(Options.newBuilder()
+                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+                        .setApnsProduction(true)
+                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+                        .setSendno(1)
+                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
+                        .setTimeToLive(86400)
+                        .build())
+                .build();
+    }
+
+//    public static void main(String[] args) {
+//        List<String> alias = new ArrayList<String>();
+//        alias.add("sunhh");
+////        alias.add("wangyy");
+//        //sendToRegistrationId(alias, "中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com");
+//        //sendToRegistrationId2(alias,"中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com","2021-07-14 17:54:00");
+////        sendToAllAndroid("中奖通知!!!!", "中奖通知!!!!!", "恭喜你中了100000000个亿!!!！", "https://www.baidu.com");
+//         sendToAllIos("中奖通知", "中奖通知", "恭喜你中了100个亿", "https://www.baidu.com");
+//         // sendToAll("中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com");
+//        //sendToAll2("中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com","2021-07-14 17:54:00");
+//    }
+}

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketConteoller.java

@@ -62,6 +62,11 @@ public class WebSocketConteoller extends BaseController {
         msgAlarmResp.setRailwayName(cameraName);
         // 推送消息reqMsgAlarmVo
         webSocketServer.sendMoreMessage(list, objStr(msgAlarmResp));
+
+        // app 消息推送
+        List<String> alias = new ArrayList<String>();
+        alias.add("sunhh");
+        JPushUtil.sendToRegistrationId(alias, "中奖通知!!!!", "中奖通知!!!!!", "恭喜你中了100000000个亿!!!！", "https://www.baidu.com");
         HashMap<String, Object> map = new HashMap<>();
         map.put("code", 200);
         return map;

hazard-sdk/pom.xml

@@ -15,32 +15,32 @@
 
     <dependencies>
         <!-- webSocket web端 消息推送 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-thymeleaf</artifactId>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-websocket</artifactId>-->
+<!--        </dependency>-->
 
-        <!-- 极光推送 -->
-        <dependency>
-            <groupId>cn.jpush.api</groupId>
-            <artifactId>jpush-client</artifactId>
-            <version>3.3.8</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.jpush.api</groupId>
-            <artifactId>jmessage-client</artifactId>
-            <version>1.1.8</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.jpush.api</groupId>
-            <artifactId>jiguang-common</artifactId>
-            <version>1.1.3</version>
-        </dependency>
+<!--        &lt;!&ndash; 极光推送 &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>cn.jpush.api</groupId>-->
+<!--            <artifactId>jpush-client</artifactId>-->
+<!--            <version>3.3.8</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>cn.jpush.api</groupId>-->
+<!--            <artifactId>jmessage-client</artifactId>-->
+<!--            <version>1.1.8</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>cn.jpush.api</groupId>-->
+<!--            <artifactId>jiguang-common</artifactId>-->
+<!--            <version>1.1.3</version>-->
+<!--        </dependency>-->
 <!--        <dependency>-->
 <!--            <groupId>io.netty</groupId>-->
 <!--            <artifactId>netty-all</artifactId>-->

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -3,28 +3,20 @@ package com.ozs.controller.upload;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ozs.common.core.domain.Result;
-import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.utils.ApiTokenUtils;
-import com.ozs.common.utils.AppTokenUtils;
-import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.HttpClientUtil;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.stateSecrets.SM4Utils;
-import com.ozs.jpush.JPushUtil;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAlarmFrequency;
 import com.ozs.service.entity.SvcAddress;
-import com.ozs.service.entity.vo.MsgAlarmResp;
-import com.ozs.service.mapper.BaseUserMapper;
 import com.ozs.service.service.*;
 import com.ozs.vo.ReqDeviceVo;
 import com.ozs.vo.ReqMsgAlarmVo;
 import com.ozs.vo.RespGeoHazardMonitorVo;
 import com.ozs.vo.RespMsgAlarmVo;
-import com.ozs.websocket.WebSocketServer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,26 +56,6 @@ public class GeoHazardMonitorTokenController {
     @Value("${sdk.publish:http://47.106.159.135:18819/hazard/sdk/publish}")
     private String sdkUrl;
 
-    /**
-     * 测试app消息推送
-     *
-     * @return
-     */
-    @PostMapping("/appjiguang")
-    public String appjiguang(@RequestBody SvcAddress svcAddress) {
-        List<String> alias = new ArrayList<String>();
-        alias.add("sunhh");
-//        alias.add("wangyy");
-        //sendToRegistrationId(alias, "中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com");
-        //sendToRegistrationId2(alias,"中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com","2021-07-14 17:54:00");
-//        sendToAllAndroid("中奖通知!!!!", "中奖通知!!!!!", "恭喜你中了100000000个亿!!!！", "https://www.baidu.com");
-        JPushUtil.sendToAllIos("中奖通知", "中奖通知", "恭喜你中了100个亿", "https://www.baidu.com");
-        // sendToAll("中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com");
-        //sendToAll2("中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com","2021-07-14 17:54:00");
-        return "推送成功！";
-    }
-
-
     /**
      * 获取web访问令牌
      *
@@ -151,10 +123,6 @@ public class GeoHazardMonitorTokenController {
                 wrapper.eq(BaseCameraManagement::getCameraCode, reqMsgAlarmVo.getAlarmCamera());
             }
             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
-            // app 消息推送
-//            List<String> alias = new ArrayList<String>();
-//            alias.add("sunhh");
-//            JPushUtil.sendToRegistrationId(alias, "中奖通知!!!!", "中奖通知!!!!!", "恭喜你中了100000000个亿!!!！", "https://www.baidu.com");
             log.info("baseCameraManagement:{}", baseCameraManagement);
             if (ObjectUtils.isEmpty(reqMsgAlarmVo.getLineDir())) {
                 reqMsgAlarmVo.setLineDir(baseCameraManagement.getLineDir());

hazard-sdk/src/main/java/com/ozs/jpush/JPushUtil.java

@@ -1,376 +1,376 @@
-package com.ozs.jpush;
-
-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.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.AndroidNotification;
-import cn.jpush.api.push.model.notification.IosNotification;
-import cn.jpush.api.push.model.notification.Notification;
-import cn.jpush.api.schedule.ScheduleResult;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author : sunhh
- * @create 2023/3/13 11:19
- */
-@Slf4j
-@Component
-public class JPushUtil {
-
-//    AppKey ： 1712ced750e33d75d18cb577
-//    Master Secret ： e4b8ba2eda2acd0f75177b88
-    private final static String APPKER = "1712ced750e33d75d18cb577";
-    private final static String MASTERSECRET = "e4b8ba2eda2acd0f75177b88";
-//    private final static String APPKER = "2a59ed096611fb4b82f08a44";
-//    private final static String MASTERSECRET = "a121413e4b89b0a4b3998fe0";
-
-    /**
-     * 推送给设备标识参数的用户
-     */
-    public static int sendToRegistrationId(List<String> alias, String notification_title, String msg_title, String msg_content, String extrasparam) {
-        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
-        int result = 0;
-        try {
-            PushPayload pushPayload = JPushUtil.buildPushObjectAllAliasAlertWithTitle(alias, notification_title, msg_title, msg_content, extrasparam);
-            PushResult pushResult = jPushClient.sendPush(pushPayload);
-            if (pushResult.getResponseCode() == 200) {
-                result = 1;
-            }
-            log.info("[极光推送]PushResult result is " + pushResult);
-        } 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());
-        }
-        return result;
-    }
-
-    /**
-     * 推送给设备标识参数的用户（定时）
-     */
-    public static int sendToRegistrationId2(List<String> alias, String notification_title, String msg_title, String msg_content, String extrasparam, String time) {
-        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
-        int result = 0;
-        try {
-            PushPayload pushPayload = JPushUtil.buildPushObjectAllAliasAlertWithTitle(alias, notification_title, msg_title, msg_content, extrasparam);
-            ScheduleResult scheduleResult = jPushClient.createSingleSchedule("测试", time, pushPayload);
-            if (scheduleResult.getResponseCode() == 200) {
-                result = 1;
-            }
-            log.info("[极光推送]ScheduleResult result is " + scheduleResult);
-        } 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());
-        }
-        return result;
-    }
-
-    /**
-     * 发送给所有安卓用户
-     */
-    public static int sendToAllAndroid(String notification_title, String msg_title, String msg_content, String extrasparam) {
-        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
-        int result = 0;
-        try {
-            PushPayload pushPayload = JPushUtil.buildPushObjectAndroidAllAlertWithTitle(notification_title, msg_title, msg_content, extrasparam);
-            PushResult pushResult = jPushClient.sendPush(pushPayload);
-            if (pushResult.getResponseCode() == 200) {
-                result = 1;
-            }
-            log.info("[极光推送]PushResult result is " + pushResult);
-        } 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());
-        }
-        return result;
-    }
-
-    /**
-     * 发送给所有IOS用户
-     */
-    public static int sendToAllIos(String notification_title, String msg_title, String msg_content, String extrasparam) {
-        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
-        int result = 0;
-        try {
-            PushPayload pushPayload = JPushUtil.buildPushObjectIosAllAlertWithTitle(notification_title, msg_title, msg_content, extrasparam);
-            PushResult pushResult = jPushClient.sendPush(pushPayload);
-            if (pushResult.getResponseCode() == 200) {
-                result = 1;
-            }
-            log.info("[极光推送]PushResult result is " + pushResult);
-        } 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());
-        }
-        return result;
-    }
-
-    /**
-     * 发送给所有用户
-     */
-    public static int sendToAll(String notification_title, String msg_title, String msg_content, String extrasparam) {
-        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
-        int result = 0;
-        try {
-            PushPayload pushPayload = JPushUtil.buildPushObjectAndroidAndIos(notification_title, msg_title, msg_content, extrasparam);
-            PushResult pushResult = jPushClient.sendPush(pushPayload);
-            if (pushResult.getResponseCode() == 200) {
-                result = 1;
-            }
-            log.info("[极光推送]PushResult result is " + pushResult);
-        } 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());
-        }
-        return result;
-    }
-
-    /**
-     * 发送给所有用户(定时推送)
-     */
-    public static int sendToAll2(String notification_title, String msg_title, String msg_content, String extrasparam, String time) {
-        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
-        int result = 0;
-        try {
-            PushPayload pushPayload = JPushUtil.buildPushObjectAndroidAndIos(notification_title, msg_title, msg_content, extrasparam);
-            ScheduleResult scheduleResult = jPushClient.createSingleSchedule("测试", time, pushPayload);
-            if (scheduleResult.getResponseCode() == 200) {
-                result = 1;
-            }
-            log.info("[极光推送]scheduleResult result is " + scheduleResult);
-        } 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());
-        }
-        return result;
-    }
-
-    public static PushPayload buildPushObjectAndroidAndIos(String notification_title, String msg_title, String msg_content, String extrasparam) {
-        return PushPayload.newBuilder()
-                .setPlatform(Platform.android_ios())
-                .setAudience(Audience.all())
-                .setNotification(Notification.newBuilder()
-                        .setAlert(msg_content)
-                        .addPlatformNotification(AndroidNotification.newBuilder()
-                                .setAlert(msg_content)
-                                .setTitle(notification_title)
-                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
-                                .addExtra("url", extrasparam)
-                                .build()
-                        )
-                        .addPlatformNotification(IosNotification.newBuilder()
-                                //传一个IosAlert对象，指定apns title、title、subtitle等
-                                .setAlert(msg_content)
-                                //直接传alert
-                                //此项是指定此推送的badge自动加1
-                                .incrBadge(1)
-                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
-                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
-                                .setSound("sound.caf")
-                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
-                                .addExtra("url", extrasparam)
-                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
-                                // .setContentAvailable(true)
-                                .build()
-                        )
-                        .build()
-                )
-                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
-                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
-                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
-                .setMessage(Message.newBuilder()
-                        .setMsgContent(msg_content)
-                        .setTitle(msg_title)
-                        .addExtra("url", extrasparam)
-                        .build())
-                .setOptions(Options.newBuilder()
-                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
-                        .setApnsProduction(true)
-                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
-                        .setSendno(1)
-                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
-                        .setTimeToLive(86400)
-                        .build()
-                )
-                .build();
-    }
-
-    private static PushPayload buildPushObjectAllAliasAlertWithTitle(List<String> alias, String notification_title, String msg_title, String msg_content, String extrasparam) {
-        //创建一个IosAlert对象，可指定APNs的alert、title等字段
-        //IosAlert iosAlert =  IosAlert.newBuilder().setTitleAndBody("title", "alert body").build();
-        return PushPayload.newBuilder()
-                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
-                .setPlatform(Platform.all())
-                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
-                .setAudience(Audience.registrationId(alias))
-//                .setAudience(Audience.registrationId(registrationId))
-                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
-                .setNotification(Notification.newBuilder()
-                        //指定当前推送的android通知
-                        .addPlatformNotification(AndroidNotification.newBuilder()
-                                .setAlert(msg_content)
-                                .setTitle(notification_title)
-                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
-                                .addExtra("url", extrasparam)
-                                .build())
-                        //指定当前推送的iOS通知
-                        .addPlatformNotification(IosNotification.newBuilder()
-                                //传一个IosAlert对象，指定apns title、title、subtitle等
-                                .setAlert(msg_content)
-                                //直接传alert
-                                //此项是指定此推送的badge自动加1
-                                .incrBadge(1)
-                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
-                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
-                                .setSound("sound.caf")
-                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
-                                .addExtra("url", extrasparam)
-                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
-                                //取消此注释，消息推送时ios将无法在锁屏情况接收
-                                // .setContentAvailable(true)
-                                .build())
-                        .build())
-                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
-                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
-                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
-                .setMessage(Message.newBuilder()
-                        .setMsgContent(msg_content)
-                        .setTitle(msg_title)
-                        .addExtra("url", extrasparam)
-                        .build())
-                .setOptions(Options.newBuilder()
-                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
-                        .setApnsProduction(true)
-                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
-                        .setSendno(1)
-                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天；
-                        .setTimeToLive(86400)
-                        .build())
-                .build();
-    }
-
-    private static PushPayload buildPushObjectAndroidAllAlertWithTitle(String notification_title, String msg_title, String msg_content, String extrasparam) {
-        return PushPayload.newBuilder()
-                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
-                .setPlatform(Platform.android())
-                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
-                .setAudience(Audience.all())
-                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
-                .setNotification(Notification.newBuilder()
-                        //指定当前推送的android通知
-                        .addPlatformNotification(AndroidNotification.newBuilder()
-                                .setAlert(msg_content)
-                                .setTitle(notification_title)
-                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
-                                .addExtra("url", extrasparam)
-                                .build())
-                        .build()
-                )
-                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
-                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
-                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
-                .setMessage(Message.newBuilder()
-                        .setMsgContent(msg_content)
-                        .setTitle(msg_title)
-                        .addExtra("url", extrasparam)
-                        .build())
-                .setOptions(Options.newBuilder()
-                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
-                        .setApnsProduction(true)
-                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
-                        .setSendno(1)
-                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
-                        .setTimeToLive(86400)
-                        .build())
-                .build();
-    }
-
-    private static PushPayload buildPushObjectIosAllAlertWithTitle(String notification_title, String msg_title, String msg_content, String extrasparam) {
-        return PushPayload.newBuilder()
-                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
-                .setPlatform(Platform.ios())
-                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
-                .setAudience(Audience.all())
-                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
-                .setNotification(Notification.newBuilder()
-                        //指定当前推送的android通知
-                        .addPlatformNotification(IosNotification.newBuilder()
-                                //传一个IosAlert对象，指定apns title、title、subtitle等
-                                .setAlert(msg_content)
-                                //直接传alert
-                                //此项是指定此推送的badge自动加1
-                                .incrBadge(1)
-                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
-                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
-                                .setSound("sound.caf")
-                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
-                                .addExtra("url", extrasparam)
-                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
-                                // .setContentAvailable(true)
-                                .build())
-                        .build()
-                )
-                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
-                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
-                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
-                .setMessage(Message.newBuilder()
-                        .setMsgContent(msg_content)
-                        .setTitle(msg_title)
-                        .addExtra("url", extrasparam)
-                        .build())
-                .setOptions(Options.newBuilder()
-                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
-                        .setApnsProduction(true)
-                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
-                        .setSendno(1)
-                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
-                        .setTimeToLive(86400)
-                        .build())
-                .build();
-    }
-
-//    public static void main(String[] args) {
-//        List<String> alias = new ArrayList<String>();
-//        alias.add("sunhh");
-////        alias.add("wangyy");
-//        //sendToRegistrationId(alias, "中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com");
-//        //sendToRegistrationId2(alias,"中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com","2021-07-14 17:54:00");
-////        sendToAllAndroid("中奖通知!!!!", "中奖通知!!!!!", "恭喜你中了100000000个亿!!!！", "https://www.baidu.com");
-//         sendToAllIos("中奖通知", "中奖通知", "恭喜你中了100个亿", "https://www.baidu.com");
-//         // sendToAll("中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com");
-//        //sendToAll2("中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com","2021-07-14 17:54:00");
+//package com.ozs.jpush;
+//
+//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.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.AndroidNotification;
+//import cn.jpush.api.push.model.notification.IosNotification;
+//import cn.jpush.api.push.model.notification.Notification;
+//import cn.jpush.api.schedule.ScheduleResult;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+///**
+// * @Author : sunhh
+// * @create 2023/3/13 11:19
+// */
+//@Slf4j
+//@Component
+//public class JPushUtil {
+//
+////    AppKey ： 1712ced750e33d75d18cb577
+////    Master Secret ： e4b8ba2eda2acd0f75177b88
+//    private final static String APPKER = "1712ced750e33d75d18cb577";
+//    private final static String MASTERSECRET = "e4b8ba2eda2acd0f75177b88";
+////    private final static String APPKER = "2a59ed096611fb4b82f08a44";
+////    private final static String MASTERSECRET = "a121413e4b89b0a4b3998fe0";
+//
+//    /**
+//     * 推送给设备标识参数的用户
+//     */
+//    public static int sendToRegistrationId(List<String> alias, String notification_title, String msg_title, String msg_content, String extrasparam) {
+//        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+//        int result = 0;
+//        try {
+//            PushPayload pushPayload = JPushUtil.buildPushObjectAllAliasAlertWithTitle(alias, notification_title, msg_title, msg_content, extrasparam);
+//            PushResult pushResult = jPushClient.sendPush(pushPayload);
+//            if (pushResult.getResponseCode() == 200) {
+//                result = 1;
+//            }
+//            log.info("[极光推送]PushResult result is " + pushResult);
+//        } 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());
+//        }
+//        return result;
 //    }
-}
+//
+//    /**
+//     * 推送给设备标识参数的用户（定时）
+//     */
+//    public static int sendToRegistrationId2(List<String> alias, String notification_title, String msg_title, String msg_content, String extrasparam, String time) {
+//        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+//        int result = 0;
+//        try {
+//            PushPayload pushPayload = JPushUtil.buildPushObjectAllAliasAlertWithTitle(alias, notification_title, msg_title, msg_content, extrasparam);
+//            ScheduleResult scheduleResult = jPushClient.createSingleSchedule("测试", time, pushPayload);
+//            if (scheduleResult.getResponseCode() == 200) {
+//                result = 1;
+//            }
+//            log.info("[极光推送]ScheduleResult result is " + scheduleResult);
+//        } 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());
+//        }
+//        return result;
+//    }
+//
+//    /**
+//     * 发送给所有安卓用户
+//     */
+//    public static int sendToAllAndroid(String notification_title, String msg_title, String msg_content, String extrasparam) {
+//        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+//        int result = 0;
+//        try {
+//            PushPayload pushPayload = JPushUtil.buildPushObjectAndroidAllAlertWithTitle(notification_title, msg_title, msg_content, extrasparam);
+//            PushResult pushResult = jPushClient.sendPush(pushPayload);
+//            if (pushResult.getResponseCode() == 200) {
+//                result = 1;
+//            }
+//            log.info("[极光推送]PushResult result is " + pushResult);
+//        } 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());
+//        }
+//        return result;
+//    }
+//
+//    /**
+//     * 发送给所有IOS用户
+//     */
+//    public static int sendToAllIos(String notification_title, String msg_title, String msg_content, String extrasparam) {
+//        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+//        int result = 0;
+//        try {
+//            PushPayload pushPayload = JPushUtil.buildPushObjectIosAllAlertWithTitle(notification_title, msg_title, msg_content, extrasparam);
+//            PushResult pushResult = jPushClient.sendPush(pushPayload);
+//            if (pushResult.getResponseCode() == 200) {
+//                result = 1;
+//            }
+//            log.info("[极光推送]PushResult result is " + pushResult);
+//        } 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());
+//        }
+//        return result;
+//    }
+//
+//    /**
+//     * 发送给所有用户
+//     */
+//    public static int sendToAll(String notification_title, String msg_title, String msg_content, String extrasparam) {
+//        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+//        int result = 0;
+//        try {
+//            PushPayload pushPayload = JPushUtil.buildPushObjectAndroidAndIos(notification_title, msg_title, msg_content, extrasparam);
+//            PushResult pushResult = jPushClient.sendPush(pushPayload);
+//            if (pushResult.getResponseCode() == 200) {
+//                result = 1;
+//            }
+//            log.info("[极光推送]PushResult result is " + pushResult);
+//        } 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());
+//        }
+//        return result;
+//    }
+//
+//    /**
+//     * 发送给所有用户(定时推送)
+//     */
+//    public static int sendToAll2(String notification_title, String msg_title, String msg_content, String extrasparam, String time) {
+//        JPushClient jPushClient = new JPushClient(MASTERSECRET, APPKER);
+//        int result = 0;
+//        try {
+//            PushPayload pushPayload = JPushUtil.buildPushObjectAndroidAndIos(notification_title, msg_title, msg_content, extrasparam);
+//            ScheduleResult scheduleResult = jPushClient.createSingleSchedule("测试", time, pushPayload);
+//            if (scheduleResult.getResponseCode() == 200) {
+//                result = 1;
+//            }
+//            log.info("[极光推送]scheduleResult result is " + scheduleResult);
+//        } 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());
+//        }
+//        return result;
+//    }
+//
+//    public static PushPayload buildPushObjectAndroidAndIos(String notification_title, String msg_title, String msg_content, String extrasparam) {
+//        return PushPayload.newBuilder()
+//                .setPlatform(Platform.android_ios())
+//                .setAudience(Audience.all())
+//                .setNotification(Notification.newBuilder()
+//                        .setAlert(msg_content)
+//                        .addPlatformNotification(AndroidNotification.newBuilder()
+//                                .setAlert(msg_content)
+//                                .setTitle(notification_title)
+//                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+//                                .addExtra("url", extrasparam)
+//                                .build()
+//                        )
+//                        .addPlatformNotification(IosNotification.newBuilder()
+//                                //传一个IosAlert对象，指定apns title、title、subtitle等
+//                                .setAlert(msg_content)
+//                                //直接传alert
+//                                //此项是指定此推送的badge自动加1
+//                                .incrBadge(1)
+//                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
+//                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
+//                                .setSound("sound.caf")
+//                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+//                                .addExtra("url", extrasparam)
+//                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
+//                                // .setContentAvailable(true)
+//                                .build()
+//                        )
+//                        .build()
+//                )
+//                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+//                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+//                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
+//                .setMessage(Message.newBuilder()
+//                        .setMsgContent(msg_content)
+//                        .setTitle(msg_title)
+//                        .addExtra("url", extrasparam)
+//                        .build())
+//                .setOptions(Options.newBuilder()
+//                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+//                        .setApnsProduction(true)
+//                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+//                        .setSendno(1)
+//                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
+//                        .setTimeToLive(86400)
+//                        .build()
+//                )
+//                .build();
+//    }
+//
+//    private static PushPayload buildPushObjectAllAliasAlertWithTitle(List<String> alias, String notification_title, String msg_title, String msg_content, String extrasparam) {
+//        //创建一个IosAlert对象，可指定APNs的alert、title等字段
+//        //IosAlert iosAlert =  IosAlert.newBuilder().setTitleAndBody("title", "alert body").build();
+//        return PushPayload.newBuilder()
+//                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
+//                .setPlatform(Platform.all())
+//                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+//                .setAudience(Audience.registrationId(alias))
+////                .setAudience(Audience.registrationId(registrationId))
+//                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
+//                .setNotification(Notification.newBuilder()
+//                        //指定当前推送的android通知
+//                        .addPlatformNotification(AndroidNotification.newBuilder()
+//                                .setAlert(msg_content)
+//                                .setTitle(notification_title)
+//                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+//                                .addExtra("url", extrasparam)
+//                                .build())
+//                        //指定当前推送的iOS通知
+//                        .addPlatformNotification(IosNotification.newBuilder()
+//                                //传一个IosAlert对象，指定apns title、title、subtitle等
+//                                .setAlert(msg_content)
+//                                //直接传alert
+//                                //此项是指定此推送的badge自动加1
+//                                .incrBadge(1)
+//                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
+//                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
+//                                .setSound("sound.caf")
+//                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+//                                .addExtra("url", extrasparam)
+//                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
+//                                //取消此注释，消息推送时ios将无法在锁屏情况接收
+//                                // .setContentAvailable(true)
+//                                .build())
+//                        .build())
+//                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+//                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+//                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
+//                .setMessage(Message.newBuilder()
+//                        .setMsgContent(msg_content)
+//                        .setTitle(msg_title)
+//                        .addExtra("url", extrasparam)
+//                        .build())
+//                .setOptions(Options.newBuilder()
+//                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+//                        .setApnsProduction(true)
+//                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+//                        .setSendno(1)
+//                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天；
+//                        .setTimeToLive(86400)
+//                        .build())
+//                .build();
+//    }
+//
+//    private static PushPayload buildPushObjectAndroidAllAlertWithTitle(String notification_title, String msg_title, String msg_content, String extrasparam) {
+//        return PushPayload.newBuilder()
+//                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
+//                .setPlatform(Platform.android())
+//                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+//                .setAudience(Audience.all())
+//                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
+//                .setNotification(Notification.newBuilder()
+//                        //指定当前推送的android通知
+//                        .addPlatformNotification(AndroidNotification.newBuilder()
+//                                .setAlert(msg_content)
+//                                .setTitle(notification_title)
+//                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+//                                .addExtra("url", extrasparam)
+//                                .build())
+//                        .build()
+//                )
+//                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+//                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+//                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
+//                .setMessage(Message.newBuilder()
+//                        .setMsgContent(msg_content)
+//                        .setTitle(msg_title)
+//                        .addExtra("url", extrasparam)
+//                        .build())
+//                .setOptions(Options.newBuilder()
+//                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+//                        .setApnsProduction(true)
+//                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+//                        .setSendno(1)
+//                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
+//                        .setTimeToLive(86400)
+//                        .build())
+//                .build();
+//    }
+//
+//    private static PushPayload buildPushObjectIosAllAlertWithTitle(String notification_title, String msg_title, String msg_content, String extrasparam) {
+//        return PushPayload.newBuilder()
+//                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
+//                .setPlatform(Platform.ios())
+//                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+//                .setAudience(Audience.all())
+//                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
+//                .setNotification(Notification.newBuilder()
+//                        //指定当前推送的android通知
+//                        .addPlatformNotification(IosNotification.newBuilder()
+//                                //传一个IosAlert对象，指定apns title、title、subtitle等
+//                                .setAlert(msg_content)
+//                                //直接传alert
+//                                //此项是指定此推送的badge自动加1
+//                                .incrBadge(1)
+//                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
+//                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
+//                                .setSound("sound.caf")
+//                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+//                                .addExtra("url", extrasparam)
+//                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
+//                                // .setContentAvailable(true)
+//                                .build())
+//                        .build()
+//                )
+//                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+//                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+//                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
+//                .setMessage(Message.newBuilder()
+//                        .setMsgContent(msg_content)
+//                        .setTitle(msg_title)
+//                        .addExtra("url", extrasparam)
+//                        .build())
+//                .setOptions(Options.newBuilder()
+//                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+//                        .setApnsProduction(true)
+//                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+//                        .setSendno(1)
+//                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
+//                        .setTimeToLive(86400)
+//                        .build())
+//                .build();
+//    }
+//
+////    public static void main(String[] args) {
+////        List<String> alias = new ArrayList<String>();
+////        alias.add("sunhh");
+//////        alias.add("wangyy");
+////        //sendToRegistrationId(alias, "中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com");
+////        //sendToRegistrationId2(alias,"中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com","2021-07-14 17:54:00");
+//////        sendToAllAndroid("中奖通知!!!!", "中奖通知!!!!!", "恭喜你中了100000000个亿!!!！", "https://www.baidu.com");
+////         sendToAllIos("中奖通知", "中奖通知", "恭喜你中了100个亿", "https://www.baidu.com");
+////         // sendToAll("中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com");
+////        //sendToAll2("中奖通知", "中奖通知", "恭喜你中了100个亿！", "https://www.baidu.com","2021-07-14 17:54:00");
+////    }
+//}

hazard-sdk/src/main/java/com/ozs/websocket/WebSocketConfig.java

@@ -1,21 +1,21 @@
-package com.ozs.websocket;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-
-/**
- * @Author : sunhh
- * @create 2023/3/7 16:17
- */
-@Configuration
-public class WebSocketConfig {
-    /**
-     * 	注入ServerEndpointExporter，
-     * 	这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint
-     */
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter() {
-        return new ServerEndpointExporter();
-    }
-}
+//package com.ozs.websocket;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+//
+///**
+// * @Author : sunhh
+// * @create 2023/3/7 16:17
+// */
+//@Configuration
+//public class WebSocketConfig {
+//    /**
+//     * 	注入ServerEndpointExporter，
+//     * 	这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint
+//     */
+//    @Bean
+//    public ServerEndpointExporter serverEndpointExporter() {
+//        return new ServerEndpointExporter();
+//    }
+//}

hazard-sdk/src/main/java/com/ozs/websocket/WebSocketServer.java

@@ -1,129 +1,129 @@
-package com.ozs.websocket;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.*;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-/**
- * @Author : sunhh
- * @create 2023/3/7 16:15
- */
-@Slf4j
-@Component
-@ServerEndpoint("/websocket/{userId}")  // 接口路径 ws://localhost:8087/webSocket/userId;
-public class WebSocketServer {
-
-    //与某个客户端的连接会话，需要通过它来给客户端发送数据
-    private Session session;
-    /**
-     * 用户ID
-     */
-    private String userId;
-
-    //concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象。
-    //虽然@Component默认是单例模式的，但springboot还是会为每个websocket连接初始化一个bean，所以可以用一个静态set保存起来。
-    //  注：底下WebSocket是当前类名
-    private static CopyOnWriteArraySet<WebSocketServer> webSockets =new CopyOnWriteArraySet<>();
-    // 用来存在线连接用户信息
-    private static ConcurrentHashMap<String,Session> sessionPool = new ConcurrentHashMap<String,Session>();
-
-    /**
-     * 链接成功调用的方法
-     */
-    @OnOpen
-    public void onOpen(Session session, @PathParam(value="userId")String userId) {
-        try {
-            this.session = session;
-            this.userId = userId;
-            webSockets.add(this);
-            sessionPool.put(userId, session);
-            log.info("【websocket消息】有新的连接，总数为:"+webSockets.size());
-        } catch (Exception e) {
-        }
-    }
-
-    /**
-     * 链接关闭调用的方法
-     */
-    @OnClose
-    public void onClose() {
-        try {
-            webSockets.remove(this);
-            sessionPool.remove(this.userId);
-            log.info("【websocket消息】连接断开，总数为:"+webSockets.size());
-        } catch (Exception e) {
-        }
-    }
-    /**
-     * 收到客户端消息后调用的方法
-     *
-     * @param message
-     */
-    @OnMessage
-    public void onMessage(String message) {
-        log.info("【websocket消息】收到客户端消息:"+message);
-    }
-
-    /** 发送错误时的处理
-     * @param session
-     * @param error
-     */
-    @OnError
-    public void onError(Session session, Throwable error) {
-
-        log.error("用户错误,原因:"+error.getMessage());
-        error.printStackTrace();
-    }
-
-
-    // 此为广播消息
-    public void sendAllMessage(String message) {
-        log.info("【websocket消息】广播消息:"+message);
-        for(WebSocketServer webSocket : webSockets) {
-            try {
-                if(webSocket.session.isOpen()) {
-                    webSocket.session.getAsyncRemote().sendText(message);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    // 此为单点消息
-    public void sendOneMessage(String userId, String message) {
-        Session session = sessionPool.get(userId);
-        if (session != null&&session.isOpen()) {
-            try {
-                log.info("【websocket消息】 单点消息:"+message);
-                session.getAsyncRemote().sendText(message);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    // 此为单点消息(多人)
-    public void sendMoreMessage(List<String> userIds, String message) {
-        for(String userId:userIds) {
-            Session session = sessionPool.get(userId);
-            if (session != null&&session.isOpen()) {
-                try {
-                    log.info("【websocket消息】 单点消息:"+message);
-                    session.getAsyncRemote().sendText(message);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-    }
-}
+//package com.ozs.websocket;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+//import javax.websocket.*;
+//import javax.websocket.server.PathParam;
+//import javax.websocket.server.ServerEndpoint;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.concurrent.ConcurrentHashMap;
+//import java.util.concurrent.CopyOnWriteArraySet;
+//
+///**
+// * @Author : sunhh
+// * @create 2023/3/7 16:15
+// */
+//@Slf4j
+//@Component
+//@ServerEndpoint("/websocket/{userId}")  // 接口路径 ws://localhost:8087/webSocket/userId;
+//public class WebSocketServer {
+//
+//    //与某个客户端的连接会话，需要通过它来给客户端发送数据
+//    private Session session;
+//    /**
+//     * 用户ID
+//     */
+//    private String userId;
+//
+//    //concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象。
+//    //虽然@Component默认是单例模式的，但springboot还是会为每个websocket连接初始化一个bean，所以可以用一个静态set保存起来。
+//    //  注：底下WebSocket是当前类名
+//    private static CopyOnWriteArraySet<WebSocketServer> webSockets =new CopyOnWriteArraySet<>();
+//    // 用来存在线连接用户信息
+//    private static ConcurrentHashMap<String,Session> sessionPool = new ConcurrentHashMap<String,Session>();
+//
+//    /**
+//     * 链接成功调用的方法
+//     */
+//    @OnOpen
+//    public void onOpen(Session session, @PathParam(value="userId")String userId) {
+//        try {
+//            this.session = session;
+//            this.userId = userId;
+//            webSockets.add(this);
+//            sessionPool.put(userId, session);
+//            log.info("【websocket消息】有新的连接，总数为:"+webSockets.size());
+//        } catch (Exception e) {
+//        }
+//    }
+//
+//    /**
+//     * 链接关闭调用的方法
+//     */
+//    @OnClose
+//    public void onClose() {
+//        try {
+//            webSockets.remove(this);
+//            sessionPool.remove(this.userId);
+//            log.info("【websocket消息】连接断开，总数为:"+webSockets.size());
+//        } catch (Exception e) {
+//        }
+//    }
+//    /**
+//     * 收到客户端消息后调用的方法
+//     *
+//     * @param message
+//     */
+//    @OnMessage
+//    public void onMessage(String message) {
+//        log.info("【websocket消息】收到客户端消息:"+message);
+//    }
+//
+//    /** 发送错误时的处理
+//     * @param session
+//     * @param error
+//     */
+//    @OnError
+//    public void onError(Session session, Throwable error) {
+//
+//        log.error("用户错误,原因:"+error.getMessage());
+//        error.printStackTrace();
+//    }
+//
+//
+//    // 此为广播消息
+//    public void sendAllMessage(String message) {
+//        log.info("【websocket消息】广播消息:"+message);
+//        for(WebSocketServer webSocket : webSockets) {
+//            try {
+//                if(webSocket.session.isOpen()) {
+//                    webSocket.session.getAsyncRemote().sendText(message);
+//                }
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+//    }
+//
+//    // 此为单点消息
+//    public void sendOneMessage(String userId, String message) {
+//        Session session = sessionPool.get(userId);
+//        if (session != null&&session.isOpen()) {
+//            try {
+//                log.info("【websocket消息】 单点消息:"+message);
+//                session.getAsyncRemote().sendText(message);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+//    }
+//
+//    // 此为单点消息(多人)
+//    public void sendMoreMessage(List<String> userIds, String message) {
+//        for(String userId:userIds) {
+//            Session session = sessionPool.get(userId);
+//            if (session != null&&session.isOpen()) {
+//                try {
+//                    log.info("【websocket消息】 单点消息:"+message);
+//                    session.getAsyncRemote().sendText(message);
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        }
+//
+//    }
+//}