l
EfAhh=DF6Tf
literal 0
HcmV?d00001
diff --git a/spring-example/.mvn/wrapper/maven-wrapper.properties b/spring-example/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 00000000..642d572c
--- /dev/null
+++ b/spring-example/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/spring-example/mvnw b/spring-example/mvnw
new file mode 100644
index 00000000..a16b5431
--- /dev/null
+++ b/spring-example/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/spring-example/mvnw.cmd b/spring-example/mvnw.cmd
new file mode 100644
index 00000000..c8d43372
--- /dev/null
+++ b/spring-example/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/spring-example/pom.xml b/spring-example/pom.xml
new file mode 100644
index 00000000..a1988486
--- /dev/null
+++ b/spring-example/pom.xml
@@ -0,0 +1,65 @@
+
+
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.3.3.RELEASE
+
+
+ cn.seanything
+ example
+ 0.0.1-SNAPSHOT
+ example
+ Demo project for Spring Boot
+
+
+ 1.8
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+ cn.jpush.api
+ jiguang-common
+ 1.1.8
+
+
+
+ org.projectlombok
+ lombok
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+ cn.jpush.api
+ jpush-client
+ 3.4.7-SNAPSHOT
+ compile
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git a/spring-example/src/main/java/cn/seanything/example/ExampleApplication.java b/spring-example/src/main/java/cn/seanything/example/ExampleApplication.java
new file mode 100644
index 00000000..9c754c84
--- /dev/null
+++ b/spring-example/src/main/java/cn/seanything/example/ExampleApplication.java
@@ -0,0 +1,19 @@
+package cn.seanything.example;
+
+import cn.jpush.api.JPushClient;
+import cn.jpush.api.config.EnableJPushClient;
+import cn.seanything.example.service.MyService;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+
+@SpringBootApplication
+@EnableJPushClient
+public class ExampleApplication {
+
+ public static void main(String[] args) {
+ ConfigurableApplicationContext context = SpringApplication.run(ExampleApplication.class, args);
+ context.getBean(MyService.class).test();
+ }
+
+}
diff --git a/spring-example/src/main/java/cn/seanything/example/service/MyService.java b/spring-example/src/main/java/cn/seanything/example/service/MyService.java
new file mode 100644
index 00000000..d6b1e7cc
--- /dev/null
+++ b/spring-example/src/main/java/cn/seanything/example/service/MyService.java
@@ -0,0 +1,24 @@
+package cn.seanything.example.service;
+
+import cn.jpush.api.JPushClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author seanything
+ * @date 2020/8/20
+ */
+@Service
+public class MyService {
+
+ @Autowired
+ private JPushClient jPushClient;
+
+ public void test(){
+ try {
+ jPushClient.sendAndroidNotificationWithAlias("标题","测试",null,"asd");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/spring-example/src/main/resources/application.yml b/spring-example/src/main/resources/application.yml
new file mode 100644
index 00000000..f48ab08a
--- /dev/null
+++ b/spring-example/src/main/resources/application.yml
@@ -0,0 +1,7 @@
+app:
+ app-key: 'e56934de11804322ff312aa5'
+ master-secret: '81fade5c0ac242e01ca13d16'
+jpush:
+ android-config:
+ badge-class: cn.jk
+ badge-add-num: 1
\ No newline at end of file
diff --git a/spring-example/src/test/java/cn/seanything/example/ExampleApplicationTests.java b/spring-example/src/test/java/cn/seanything/example/ExampleApplicationTests.java
new file mode 100644
index 00000000..52b40c84
--- /dev/null
+++ b/spring-example/src/test/java/cn/seanything/example/ExampleApplicationTests.java
@@ -0,0 +1,13 @@
+package cn.seanything.example;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class ExampleApplicationTests {
+
+ @Test
+ void contextLoads() {
+ }
+
+}
diff --git a/src/main/java/cn/jpush/api/JPushClient.java b/src/main/java/cn/jpush/api/JPushClient.java
index 74b1458b..3666bafc 100644
--- a/src/main/java/cn/jpush/api/JPushClient.java
+++ b/src/main/java/cn/jpush/api/JPushClient.java
@@ -5,8 +5,10 @@
import java.util.Set;
import cn.jiguang.common.resp.*;
+import cn.jpush.api.config.PushConfig;
import cn.jpush.api.push.CIDResult;
import cn.jpush.api.push.model.*;
+import cn.jpush.api.push.model.notification.*;
import cn.jpush.api.report.*;
import cn.jpush.api.report.model.CheckMessagePayload;
import com.google.gson.JsonObject;
@@ -24,122 +26,135 @@
import cn.jpush.api.push.PushClient;
import cn.jpush.api.push.PushResult;
import cn.jpush.api.push.model.audience.Audience;
-import cn.jpush.api.push.model.notification.IosAlert;
-import cn.jpush.api.push.model.notification.Notification;
import cn.jpush.api.schedule.ScheduleClient;
import cn.jpush.api.schedule.ScheduleListResult;
import cn.jpush.api.schedule.ScheduleMsgIdsResult;
import cn.jpush.api.schedule.ScheduleResult;
import cn.jpush.api.schedule.model.SchedulePayload;
import cn.jpush.api.schedule.model.TriggerPayload;
+import com.sun.media.jfxmediaimpl.platform.ios.IOSPlatform;
/**
* The global entrance of JPush API library.
*/
public class JPushClient {
private final PushClient _pushClient;
- private final ReportClient _reportClient;
- private final DeviceClient _deviceClient;
+ private final ReportClient _reportClient;
+ private final DeviceClient _deviceClient;
private final ScheduleClient _scheduleClient;
-
- /**
- * Create a JPush Client.
- *
- * @param masterSecret API access secret of the appKey.
- * @param appKey The KEY of one application on JPush.
- */
- public JPushClient(String masterSecret, String appKey) {
- _pushClient = new PushClient(masterSecret, appKey);
- _reportClient = new ReportClient(masterSecret, appKey);
- _deviceClient = new DeviceClient(masterSecret, appKey);
+ private final PushConfig pushConfig;
+
+ /**
+ * Create a JPush Client.
+ *
+ * @param masterSecret API access secret of the appKey.
+ * @param appKey The KEY of one application on JPush.
+ * @param pushConfig send message with config
+ */
+ public JPushClient(String masterSecret, String appKey, PushConfig pushConfig) {
+ _pushClient = new PushClient(masterSecret, appKey);
+ _reportClient = new ReportClient(masterSecret, appKey);
+ _deviceClient = new DeviceClient(masterSecret, appKey);
_scheduleClient = new ScheduleClient(masterSecret, appKey);
- }
+ this.pushConfig = pushConfig;
+ }
/**
* Create a JPush Client by custom Client configuration.
*
* @param masterSecret API access secret of the appKey.
- * @param appKey The KEY of one application on JPush.
- * @param proxy The proxy, if there is no proxy, should be null.
- * @param conf The client configuration. Can use ClientConfig.getInstance() as default.
+ * @param appKey The KEY of one application on JPush.
+ * @param proxy The proxy, if there is no proxy, should be null.
+ * @param conf The client configuration. Can use ClientConfig.getInstance() as default.
+ * @param pushConfig send message with config
*/
- public JPushClient(String masterSecret, String appKey, HttpProxy proxy, ClientConfig conf) {
+ public JPushClient(String masterSecret, String appKey, HttpProxy proxy, ClientConfig conf, PushConfig pushConfig) {
_pushClient = new PushClient(masterSecret, appKey, proxy, conf);
_reportClient = new ReportClient(masterSecret, appKey, proxy, conf);
_deviceClient = new DeviceClient(masterSecret, appKey, proxy, conf);
_scheduleClient = new ScheduleClient(masterSecret, appKey, proxy, conf);
+ this.pushConfig = pushConfig;
}
/**
* This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig#setMaxRetryTimes} instead of this constructor.
- * @param masterSecret API access secret of the appKey.
- * @param appKey The KEY of one application on JPush.
+ *
+ * @param masterSecret API access secret of the appKey.
+ * @param appKey The KEY of one application on JPush.
* @param maxRetryTimes The max retry times.
+ * @param pushConfig send message with config
*/
@Deprecated
- public JPushClient(String masterSecret, String appKey, int maxRetryTimes) {
+ public JPushClient(String masterSecret, String appKey, int maxRetryTimes, PushConfig pushConfig) {
_pushClient = new PushClient(masterSecret, appKey, maxRetryTimes);
_reportClient = new ReportClient(masterSecret, appKey, maxRetryTimes);
_deviceClient = new DeviceClient(masterSecret, appKey, maxRetryTimes);
_scheduleClient = new ScheduleClient(masterSecret, appKey, maxRetryTimes);
- }
+ this.pushConfig = pushConfig;
+ }
/**
* This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig#setMaxRetryTimes} instead of this constructor.
- * @param masterSecret API access secret of the appKey.
- * @param appKey The KEY of one application on JPush.
+ *
+ * @param masterSecret API access secret of the appKey.
+ * @param appKey The KEY of one application on JPush.
* @param maxRetryTimes The max retry times.
- * @param proxy The proxy, if there is no proxy, should be null.
+ * @param proxy The proxy, if there is no proxy, should be null.
+ * @param pushConfig send message with config
*/
@Deprecated
- public JPushClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy) {
+ public JPushClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy, PushConfig pushConfig) {
_pushClient = new PushClient(masterSecret, appKey, maxRetryTimes, proxy);
_reportClient = new ReportClient(masterSecret, appKey, maxRetryTimes, proxy);
_deviceClient = new DeviceClient(masterSecret, appKey, maxRetryTimes, proxy);
_scheduleClient = new ScheduleClient(masterSecret, appKey, maxRetryTimes, proxy);
+ this.pushConfig = pushConfig;
}
-
+
/**
* Create a JPush Client by custom Client configuration.
- *
+ *
* If you are using JPush privacy cloud, maybe this constructor is what you needed.
* This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig#setMaxRetryTimes} instead of this constructor.
*
- * @param masterSecret API access secret of the appKey.
- * @param appKey The KEY of one application on JPush.
+ * @param masterSecret API access secret of the appKey.
+ * @param appKey The KEY of one application on JPush.
* @param maxRetryTimes Client request retry times.
- * @param proxy The proxy, if there is no proxy, should be null.
- * @param conf The client configuration. Can use ClientConfig.getInstance() as default.
+ * @param proxy The proxy, if there is no proxy, should be null.
+ * @param conf The client configuration. Can use ClientConfig.getInstance() as default.
+ * @param pushConfig
*/
@Deprecated
- public JPushClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy, ClientConfig conf) {
+ public JPushClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy, ClientConfig conf, PushConfig pushConfig) {
conf.setMaxRetryTimes(maxRetryTimes);
_pushClient = new PushClient(masterSecret, appKey, proxy, conf);
_reportClient = new ReportClient(masterSecret, appKey, proxy, conf);
_deviceClient = new DeviceClient(masterSecret, appKey, proxy, conf);
_scheduleClient = new ScheduleClient(masterSecret, appKey, proxy, conf);
+ this.pushConfig = pushConfig;
}
/**
* Create a JPush Client by custom Client configuration with global settings.
- *
+ *
* If you are using JPush privacy cloud, and you want different settings from default globally,
* maybe this constructor is what you needed.
* This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig#setGlobalPushSetting} instead of this constructor.
*
- * @param masterSecret API access secret of the appKey.
- * @param appKey The KEY of one application on JPush.
- * @param maxRetryTimes Client request retry times.
- * @param proxy The proxy, if there is no proxy, should be null.
- * @param conf The client configuration. Can use ClientConfig.getInstance() as default.
+ * @param masterSecret API access secret of the appKey.
+ * @param appKey The KEY of one application on JPush.
+ * @param maxRetryTimes Client request retry times.
+ * @param proxy The proxy, if there is no proxy, should be null.
+ * @param conf The client configuration. Can use ClientConfig.getInstance() as default.
* @param apnsProduction Global APNs environment setting. It will override PushPayload Options.
- * @param timeToLive Global time_to_live setting. It will override PushPayload Options.
+ * @param timeToLive Global time_to_live setting. It will override PushPayload Options.
+ * @param pushConfig send message with config
*/
@Deprecated
public JPushClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy, ClientConfig conf,
- boolean apnsProduction, long timeToLive) {
+ boolean apnsProduction, long timeToLive, PushConfig pushConfig) {
conf.setMaxRetryTimes(maxRetryTimes);
conf.setApnsProduction(apnsProduction);
conf.setTimeToLive(timeToLive);
@@ -147,21 +162,23 @@ public JPushClient(String masterSecret, String appKey, int maxRetryTimes, HttpPr
_reportClient = new ReportClient(masterSecret, appKey, proxy, conf);
_deviceClient = new DeviceClient(masterSecret, appKey, proxy, conf);
_scheduleClient = new ScheduleClient(masterSecret, appKey, proxy, conf);
+ this.pushConfig = pushConfig;
}
-
- /**
- * Create a JPush Client with global settings.
- *
- * If you want different settings from default globally, this constructor is what you needed.
- * This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig#setGlobalPushSetting} instead of this constructor.
+
+ /**
+ * Create a JPush Client with global settings.
+ *
+ * If you want different settings from default globally, this constructor is what you needed.
+ * This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig#setGlobalPushSetting} instead of this constructor.
*
- * @param masterSecret API access secret of the appKey.
- * @param appKey The KEY of one application on JPush.
- * @param apnsProduction Global APNs environment setting. It will override PushPayload Options.
- * @param timeToLive Global time_to_live setting. It will override PushPayload Options.
- */
+ * @param masterSecret API access secret of the appKey.
+ * @param appKey The KEY of one application on JPush.
+ * @param apnsProduction Global APNs environment setting. It will override PushPayload Options.
+ * @param timeToLive Global time_to_live setting. It will override PushPayload Options.
+ * @param pushConfig send message with config
+ */
@Deprecated
- public JPushClient(String masterSecret, String appKey, boolean apnsProduction, long timeToLive) {
+ public JPushClient(String masterSecret, String appKey, boolean apnsProduction, long timeToLive, PushConfig pushConfig) {
ClientConfig conf = ClientConfig.getInstance();
conf.setApnsProduction(apnsProduction);
conf.setTimeToLive(timeToLive);
@@ -169,6 +186,7 @@ public JPushClient(String masterSecret, String appKey, boolean apnsProduction, l
_reportClient = new ReportClient(masterSecret, appKey);
_deviceClient = new DeviceClient(masterSecret, appKey);
_scheduleClient = new ScheduleClient(masterSecret, appKey);
+ this.pushConfig = pushConfig;
}
public PushClient getPushClient() {
@@ -179,46 +197,46 @@ public PushClient getPushClient() {
/**
* Send a push with PushPayload object.
- *
- * @param pushPayload payload object of a push.
+ *
+ * @param pushPayload payload object of a push.
* @return PushResult The result object of a Push. Can be printed to a JSON.
* @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
+ * @throws APIRequestException if a request exception occurs.
*/
- public PushResult sendPush(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
- return _pushClient.sendPush(pushPayload);
- }
-
- /**
- * Send a push with JSON string.
- *
- * You can send a push JSON string directly with this method.
- *
- * Attention: globally settings cannot be affect this type of Push.
- *
- * @param payloadString payload of a push.
+ public PushResult sendPush(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
+ return _pushClient.sendPush(pushPayload);
+ }
+
+ /**
+ * Send a push with JSON string.
+ *
+ * You can send a push JSON string directly with this method.
+ *
+ * Attention: globally settings cannot be affect this type of Push.
+ *
+ * @param payloadString payload of a push.
* @return PushResult. Can be printed to a JSON.
- * @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
- */
+ * @throws APIConnectionException if a remote or network exception occurs.
+ * @throws APIRequestException if a request exception occurs.
+ */
public PushResult sendPush(String payloadString) throws APIConnectionException, APIRequestException {
return _pushClient.sendPush(payloadString);
}
-
+
/**
* Validate a push action, but do NOT send it actually.
- *
+ *
* @param payload payload of a push.
* @return PushResult. Can be printed to a JSON.
* @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
+ * @throws APIRequestException if a request exception occurs.
*/
public PushResult sendPushValidate(PushPayload payload) throws APIConnectionException, APIRequestException {
- return _pushClient.sendPushValidate(payload);
+ return _pushClient.sendPushValidate(payload);
}
public PushResult sendPushValidate(String payloadString) throws APIConnectionException, APIRequestException {
- return _pushClient.sendPushValidate(payloadString);
+ return _pushClient.sendPushValidate(payloadString);
}
public BatchPushResult batchSendPushByRegId(List pushPayloadList) throws APIConnectionException, APIRequestException {
@@ -231,35 +249,36 @@ public BatchPushResult batchSendPushByAlias(List pushPayloadList) t
/**
* Get cid list, the data form of cid is appKey-uuid.
+ *
* @param count the count of cid list, from 1 to 1000. default is 1.
- * @param type default is push, option: schedule
+ * @param type default is push, option: schedule
* @return CIDResult, an array of cid
* @throws APIConnectionException connect exception
- * @throws APIRequestException request exception
+ * @throws APIRequestException request exception
*/
public CIDResult getCidList(int count, String type) throws APIConnectionException, APIRequestException {
return _pushClient.getCidList(count, type);
}
-
+
// ------------------------------- Report API
/**
- * Get received report.
- *
+ * Get received report.
+ *
* @param msgIds 100 msgids to batch getting is supported.
* @return ReceivedResult. Can be printed to JSON.
* @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
+ * @throws APIRequestException if a request exception occurs.
*/
public ReceivedsResult getReportReceiveds(String msgIds) throws APIConnectionException, APIRequestException {
- return _reportClient.getReceiveds(msgIds);
- }
-
+ return _reportClient.getReceiveds(msgIds);
+ }
+
public UsersResult getReportUsers(TimeUnit timeUnit, String start, int duration) throws APIConnectionException, APIRequestException {
return _reportClient.getUsers(timeUnit, start, duration);
}
-
+
public MessagesResult getReportMessages(String msgIds) throws APIConnectionException, APIRequestException {
return _reportClient.getMessages(msgIds);
}
@@ -278,11 +297,33 @@ public MessageDetailResult getMessagesDetail(String msgIds)
throws APIConnectionException, APIRequestException {
return _reportClient.getMessagesDetail(msgIds);
}
-
+
// ------------------------------ Shortcuts - notification
- public PushResult sendNotificationAll(String alert) throws APIConnectionException, APIRequestException {
- PushPayload payload = PushPayload.alertAll(alert);
+ public PushResult sendNotificationAll(String title, String alert) throws APIConnectionException, APIRequestException {
+ PushPayload payload = PushPayload.newBuilder()
+ .setPlatform(Platform.all())
+ .setAudience(Audience.all())
+ .setNotification(
+ Notification.newBuilder()
+ .addPlatformNotification(
+ AndroidNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .setTitle(title)
+ .addCustom("badge_add_num", pushConfig.getAndroidConfig().getBadgeAddNum())
+ .addCustom("badge_class", pushConfig.getAndroidConfig().getBadgeClass())
+ .build())
+ .addPlatformNotification(
+ IosNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .build()
+ )
+ .addPlatformNotification(
+ WinphoneNotification.alert(alert))
+ .build())
+ .build();
return _pushClient.sendPush(payload);
}
@@ -291,23 +332,66 @@ public PushResult sendNotificationAll(String alert) throws APIConnectionExceptio
* If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
*
* @param alert The notification content.
- * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
+ * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
* @return push result
* @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
+ * @throws APIRequestException if a request exception occurs.
*/
- public PushResult sendNotificationAll(String alert, SMS sms) throws APIConnectionException, APIRequestException {
- PushPayload payload = PushPayload.alertAll(alert, sms);
+ public PushResult sendNotificationAll(String title, String alert, SMS sms) throws APIConnectionException, APIRequestException {
+ PushPayload payload = PushPayload.newBuilder()
+ .setPlatform(Platform.all())
+ .setAudience(Audience.all())
+ .setNotification(
+ Notification.newBuilder()
+ .addPlatformNotification(
+ AndroidNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .setTitle(title)
+ .addCustom("badge_add_num", pushConfig.getAndroidConfig().getBadgeAddNum())
+ .addCustom("badge_class", pushConfig.getAndroidConfig().getBadgeClass())
+ .build())
+ .addPlatformNotification(
+ IosNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .build()
+ )
+ .addPlatformNotification(
+ WinphoneNotification.alert(alert))
+ .build())
+ .setSMS(sms)
+ .build();
return _pushClient.sendPush(payload);
}
- public PushResult sendAndroidNotificationWithAlias(String title, String alert,
- Map extras, String... alias)
+ public PushResult sendAndroidNotificationWithAlias(String title, String alert,
+ Map extras, String... alias)
throws APIConnectionException, APIRequestException {
PushPayload payload = PushPayload.newBuilder()
- .setPlatform(Platform.android())
+ .setPlatform(Platform.all())
.setAudience(Audience.alias(alias))
- .setNotification(Notification.android(alert, title, extras))
+ .setNotification(
+ Notification.newBuilder()
+ .addPlatformNotification(
+ AndroidNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .setTitle(title)
+ .addCustom("badge_add_num", pushConfig.getAndroidConfig().getBadgeAddNum())
+ .addCustom("badge_class", pushConfig.getAndroidConfig().getBadgeClass())
+ .addExtras(extras)
+ .build())
+ .addPlatformNotification(
+ IosNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .addExtras(extras)
+ .build()
+ )
+ .addPlatformNotification(
+ WinphoneNotification.newBuilder().addExtras(extras).setAlert(alert).build())
+ .build())
.build();
return _pushClient.sendPush(payload);
}
@@ -316,34 +400,74 @@ public PushResult sendAndroidNotificationWithAlias(String title, String alert,
* Send a notification to Android with alias.
* If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
*
- * @param title The notification title.
- * @param alert The notification content.
- * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
+ * @param title The notification title.
+ * @param alert The notification content.
+ * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
* @param extras The extra parameter.
- * @param alias The users' alias.
+ * @param alias The users' alias.
* @return push result.
* @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
+ * @throws APIRequestException if a request exception occurs.
*/
public PushResult sendAndroidNotificationWithAlias(String title, String alert, SMS sms,
Map extras, String... alias)
throws APIConnectionException, APIRequestException {
PushPayload payload = PushPayload.newBuilder()
- .setPlatform(Platform.android())
+ .setPlatform(Platform.all())
.setAudience(Audience.alias(alias))
- .setNotification(Notification.android(alert, title, extras))
+ .setNotification(
+ Notification.newBuilder()
+ .addPlatformNotification(
+ AndroidNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .setTitle(title)
+ .addCustom("badge_add_num", pushConfig.getAndroidConfig().getBadgeAddNum())
+ .addCustom("badge_class", pushConfig.getAndroidConfig().getBadgeClass())
+ .addExtras(extras)
+ .build())
+ .addPlatformNotification(
+ IosNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .addExtras(extras)
+ .build()
+ )
+ .addPlatformNotification(
+ WinphoneNotification.newBuilder().addExtras(extras).setAlert(alert).build())
+ .build())
.setSMS(sms)
.build();
return _pushClient.sendPush(payload);
}
- public PushResult sendAndroidNotificationWithRegistrationID(String title, String alert,
- Map extras, String... registrationID)
+ public PushResult sendAndroidNotificationWithRegistrationID(String title, String alert,
+ Map extras, String... registrationID)
throws APIConnectionException, APIRequestException {
PushPayload payload = PushPayload.newBuilder()
- .setPlatform(Platform.android())
+ .setPlatform(Platform.all())
.setAudience(Audience.registrationId(registrationID))
- .setNotification(Notification.android(alert, title, extras))
+ .setNotification(
+ Notification.newBuilder()
+ .addPlatformNotification(
+ AndroidNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .setTitle(title)
+ .addCustom("badge_add_num", pushConfig.getAndroidConfig().getBadgeAddNum())
+ .addCustom("badge_class", pushConfig.getAndroidConfig().getBadgeClass())
+ .addExtras(extras)
+ .build())
+ .addPlatformNotification(
+ IosNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .addExtras(extras)
+ .build()
+ )
+ .addPlatformNotification(
+ WinphoneNotification.newBuilder().addExtras(extras).setAlert(alert).build())
+ .build())
.build();
return _pushClient.sendPush(payload);
}
@@ -352,34 +476,54 @@ public PushResult sendAndroidNotificationWithRegistrationID(String title, String
* Send a notification to Android with RegistrationID.
* If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
*
- * @param title The notification title.
- * @param alert The notification content.
- * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
- * @param extras The extra parameter.
+ * @param title The notification title.
+ * @param alert The notification content.
+ * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
+ * @param extras The extra parameter.
* @param registrationID The registration id generated by JPush.
* @return push result.
* @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
+ * @throws APIRequestException if a request exception occurs.
*/
public PushResult sendAndroidNotificationWithRegistrationID(String title, String alert, SMS sms,
Map extras, String... registrationID)
throws APIConnectionException, APIRequestException {
PushPayload payload = PushPayload.newBuilder()
- .setPlatform(Platform.android())
+ .setPlatform(Platform.all())
.setAudience(Audience.registrationId(registrationID))
- .setNotification(Notification.android(alert, title, extras))
+ .setNotification(
+ Notification.newBuilder()
+ .addPlatformNotification(
+ AndroidNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .setTitle(title)
+ .addCustom("badge_add_num", pushConfig.getAndroidConfig().getBadgeAddNum())
+ .addCustom("badge_class", pushConfig.getAndroidConfig().getBadgeClass())
+ .addExtras(extras)
+ .build())
+ .addPlatformNotification(
+ IosNotification.newBuilder()
+ .parseConfig(pushConfig)
+ .setAlert(alert)
+ .addExtras(extras)
+ .build()
+ )
+ .addPlatformNotification(
+ WinphoneNotification.newBuilder().addExtras(extras).setAlert(alert).build())
+ .build())
.setSMS(sms)
.build();
return _pushClient.sendPush(payload);
}
public PushResult sendIosNotificationWithAlias(String alert,
- Map extras, String... alias)
+ Map extras, String... alias)
throws APIConnectionException, APIRequestException {
PushPayload payload = PushPayload.newBuilder()
.setPlatform(Platform.ios())
.setAudience(Audience.alias(alias))
- .setNotification(Notification.ios(alert, extras))
+ .setNotification(Notification.newBuilder().addPlatformNotification(IosNotification.newBuilder().addExtras(extras).setAlert(alert).parseConfig(pushConfig).build()).build())
.build();
return _pushClient.sendPush(payload);
}
@@ -387,13 +531,14 @@ public PushResult sendIosNotificationWithAlias(String alert,
/**
* Send a notification to iOS with alias.
* If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
- * @param alert The notification content.
- * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
+ *
+ * @param alert The notification content.
+ * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
* @param extras The extra parameter.
- * @param alias The users' alias.
+ * @param alias The users' alias.
* @return push result.
* @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
+ * @throws APIRequestException if a request exception occurs.
*/
public PushResult sendIosNotificationWithAlias(String alert, SMS sms,
Map extras, String... alias)
@@ -401,7 +546,7 @@ public PushResult sendIosNotificationWithAlias(String alert, SMS sms,
PushPayload payload = PushPayload.newBuilder()
.setPlatform(Platform.ios())
.setAudience(Audience.alias(alias))
- .setNotification(Notification.ios(alert, extras))
+ .setNotification(Notification.newBuilder().addPlatformNotification(IosNotification.newBuilder().addExtras(extras).setAlert(alert).parseConfig(pushConfig).build()).build())
.setSMS(sms)
.build();
return _pushClient.sendPush(payload);
@@ -411,12 +556,12 @@ public PushResult sendIosNotificationWithAlias(String alert, SMS sms,
* Send an iOS notification with alias.
* If you want to send alert as a Json object, maybe this method is what you needed.
*
- * @param alert The wrapper of APNs alert.
+ * @param alert The wrapper of APNs alert.
* @param extras The extra params.
- * @param alias The alias list.
+ * @param alias The alias list.
* @return push result.
* @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
+ * @throws APIRequestException if a request exception occurs.
*/
public PushResult sendIosNotificationWithAlias(IosAlert alert,
Map extras, String... alias)
@@ -424,7 +569,7 @@ public PushResult sendIosNotificationWithAlias(IosAlert alert,
PushPayload payload = PushPayload.newBuilder()
.setPlatform(Platform.ios())
.setAudience(Audience.alias(alias))
- .setNotification(Notification.ios(alert, extras))
+ .setNotification(Notification.newBuilder().addPlatformNotification(IosNotification.newBuilder().addExtras(extras).setAlert(alert).parseConfig(pushConfig).build()).build())
.build();
return _pushClient.sendPush(payload);
}
@@ -434,13 +579,13 @@ public PushResult sendIosNotificationWithAlias(IosAlert alert,
* If you want to send alert as a Json object, maybe this method is what you needed.
* If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
*
- * @param alert The wrapper of APNs alert.
- * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
+ * @param alert The wrapper of APNs alert.
+ * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
* @param extras The extra params.
- * @param alias The alias list.
+ * @param alias The alias list.
* @return push result.
* @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
+ * @throws APIRequestException if a request exception occurs.
*/
public PushResult sendIosNotificationWithAlias(IosAlert alert, SMS sms,
Map extras, String... alias)
@@ -448,7 +593,7 @@ public PushResult sendIosNotificationWithAlias(IosAlert alert, SMS sms,
PushPayload payload = PushPayload.newBuilder()
.setPlatform(Platform.ios())
.setAudience(Audience.alias(alias))
- .setNotification(Notification.ios(alert, extras))
+ .setNotification(Notification.newBuilder().addPlatformNotification(IosNotification.newBuilder().addExtras(extras).setAlert(alert).parseConfig(pushConfig).build()).build())
.setSMS(sms)
.build();
return _pushClient.sendPush(payload);
@@ -458,12 +603,12 @@ public PushResult sendIosNotificationWithAlias(IosAlert alert, SMS sms,
* Send an iOS notification with alias.
* If you want to send alert as a Json object, maybe this method is what you needed.
*
- * @param alert The JSON object of APNs alert.
+ * @param alert The JSON object of APNs alert.
* @param extras The extra params.
- * @param alias The alias list.
+ * @param alias The alias list.
* @return push result.
* @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
+ * @throws APIRequestException if a request exception occurs.
*/
public PushResult sendIosNotificationWithAlias(JsonObject alert,
Map extras, String... alias)
@@ -471,7 +616,7 @@ public PushResult sendIosNotificationWithAlias(JsonObject alert,
PushPayload payload = PushPayload.newBuilder()
.setPlatform(Platform.ios())
.setAudience(Audience.alias(alias))
- .setNotification(Notification.ios(alert, extras))
+ .setNotification(Notification.newBuilder().addPlatformNotification(IosNotification.newBuilder().addExtras(extras).setAlert(alert).parseConfig(pushConfig).build()).build())
.build();
return _pushClient.sendPush(payload);
}
@@ -481,13 +626,13 @@ public PushResult sendIosNotificationWithAlias(JsonObject alert,
* If you want to send alert as a Json object, maybe this method is what you needed.
* If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
*
- * @param alert The JSON object of APNs alert.
- * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
+ * @param alert The JSON object of APNs alert.
+ * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
* @param extras The extra params.
- * @param alias The alias list.
+ * @param alias The alias list.
* @return push result.
* @throws APIConnectionException if a remote or network exception occurs.
- * @throws APIRequestException if a request exception occurs.
+ * @throws APIRequestException if a request exception occurs.
*/
public PushResult sendIosNotificationWithAlias(JsonObject alert, SMS sms,
Map