sets) {
+ JsonArray array = new JsonArray();
+ if (null != sets && sets.size() > 0) {
+ for (String item : sets) {
+ array.add(new JsonPrimitive(item));
+ }
+ }
+ return array;
+ }
+
+ public static boolean checkUsername(String username) {
+ return USERNAME_PATTERN.matcher(username).matches();
+ }
+
+ public static boolean isValidBirthday( String birthday) {
+ try {
+ if( ! DATE_PATTERN.matcher(birthday).matches() ) {
+ return false;
+ }
+ SimpleDateFormat format = new SimpleDateFormat(DATE_FORMAT);
+ format.setLenient(false);
+ format.parse(birthday);
+ } catch (Exception e) {
+ LOG.error("incorrect date format. " + birthday, e);
+ return false;
+ }
+ return true;
+ }
+
+}
diff --git a/.svn/pristine/75/75d9fb5006403e80b4f17b07a090d20256213c4d.svn-base b/.svn/pristine/75/75d9fb5006403e80b4f17b07a090d20256213c4d.svn-base
new file mode 100644
index 0000000..72eb823
--- /dev/null
+++ b/.svn/pristine/75/75d9fb5006403e80b4f17b07a090d20256213c4d.svn-base
@@ -0,0 +1,33 @@
+package com.ifish.enums;
+
+public enum PushTypeEnum {
+ remove_device("remove_device","解除设备"),
+ wendu_warn("wendu_warn","温度报警"),
+ qu_reply("qu_reply","问题反馈"),
+ app_update("app_update","IOS更新推送"),
+ remind_water("remind_water","换水提醒"),
+ offline_push("offline_push","设备离线推送");
+
+ private PushTypeEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/.svn/pristine/76/76e1f90e3b569c35076b9055ccccae2535e84c80.svn-base b/.svn/pristine/76/76e1f90e3b569c35076b9055ccccae2535e84c80.svn-base
new file mode 100644
index 0000000..635bfdd
--- /dev/null
+++ b/.svn/pristine/76/76e1f90e3b569c35076b9055ccccae2535e84c80.svn-base
@@ -0,0 +1,73 @@
+package com.ifish.jpush.common.resp;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.ifish.jpush.common.resp.ResponseWrapper.ErrorObject;
+
+public class APIRequestException extends Exception implements IRateLimiting {
+ private static final long serialVersionUID = -3921022835186996212L;
+
+ protected static Gson _gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+
+ private final ResponseWrapper responseWrapper;
+
+ public APIRequestException(ResponseWrapper responseWrapper) {
+ super(responseWrapper.responseContent);
+ this.responseWrapper = responseWrapper;
+ }
+
+ public int getStatus() {
+ return this.responseWrapper.responseCode;
+ }
+
+ public long getMsgId() {
+ ErrorObject eo = getErrorObject();
+ if (null != eo) {
+ return eo.msg_id;
+ }
+ return 0;
+ }
+
+ public int getErrorCode() {
+ ErrorObject eo = getErrorObject();
+ if (null != eo && null != eo.error) {
+ return eo.error.code;
+ }
+ return -1;
+ }
+
+ public String getErrorMessage() {
+ ErrorObject eo = getErrorObject();
+ if (null != eo && null != eo.error) {
+ return eo.error.message;
+ }
+ return null;
+ }
+
+ @Override
+ public String toString() {
+ return _gson.toJson(this);
+ }
+
+ private ErrorObject getErrorObject() {
+ return this.responseWrapper.error;
+ }
+
+
+ @Override
+ public int getRateLimitQuota() {
+ return responseWrapper.rateLimitQuota;
+ }
+
+ @Override
+ public int getRateLimitRemaining() {
+ return responseWrapper.rateLimitRemaining;
+ }
+
+ @Override
+ public int getRateLimitReset() {
+ return responseWrapper.rateLimitReset;
+ }
+
+}
+
diff --git a/.svn/pristine/7b/7b36cbc1f5643a74a6b8ba9bb39ffa3f00eb88c2.svn-base b/.svn/pristine/7b/7b36cbc1f5643a74a6b8ba9bb39ffa3f00eb88c2.svn-base
new file mode 100644
index 0000000..309c43f
--- /dev/null
+++ b/.svn/pristine/7b/7b36cbc1f5643a74a6b8ba9bb39ffa3f00eb88c2.svn-base
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+ {@code
+ *
+ * /**
+ * * Returns the positive square root of the given value.
+ * *
+ * * @throws IllegalArgumentException if the value is negative
+ * *}{@code /
+ * public static double sqrt(double value) {
+ * Preconditions.checkArgument(value >= 0.0, "negative value: %s", value);
+ * // calculate the square root
+ * }
+ *
+ * void exampleBadCaller() {
+ * double d = sqrt(-1.0);
+ * }}
+ *
+ * In this example, {@code checkArgument} throws an {@code IllegalArgumentException} to indicate
+ * that {@code exampleBadCaller} made an error in its call to {@code sqrt}.
+ *
+ * Warning about performance
+ *
+ * The goal of this class is to improve readability of code, but in some circumstances this may
+ * come at a significant performance cost. Remember that parameter values for message construction
+ * must all be computed eagerly, and autoboxing and varargs array creation may happen as well, even
+ * when the precondition check then succeeds (as it should almost always do in production). In some
+ * circumstances these wasted CPU cycles and allocations can add up to a real problem.
+ * Performance-sensitive precondition checks can always be converted to the customary form:
+ *
{@code
+ *
+ * if (value < 0.0) {
+ * throw new IllegalArgumentException("negative value: " + value);
+ * }}
+ *
+ * Other types of preconditions
+ *
+ * Not every type of precondition failure is supported by these methods. Continue to throw
+ * standard JDK exceptions such as {@link java.util.NoSuchElementException} or {@link
+ * UnsupportedOperationException} in the situations they are intended for.
+ *
+ *
Non-preconditions
+ *
+ * It is of course possible to use the methods of this class to check for invalid conditions
+ * which are not the caller's fault. Doing so is not recommended because it is
+ * misleading to future readers of the code and of stack traces. See
+ * Conditional
+ * failures explained in the Guava User Guide for more advice.
+ *
+ *
{@code java.util.Objects.requireNonNull()}
+ *
+ * Projects which use {@code com.google.common} should generally avoid the use of {@link
+ * java.util.Objects#requireNonNull(Object)}. Instead, use whichever of {@link
+ * #checkNotNull(Object)} or {@link Verify#verifyNotNull(Object)} is appropriate to the situation.
+ * (The same goes for the message-accepting overloads.)
+ *
+ *
Only {@code %s} is supported
+ *
+ * In {@code Preconditions} error message template strings, only the {@code "%s"} specifier is
+ * supported, not the full range of {@link java.util.Formatter} specifiers. However, note that if
+ * the number of arguments does not match the number of occurrences of {@code "%s"} in the format
+ * string, {@code Preconditions} will still behave as expected, and will still include all argument
+ * values in the error message; the message will simply not be formatted exactly as intended.
+ *
+ *
More information
+ *
+ * See the Guava User Guide on
+ * using {@code
+ * Preconditions}.
+ *
+ * @author Kevin Bourrillion
+ * @since 2.0 (imported from Google Collections Library)
+ */
+public final class Preconditions {
+ private Preconditions() {}
+
+ /**
+ * Ensures the truth of an expression involving one or more parameters to the calling method.
+ *
+ * @param expression a boolean expression
+ * @throws IllegalArgumentException if {@code expression} is false
+ */
+ public static void checkArgument(boolean expression) {
+ if (!expression) {
+ throw new IllegalArgumentException();
+ }
+ }
+
+ /**
+ * Ensures the truth of an expression involving one or more parameters to the calling method.
+ *
+ * @param expression a boolean expression
+ * @param errorMessage the exception message to use if the check fails; will be converted to a
+ * string using {@link String#valueOf(Object)}
+ * @throws IllegalArgumentException if {@code expression} is false
+ */
+ public static void checkArgument(boolean expression, @Nullable Object errorMessage) {
+ if (!expression) {
+ throw new IllegalArgumentException(String.valueOf(errorMessage));
+ }
+ }
+
+ /**
+ * Ensures the truth of an expression involving one or more parameters to the calling method.
+ *
+ * @param expression a boolean expression
+ * @param errorMessageTemplate a template for the exception message should the check fail. The
+ * message is formed by replacing each {@code %s} placeholder in the template with an
+ * argument. These are matched by position - the first {@code %s} gets {@code
+ * errorMessageArgs[0]}, etc. Unmatched arguments will be appended to the formatted message
+ * in square braces. Unmatched placeholders will be left as-is.
+ * @param errorMessageArgs the arguments to be substituted into the message template. Arguments
+ * are converted to strings using {@link String#valueOf(Object)}.
+ * @throws IllegalArgumentException if {@code expression} is false
+ * @throws NullPointerException if the check fails and either {@code errorMessageTemplate} or
+ * {@code errorMessageArgs} is null (don't let this happen)
+ */
+ public static void checkArgument(boolean expression,
+ @Nullable String errorMessageTemplate,
+ @Nullable Object... errorMessageArgs) {
+ if (!expression) {
+ throw new IllegalArgumentException(format(errorMessageTemplate, errorMessageArgs));
+ }
+ }
+
+ /**
+ * Ensures the truth of an expression involving the state of the calling instance, but not
+ * involving any parameters to the calling method.
+ *
+ * @param expression a boolean expression
+ * @throws IllegalStateException if {@code expression} is false
+ */
+ public static void checkState(boolean expression) {
+ if (!expression) {
+ throw new IllegalStateException();
+ }
+ }
+
+ /**
+ * Ensures the truth of an expression involving the state of the calling instance, but not
+ * involving any parameters to the calling method.
+ *
+ * @param expression a boolean expression
+ * @param errorMessage the exception message to use if the check fails; will be converted to a
+ * string using {@link String#valueOf(Object)}
+ * @throws IllegalStateException if {@code expression} is false
+ */
+ public static void checkState(boolean expression, @Nullable Object errorMessage) {
+ if (!expression) {
+ throw new IllegalStateException(String.valueOf(errorMessage));
+ }
+ }
+
+ /**
+ * Ensures the truth of an expression involving the state of the calling instance, but not
+ * involving any parameters to the calling method.
+ *
+ * @param expression a boolean expression
+ * @param errorMessageTemplate a template for the exception message should the check fail. The
+ * message is formed by replacing each {@code %s} placeholder in the template with an
+ * argument. These are matched by position - the first {@code %s} gets {@code
+ * errorMessageArgs[0]}, etc. Unmatched arguments will be appended to the formatted message
+ * in square braces. Unmatched placeholders will be left as-is.
+ * @param errorMessageArgs the arguments to be substituted into the message template. Arguments
+ * are converted to strings using {@link String#valueOf(Object)}.
+ * @throws IllegalStateException if {@code expression} is false
+ * @throws NullPointerException if the check fails and either {@code errorMessageTemplate} or
+ * {@code errorMessageArgs} is null (don't let this happen)
+ */
+ public static void checkState(boolean expression,
+ @Nullable String errorMessageTemplate,
+ @Nullable Object... errorMessageArgs) {
+ if (!expression) {
+ throw new IllegalStateException(format(errorMessageTemplate, errorMessageArgs));
+ }
+ }
+
+ /**
+ * Ensures that an object reference passed as a parameter to the calling method is not null.
+ *
+ * @param reference an object reference
+ * @return the non-null reference that was validated
+ * @throws NullPointerException if {@code reference} is null
+ */
+ public static T checkNotNull(T reference) {
+ if (reference == null) {
+ throw new NullPointerException();
+ }
+ return reference;
+ }
+
+ /**
+ * Ensures that an object reference passed as a parameter to the calling method is not null.
+ *
+ * @param reference an object reference
+ * @param errorMessage the exception message to use if the check fails; will be converted to a
+ * string using {@link String#valueOf(Object)}
+ * @return the non-null reference that was validated
+ * @throws NullPointerException if {@code reference} is null
+ */
+ public static T checkNotNull(T reference, @Nullable Object errorMessage) {
+ if (reference == null) {
+ throw new NullPointerException(String.valueOf(errorMessage));
+ }
+ return reference;
+ }
+
+ /**
+ * Ensures that an object reference passed as a parameter to the calling method is not null.
+ *
+ * @param reference an object reference
+ * @param errorMessageTemplate a template for the exception message should the check fail. The
+ * message is formed by replacing each {@code %s} placeholder in the template with an
+ * argument. These are matched by position - the first {@code %s} gets {@code
+ * errorMessageArgs[0]}, etc. Unmatched arguments will be appended to the formatted message
+ * in square braces. Unmatched placeholders will be left as-is.
+ * @param errorMessageArgs the arguments to be substituted into the message template. Arguments
+ * are converted to strings using {@link String#valueOf(Object)}.
+ * @return the non-null reference that was validated
+ * @throws NullPointerException if {@code reference} is null
+ */
+ public static T checkNotNull(T reference,
+ @Nullable String errorMessageTemplate,
+ @Nullable Object... errorMessageArgs) {
+ if (reference == null) {
+ // If either of these parameters is null, the right thing happens anyway
+ throw new NullPointerException(format(errorMessageTemplate, errorMessageArgs));
+ }
+ return reference;
+ }
+
+ /*
+ * All recent hotspots (as of 2009) *really* like to have the natural code
+ *
+ * if (guardExpression) {
+ * throw new BadException(messageExpression);
+ * }
+ *
+ * refactored so that messageExpression is moved to a separate String-returning method.
+ *
+ * if (guardExpression) {
+ * throw new BadException(badMsg(...));
+ * }
+ *
+ * The alternative natural refactorings into void or Exception-returning methods are much slower.
+ * This is a big deal - we're talking factors of 2-8 in microbenchmarks, not just 10-20%. (This
+ * is a hotspot optimizer bug, which should be fixed, but that's a separate, big project).
+ *
+ * The coding pattern above is heavily used in java.util, e.g. in ArrayList. There is a
+ * RangeCheckMicroBenchmark in the JDK that was used to test this.
+ *
+ * But the methods in this class want to throw different exceptions, depending on the args, so it
+ * appears that this pattern is not directly applicable. But we can use the ridiculous, devious
+ * trick of throwing an exception in the middle of the construction of another exception. Hotspot
+ * is fine with that.
+ */
+
+ /**
+ * Ensures that {@code index} specifies a valid element in an array, list or string of size
+ * {@code size}. An element index may range from zero, inclusive, to {@code size}, exclusive.
+ *
+ * @param index a user-supplied index identifying an element of an array, list or string
+ * @param size the size of that array, list or string
+ * @return the value of {@code index}
+ * @throws IndexOutOfBoundsException if {@code index} is negative or is not less than {@code size}
+ * @throws IllegalArgumentException if {@code size} is negative
+ */
+ public static int checkElementIndex(int index, int size) {
+ return checkElementIndex(index, size, "index");
+ }
+
+ /**
+ * Ensures that {@code index} specifies a valid element in an array, list or string of size
+ * {@code size}. An element index may range from zero, inclusive, to {@code size}, exclusive.
+ *
+ * @param index a user-supplied index identifying an element of an array, list or string
+ * @param size the size of that array, list or string
+ * @param desc the text to use to describe this index in an error message
+ * @return the value of {@code index}
+ * @throws IndexOutOfBoundsException if {@code index} is negative or is not less than {@code size}
+ * @throws IllegalArgumentException if {@code size} is negative
+ */
+ public static int checkElementIndex(
+ int index, int size, @Nullable String desc) {
+ // Carefully optimized for execution by hotspot (explanatory comment above)
+ if (index < 0 || index >= size) {
+ throw new IndexOutOfBoundsException(badElementIndex(index, size, desc));
+ }
+ return index;
+ }
+
+ private static String badElementIndex(int index, int size, String desc) {
+ if (index < 0) {
+ return format("%s (%s) must not be negative", desc, index);
+ } else if (size < 0) {
+ throw new IllegalArgumentException("negative size: " + size);
+ } else { // index >= size
+ return format("%s (%s) must be less than size (%s)", desc, index, size);
+ }
+ }
+
+ /**
+ * Ensures that {@code index} specifies a valid position in an array, list or string of
+ * size {@code size}. A position index may range from zero to {@code size}, inclusive.
+ *
+ * @param index a user-supplied index identifying a position in an array, list or string
+ * @param size the size of that array, list or string
+ * @return the value of {@code index}
+ * @throws IndexOutOfBoundsException if {@code index} is negative or is greater than {@code size}
+ * @throws IllegalArgumentException if {@code size} is negative
+ */
+ public static int checkPositionIndex(int index, int size) {
+ return checkPositionIndex(index, size, "index");
+ }
+
+ /**
+ * Ensures that {@code index} specifies a valid position in an array, list or string of
+ * size {@code size}. A position index may range from zero to {@code size}, inclusive.
+ *
+ * @param index a user-supplied index identifying a position in an array, list or string
+ * @param size the size of that array, list or string
+ * @param desc the text to use to describe this index in an error message
+ * @return the value of {@code index}
+ * @throws IndexOutOfBoundsException if {@code index} is negative or is greater than {@code size}
+ * @throws IllegalArgumentException if {@code size} is negative
+ */
+ public static int checkPositionIndex(int index, int size, @Nullable String desc) {
+ // Carefully optimized for execution by hotspot (explanatory comment above)
+ if (index < 0 || index > size) {
+ throw new IndexOutOfBoundsException(badPositionIndex(index, size, desc));
+ }
+ return index;
+ }
+
+ private static String badPositionIndex(int index, int size, String desc) {
+ if (index < 0) {
+ return format("%s (%s) must not be negative", desc, index);
+ } else if (size < 0) {
+ throw new IllegalArgumentException("negative size: " + size);
+ } else { // index > size
+ return format("%s (%s) must not be greater than size (%s)", desc, index, size);
+ }
+ }
+
+ /**
+ * Ensures that {@code start} and {@code end} specify a valid positions in an array, list
+ * or string of size {@code size}, and are in order. A position index may range from zero to
+ * {@code size}, inclusive.
+ *
+ * @param start a user-supplied index identifying a starting position in an array, list or string
+ * @param end a user-supplied index identifying a ending position in an array, list or string
+ * @param size the size of that array, list or string
+ * @throws IndexOutOfBoundsException if either index is negative or is greater than {@code size},
+ * or if {@code end} is less than {@code start}
+ * @throws IllegalArgumentException if {@code size} is negative
+ */
+ public static void checkPositionIndexes(int start, int end, int size) {
+ // Carefully optimized for execution by hotspot (explanatory comment above)
+ if (start < 0 || end < start || end > size) {
+ throw new IndexOutOfBoundsException(badPositionIndexes(start, end, size));
+ }
+ }
+
+ private static String badPositionIndexes(int start, int end, int size) {
+ if (start < 0 || start > size) {
+ return badPositionIndex(start, size, "start index");
+ }
+ if (end < 0 || end > size) {
+ return badPositionIndex(end, size, "end index");
+ }
+ // end < start
+ return format("end index (%s) must not be less than start index (%s)", end, start);
+ }
+
+ /**
+ * Substitutes each {@code %s} in {@code template} with an argument. These are matched by
+ * position: the first {@code %s} gets {@code args[0]}, etc. If there are more arguments than
+ * placeholders, the unmatched arguments will be appended to the end of the formatted message in
+ * square braces.
+ *
+ * @param template a non-null string containing 0 or more {@code %s} placeholders.
+ * @param args the arguments to be substituted into the message template. Arguments are converted
+ * to strings using {@link String#valueOf(Object)}. Arguments can be null.
+ */
+ // Note that this is somewhat-improperly used from Verify.java as well.
+ static String format(String template, @Nullable Object... args) {
+ template = String.valueOf(template); // null -> "null"
+
+ // start substituting the arguments into the '%s' placeholders
+ StringBuilder builder = new StringBuilder(template.length() + 16 * args.length);
+ int templateStart = 0;
+ int i = 0;
+ while (i < args.length) {
+ int placeholderStart = template.indexOf("%s", templateStart);
+ if (placeholderStart == -1) {
+ break;
+ }
+ builder.append(template.substring(templateStart, placeholderStart));
+ builder.append(args[i++]);
+ templateStart = placeholderStart + 2;
+ }
+ builder.append(template.substring(templateStart));
+
+ // if we run out of placeholders, append the extra args in square braces
+ if (i < args.length) {
+ builder.append(" [");
+ builder.append(args[i++]);
+ while (i < args.length) {
+ builder.append(", ");
+ builder.append(args[i++]);
+ }
+ builder.append(']');
+ }
+
+ return builder.toString();
+ }
+}
diff --git a/.svn/pristine/81/811eab84b5842e9027e1e69bd9bbac547e97ff59.svn-base b/.svn/pristine/81/811eab84b5842e9027e1e69bd9bbac547e97ff59.svn-base
new file mode 100644
index 0000000..980ebe9
--- /dev/null
+++ b/.svn/pristine/81/811eab84b5842e9027e1e69bd9bbac547e97ff59.svn-base
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/main/resources/jPpush.properties=UTF-8
+encoding/=UTF-8
diff --git a/.svn/pristine/85/85264b821ffc1e0e18c8c8e48a2587d2c304b173.svn-base b/.svn/pristine/85/85264b821ffc1e0e18c8c8e48a2587d2c304b173.svn-base
new file mode 100644
index 0000000..3810fa6
--- /dev/null
+++ b/.svn/pristine/85/85264b821ffc1e0e18c8c8e48a2587d2c304b173.svn-base
@@ -0,0 +1,34 @@
+package com.ifish.jpush.schedule;
+
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.Expose;
+import com.ifish.jpush.common.resp.BaseResult;
+
+public class ScheduleResult extends BaseResult{
+
+ @Expose String schedule_id;
+ @Expose String name;
+ @Expose Boolean enabled;
+ @Expose JsonObject trigger;
+ @Expose JsonObject push;
+
+ public String getSchedule_id() {
+ return schedule_id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public Boolean getEnabled() {
+ return enabled;
+ }
+
+ public JsonObject getTrigger() {
+ return trigger;
+ }
+
+ public JsonObject getPush() {
+ return push;
+ }
+}
diff --git a/.svn/pristine/87/87ab9531e1222351568346cf9057a0cae36112b8.svn-base b/.svn/pristine/87/87ab9531e1222351568346cf9057a0cae36112b8.svn-base
new file mode 100644
index 0000000..3bd5d0a
--- /dev/null
+++ b/.svn/pristine/87/87ab9531e1222351568346cf9057a0cae36112b8.svn-base
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/.svn/pristine/8a/8a46f8d0ba8e29f652cc8825ed4380d5b83f8ec8.svn-base b/.svn/pristine/8a/8a46f8d0ba8e29f652cc8825ed4380d5b83f8ec8.svn-base
new file mode 100644
index 0000000..dfe1968
--- /dev/null
+++ b/.svn/pristine/8a/8a46f8d0ba8e29f652cc8825ed4380d5b83f8ec8.svn-base
@@ -0,0 +1,34 @@
+package com.ifish.jpush.report;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.reflect.TypeToken;
+import com.ifish.jpush.common.resp.BaseResult;
+import com.ifish.jpush.common.resp.ResponseWrapper;
+
+public class ReceivedsResult extends BaseResult {
+ private static final Type RECEIVED_TYPE = new TypeToken>(){}.getType();
+
+ @Expose public List received_list = new ArrayList();
+
+
+ public static class Received {
+ @Expose public long msg_id;
+ @Expose public int android_received;
+ @Expose public int ios_apns_sent;
+ }
+
+ static ReceivedsResult fromResponse(ResponseWrapper responseWrapper) {
+ ReceivedsResult result = new ReceivedsResult();
+ if (responseWrapper.isServerResponse()) {
+ result.received_list = _gson.fromJson(responseWrapper.responseContent, RECEIVED_TYPE);
+ }
+
+ result.setResponseWrapper(responseWrapper);
+ return result;
+ }
+
+}
diff --git a/.svn/pristine/8d/8d6831cafa25d963117dd7df1a406eda226e4bf4.svn-base b/.svn/pristine/8d/8d6831cafa25d963117dd7df1a406eda226e4bf4.svn-base
new file mode 100644
index 0000000..4c46f36
--- /dev/null
+++ b/.svn/pristine/8d/8d6831cafa25d963117dd7df1a406eda226e4bf4.svn-base
@@ -0,0 +1,16 @@
+#极光推送
+#appKey
+jpush.android.appKey=d970d5e193cb2a0bbe41653c
+#secret
+jpush.android.secret=60162c8cf195ce9f4dc76629
+#production
+jpush.android.productionMode=true
+#appKey
+jpush.ios.appKey=d147124018074eb970474e48
+#secret
+jpush.ios.secret=a7d41825e75082b13675c326
+#production
+jpush.ios.productionMode=true
+#云信IM
+netease.appKey=87b0e3315dfc2df08060bcb54246da68
+netease.appSecret=e62f6c247b46
diff --git a/.svn/pristine/8e/8e6ddf21c656e1b7fb6016984ec6f0d65bc76eda.svn-base b/.svn/pristine/8e/8e6ddf21c656e1b7fb6016984ec6f0d65bc76eda.svn-base
new file mode 100644
index 0000000..2934215
--- /dev/null
+++ b/.svn/pristine/8e/8e6ddf21c656e1b7fb6016984ec6f0d65bc76eda.svn-base
@@ -0,0 +1,35 @@
+package com.ifish.jpush.utils;
+
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+public class TimeUtils {
+
+ private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
+ private static final String TIME_ONLY_FORMAT = "HH:mm:ss";
+
+
+ public static boolean isDateFormat(String time) {
+ try {
+ SimpleDateFormat format = new SimpleDateFormat(DATE_FORMAT);
+ format.setLenient(false);
+ format.parse(time);
+ } catch (ParseException e) {
+ return false;
+ }
+ return true;
+ }
+
+ public static boolean isTimeFormat(String time) {
+ try{
+ SimpleDateFormat format = new SimpleDateFormat(TIME_ONLY_FORMAT);
+ format.setLenient(false);
+ format.parse(time);
+ } catch (ParseException e) {
+ return false;
+ }
+ return true;
+ }
+
+}
diff --git a/.svn/pristine/8f/8f6523d16c00dc8d8bd7fa2b812e6221661b460a.svn-base b/.svn/pristine/8f/8f6523d16c00dc8d8bd7fa2b812e6221661b460a.svn-base
new file mode 100644
index 0000000..84adff3
--- /dev/null
+++ b/.svn/pristine/8f/8f6523d16c00dc8d8bd7fa2b812e6221661b460a.svn-base
@@ -0,0 +1,126 @@
+package com.ifish.jpush.report;
+
+import java.net.URLEncoder;
+import java.util.regex.Pattern;
+
+import com.ifish.jpush.common.ClientConfig;
+import com.ifish.jpush.common.ServiceHelper;
+import com.ifish.jpush.common.TimeUnit;
+import com.ifish.jpush.common.connection.HttpProxy;
+import com.ifish.jpush.common.connection.IHttpClient;
+import com.ifish.jpush.common.connection.NativeHttpClient;
+import com.ifish.jpush.common.resp.APIConnectionException;
+import com.ifish.jpush.common.resp.APIRequestException;
+import com.ifish.jpush.common.resp.BaseResult;
+import com.ifish.jpush.common.resp.ResponseWrapper;
+import com.ifish.jpush.utils.StringUtils;
+
+public class ReportClient {
+
+ private final NativeHttpClient _httpClient;
+ private String _hostName;
+ private String _receivePath;
+ private String _userPath;
+ private String _messagePath;
+
+ public ReportClient(String masterSecret, String appKey) {
+ this(masterSecret, appKey, IHttpClient.DEFAULT_MAX_RETRY_TIMES, null);
+ }
+
+ public ReportClient(String masterSecret, String appKey, int maxRetryTimes) {
+ this(masterSecret, appKey, maxRetryTimes, null);
+ }
+
+ public ReportClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy) {
+ this(masterSecret, appKey, maxRetryTimes, proxy, ClientConfig.getInstance());
+ }
+
+ public ReportClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy, ClientConfig conf) {
+ ServiceHelper.checkBasic(appKey, masterSecret);
+
+ _hostName = (String) conf.get(ClientConfig.REPORT_HOST_NAME);
+ _receivePath = (String) conf.get(ClientConfig.REPORT_RECEIVE_PATH);
+ _userPath = (String) conf.get(ClientConfig.REPORT_USER_PATH);
+ _messagePath = (String) conf.get(ClientConfig.REPORT_MESSAGE_PATH);
+
+ String authCode = ServiceHelper.getBasicAuthorization(appKey, masterSecret);
+ _httpClient = new NativeHttpClient(authCode, maxRetryTimes, proxy);
+ }
+
+
+ public ReceivedsResult getReceiveds(String[] msgIdArray)
+ throws APIConnectionException, APIRequestException {
+ return getReceiveds(StringUtils.arrayToString(msgIdArray));
+ }
+
+ public ReceivedsResult getReceiveds(String msgIds)
+ throws APIConnectionException, APIRequestException {
+ checkMsgids(msgIds);
+
+ String url = _hostName + _receivePath + "?msg_ids=" + msgIds;
+ ResponseWrapper response = _httpClient.sendGet(url);
+
+ return ReceivedsResult.fromResponse(response);
+ }
+
+ public MessagesResult getMessages(String msgIds)
+ throws APIConnectionException, APIRequestException {
+ checkMsgids(msgIds);
+
+ String url = _hostName + _messagePath + "?msg_ids=" + msgIds;
+ ResponseWrapper response = _httpClient.sendGet(url);
+
+ return MessagesResult.fromResponse(response);
+ }
+
+ public UsersResult getUsers(TimeUnit timeUnit, String start, int duration)
+ throws APIConnectionException, APIRequestException {
+ String startEncoded = null;
+ try {
+ startEncoded = URLEncoder.encode(start, "utf-8");
+ } catch (Exception e) {
+ }
+
+ String url = _hostName + _userPath
+ + "?time_unit=" + timeUnit.toString()
+ + "&start=" + startEncoded + "&duration=" + duration;
+ ResponseWrapper response = _httpClient.sendGet(url);
+
+ return BaseResult.fromResponse(response, UsersResult.class);
+ }
+
+
+ private final static Pattern MSGID_PATTERNS = Pattern.compile("[^0-9, ]");
+
+ public static void checkMsgids(String msgIds) {
+ if (StringUtils.isTrimedEmpty(msgIds)) {
+ throw new IllegalArgumentException("msgIds param is required.");
+ }
+
+ if (MSGID_PATTERNS.matcher(msgIds).find()) {
+ throw new IllegalArgumentException("msgIds param format is incorrect. "
+ + "It should be msg_id (number) which response from JPush Push API. "
+ + "If there are many, use ',' as interval. ");
+ }
+
+ msgIds = msgIds.trim();
+ if (msgIds.endsWith(",")) {
+ msgIds = msgIds.substring(0, msgIds.length() - 1);
+ }
+
+ String[] splits = msgIds.split(",");
+ try {
+ for (String s : splits) {
+ s = s.trim();
+ if (!StringUtils.isEmpty(s)) {
+ Long.parseLong(s);
+ }
+ }
+ } catch (NumberFormatException e) {
+ throw new IllegalArgumentException("Every msg_id should be valid Long number which splits by ','");
+ }
+ }
+
+}
+
+
diff --git a/.svn/pristine/90/902338f1dbb50c0f79cee5883b2858b62b172a08.svn-base b/.svn/pristine/90/902338f1dbb50c0f79cee5883b2858b62b172a08.svn-base
new file mode 100644
index 0000000..63b8bff
--- /dev/null
+++ b/.svn/pristine/90/902338f1dbb50c0f79cee5883b2858b62b172a08.svn-base
@@ -0,0 +1,89 @@
+package com.ifish.jpush.utils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.security.MessageDigest;
+
+
+public class StringUtils {
+ private final static String[] hexDigits = { "0", "1", "2", "3", "4", "5",
+ "6", "7", "8", "9", "A", "B", "C", "D", "E", "F" };
+
+ private static String byteArrayToHexString(byte[] b) {
+ StringBuffer resultSb = new StringBuffer();
+ for (int i = 0; i < b.length; i++) {
+ resultSb.append(byteToHexString(b[i]));
+ }
+ return resultSb.toString();
+ }
+
+ private static String byteToHexString(byte b) {
+ int n = b;
+ if (n < 0)
+ n = 256 + n;
+ int d1 = n / 16;
+ int d2 = n % 16;
+ return hexDigits[d1] + hexDigits[d2];
+ }
+
+ public static String toMD5(String origin) {
+ String resultString = null;
+ try {
+ resultString = new String(origin);
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ resultString = byteArrayToHexString(md.digest(resultString.getBytes()));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return resultString;
+ }
+
+ public static String encodeParam(String param) {
+ String encodeParam = null;
+ try {
+ encodeParam = URLEncoder.encode(param, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ return encodeParam;
+ }
+
+ public static String arrayToString(String[] values) {
+ if (null == values) return "";
+
+ StringBuffer buffer = new StringBuffer(values.length);
+ for (int i = 0; i < values.length; i++) {
+ buffer.append(values[i]).append(",");
+ }
+ if (buffer.length() > 0) {
+ return buffer.toString().substring(0, buffer.length() - 1);
+ }
+ return "";
+ }
+
+ public static boolean isEmpty(String s) {
+ return s == null || s.length() == 0;
+ }
+
+ public static boolean isTrimedEmpty(String s) {
+ return s == null || s.trim().length() == 0;
+ }
+
+ public static boolean isNotEmpty(String s) {
+ return s != null && s.length() > 0;
+ }
+
+ public static boolean isLineBroken(String s) {
+ if ( null == s ) {
+ return false;
+ }
+ if (s.contains("\n")) {
+ return true;
+ }
+ if (s.contains("\r\n")) {
+ return true;
+ }
+ return false;
+ }
+
+}
diff --git a/.svn/pristine/92/9223edd1c78f5cc0903227429457796ee91266ce.svn-base b/.svn/pristine/92/9223edd1c78f5cc0903227429457796ee91266ce.svn-base
new file mode 100644
index 0000000..b9412c0
--- /dev/null
+++ b/.svn/pristine/92/9223edd1c78f5cc0903227429457796ee91266ce.svn-base
@@ -0,0 +1,290 @@
+package com.ifish.netease;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.ifish.enums.NeteaseEnum;
+import com.ifish.util.IfishUtil;
+
+public class NeteaseIM {
+
+ String appKey = "";
+ String appSecret = "";
+
+ private static Logger log = LoggerFactory.getLogger(NeteaseIM.class);
+
+ public NeteaseIM(String appKey,String appSecret){
+ this.appKey=appKey;
+ this.appSecret=appSecret;
+ }
+ /**
+ * 创建云信ID
+ * @param accid 云信ID，最大长度32字符，必须保证一个APP内唯一
+ * @param name 云信ID昵称，最大长度64字符，用来PUSH推送 时显示的昵称
+ * @param icon 云信ID头像URL，第三方可选填，最大长度1024
+ * @param props json属性，第三方可选填，最大长度1024字符
+ * @return
+ * @throws Exception
+ */
+ public Map createAccid(String accid,String name,String icon,String props){
+ try {
+ DefaultHttpClient httpClient = new DefaultHttpClient();
+ String url = "https://api.netease.im/nimserver/user/create.action";
+ HttpPost httpPost = new HttpPost(url);
+ String nonce = IfishUtil.getCharAndNumr(10);
+ String curTime = String.valueOf((new Date()).getTime() / 1000L);
+ //计算CheckSum
+ String checkSum = CheckSumBuilder.getCheckSum(appSecret, nonce ,curTime);
+ //设置请求的header
+ httpPost.addHeader("AppKey", appKey);
+ httpPost.addHeader("Nonce", nonce);
+ httpPost.addHeader("CurTime", curTime);
+ httpPost.addHeader("CheckSum", checkSum);
+ httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+ //设置请求的参数
+ List nvps = new ArrayList();
+ nvps.add(new BasicNameValuePair("accid", accid));
+ nvps.add(new BasicNameValuePair("name", name));
+ nvps.add(new BasicNameValuePair("icon", icon));
+ nvps.add(new BasicNameValuePair("props", props));
+ httpPost.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
+ //执行请求
+ HttpResponse response = httpClient.execute(httpPost);
+ //执行结果
+ String responseStr = EntityUtils.toString(response.getEntity(), "utf-8");
+ System.out.println(responseStr);
+ JSONObject json = new JSONObject(responseStr);
+ String code = json.getString("code");
+ Map map = new HashMap();
+ map.put("code", code);
+ //200
+ if(code.equals(NeteaseEnum.status200.getKey())){
+ JSONObject infoJson = json.getJSONObject("info");
+ String token = infoJson.getString("token");
+ map.put("token", token);
+ }
+ else if(code.equals(NeteaseEnum.status414.getKey())){
+ String desc = json.getString("desc");
+ }
+ return map;
+ } catch (Exception e) {
+ log.error("CreateAccid error message:{},{}",accid,e.toString());
+ }
+ return null;
+ }
+ /**
+ * 云信ID基本信息更新
+ * @param accid 云信ID，最大长度32字符，必须保证一个APP内唯一
+ * @param token 云信ID可以指定登录token值，最大长度128字符
+ * @param props json属性，第三方可选填，最大长度1024字符
+ * @return
+ * @throws Exception
+ */
+ public Map updateAccid(String accid,String token,String props){
+ try {
+ DefaultHttpClient httpClient = new DefaultHttpClient();
+ String url = "https://api.netease.im/nimserver/user/update.action";
+ HttpPost httpPost = new HttpPost(url);
+ String nonce = IfishUtil.getCharAndNumr(10);
+ String curTime = String.valueOf((new Date()).getTime() / 1000L);
+ //计算CheckSum
+ String checkSum = CheckSumBuilder.getCheckSum(appSecret, nonce ,curTime);
+ //设置请求的header
+ httpPost.addHeader("AppKey", appKey);
+ httpPost.addHeader("Nonce", nonce);
+ httpPost.addHeader("CurTime", curTime);
+ httpPost.addHeader("CheckSum", checkSum);
+ httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+ //设置请求的参数
+ List nvps = new ArrayList();
+ nvps.add(new BasicNameValuePair("accid", accid));
+ nvps.add(new BasicNameValuePair("token", token));
+ nvps.add(new BasicNameValuePair("props", props));
+ httpPost.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
+ //执行请求
+ HttpResponse response = httpClient.execute(httpPost);
+ //执行结果
+ String responseStr = EntityUtils.toString(response.getEntity(), "utf-8");
+ JSONObject json = new JSONObject(responseStr);
+ String code = json.getString("code");
+ Map map = new HashMap();
+ map.put("code", code);
+ return map;
+ } catch (Exception e) {
+ log.error("updateAccid error message:{},{}",accid,e.toString());
+ }
+ return null;
+ }
+ /**
+ * 更新并获取新token
+ * @param accid
+ * @return
+ * @throws Exception
+ */
+ public Map refreshToken(String accid){
+ try {
+ DefaultHttpClient httpClient = new DefaultHttpClient();
+ String url = "https://api.netease.im/nimserver/user/refreshToken.action";
+ HttpPost httpPost = new HttpPost(url);
+ String nonce = IfishUtil.getCharAndNumr(10);
+ String curTime = String.valueOf((new Date()).getTime() / 1000L);
+ //计算CheckSum
+ String checkSum = CheckSumBuilder.getCheckSum(appSecret, nonce ,curTime);
+ //设置请求的header
+ httpPost.addHeader("AppKey", appKey);
+ httpPost.addHeader("Nonce", nonce);
+ httpPost.addHeader("CurTime", curTime);
+ httpPost.addHeader("CheckSum", checkSum);
+ httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+ //设置请求的参数
+ List nvps = new ArrayList();
+ nvps.add(new BasicNameValuePair("accid", accid));
+ httpPost.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
+ //执行请求
+ HttpResponse response = httpClient.execute(httpPost);
+ //执行结果
+ String responseStr = EntityUtils.toString(response.getEntity(), "utf-8");
+ JSONObject json = new JSONObject(responseStr);
+ String code = json.getString("code");
+ Map map = new HashMap();
+ map.put("code", code);
+ //200
+ if(code.equals(NeteaseEnum.status200.getKey())){
+ JSONObject infoJson = json.getJSONObject("info");
+ String token = infoJson.getString("token");
+ map.put("token", token);
+ }
+ else if(code.equals(NeteaseEnum.status414.getKey())){
+ String desc = json.getString("desc");
+ }
+ return map;
+ } catch (Exception e) {
+ log.error("refreshToken error message:{},{}",accid,e.toString());
+ }
+ return null;
+ }
+
+ /**
+ * 发送普通消息
+ * @param from
+ * @param to
+ * @param msg
+ * @return
+ */
+ public Map sendMsg(String from,String to,String msg){
+ try {
+ DefaultHttpClient httpClient = new DefaultHttpClient();
+ String url = "https://api.netease.im/nimserver/msg/sendMsg.action";
+ HttpPost httpPost = new HttpPost(url);
+ String nonce = IfishUtil.getCharAndNumr(10);
+ String curTime = String.valueOf((new Date()).getTime() / 1000L);
+ //计算CheckSum
+ String checkSum = CheckSumBuilder.getCheckSum(appSecret, nonce ,curTime);
+ //设置请求的header
+ httpPost.addHeader("AppKey", appKey);
+ httpPost.addHeader("Nonce", nonce);
+ httpPost.addHeader("CurTime", curTime);
+ httpPost.addHeader("CheckSum", checkSum);
+ httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+ //设置请求的参数
+ List nvps = new ArrayList();
+ nvps.add(new BasicNameValuePair("from", from));
+ nvps.add(new BasicNameValuePair("to", to));
+ nvps.add(new BasicNameValuePair("ope", "0"));
+ nvps.add(new BasicNameValuePair("type", "0"));
+ nvps.add(new BasicNameValuePair("body", "{\"msg\":\""+msg+"\"}"));
+ httpPost.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
+ //执行请求
+ HttpResponse response = httpClient.execute(httpPost);
+ //执行结果
+ String responseStr = EntityUtils.toString(response.getEntity(), "utf-8");
+ System.out.println(responseStr);
+ JSONObject json = new JSONObject(responseStr);
+ String code = json.getString("code");
+ Map map = new HashMap();
+ map.put("code", code);
+ //200
+ if(code.equals(NeteaseEnum.status200.getKey())){
+
+ }
+ else if(code.equals(NeteaseEnum.status414.getKey())){
+ String desc = json.getString("desc");
+ }
+ return map;
+ } catch (Exception e) {
+ log.error("refreshToken error message:{}",e.toString());
+ }
+ return null;
+ }
+ /**
+ * 批量发送点对点普通消息
+ * @param fromAccid
+ * @param toAccids
+ * @param msg
+ * @return
+ */
+ public Map sendBatchMsg(String fromAccid,String toAccids,String msg){
+ try {
+ DefaultHttpClient httpClient = new DefaultHttpClient();
+ String url = "https://api.netease.im/nimserver/msg/sendBatchMsg.action";
+ HttpPost httpPost = new HttpPost(url);
+ String nonce = IfishUtil.getCharAndNumr(10);
+ String curTime = String.valueOf((new Date()).getTime() / 1000L);
+ //计算CheckSum
+ String checkSum = CheckSumBuilder.getCheckSum(appSecret, nonce ,curTime);
+ //设置请求的header
+ httpPost.addHeader("AppKey", appKey);
+ httpPost.addHeader("Nonce", nonce);
+ httpPost.addHeader("CurTime", curTime);
+ httpPost.addHeader("CheckSum", checkSum);
+ httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+ //设置请求的参数
+ List nvps = new ArrayList();
+ nvps.add(new BasicNameValuePair("fromAccid", fromAccid));
+ nvps.add(new BasicNameValuePair("toAccids", toAccids));
+ nvps.add(new BasicNameValuePair("type", "0"));
+ nvps.add(new BasicNameValuePair("body", "{\"msg\":\""+msg+"\"}"));
+ httpPost.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
+ //执行请求
+ HttpResponse response = httpClient.execute(httpPost);
+ //执行结果
+ String responseStr = EntityUtils.toString(response.getEntity(), "utf-8");
+ System.out.println(responseStr);
+ JSONObject json = new JSONObject(responseStr);
+ String code = json.getString("code");
+ Map map = new HashMap();
+ map.put("code", code);
+ //200
+ if(code.equals(NeteaseEnum.status200.getKey())){
+
+ }
+ else if(code.equals(NeteaseEnum.status414.getKey())){
+ String desc = json.getString("desc");
+ }
+ return map;
+ } catch (Exception e) {
+ log.error("refreshToken error message:{}",e.toString());
+ }
+ return null;
+ }
+ public static void main(String[] args) {
+ List list= new ArrayList();
+ list.add("hello");
+ list.add("hello1");
+ new NeteaseIM("87b0e3315dfc2df08060bcb54246da68", "e62f6c247b46").createAccid("ifish", "爱鱼奇", "", "");
+ }
+}
diff --git a/.svn/pristine/94/9448515cbe4935fa91f39fbc832338ed5d8eac2c.svn-base b/.svn/pristine/94/9448515cbe4935fa91f39fbc832338ed5d8eac2c.svn-base
new file mode 100644
index 0000000..226a872
--- /dev/null
+++ b/.svn/pristine/94/9448515cbe4935fa91f39fbc832338ed5d8eac2c.svn-base
@@ -0,0 +1,17 @@
+package com.ifish.jpush.common.resp;
+
+public class DefaultResult extends BaseResult {
+
+ public static DefaultResult fromResponse(ResponseWrapper responseWrapper) {
+ DefaultResult result = null;
+
+ if (responseWrapper.isServerResponse()) {
+ result = new DefaultResult();
+ }
+ if(result!=null){
+ result.setResponseWrapper(responseWrapper);
+ }
+ return result;
+ }
+
+}
diff --git a/.svn/pristine/95/95fb12ff3801f3b49296d6141140a0100943ad26.svn-base b/.svn/pristine/95/95fb12ff3801f3b49296d6141140a0100943ad26.svn-base
new file mode 100644
index 0000000..abc37db
--- /dev/null
+++ b/.svn/pristine/95/95fb12ff3801f3b49296d6141140a0100943ad26.svn-base
@@ -0,0 +1,11 @@
+package com.ifish.jpush.push.model;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+
+public interface PushModel {
+
+ public static Gson gson = new Gson();
+ public JsonElement toJSON();
+
+}
diff --git a/.svn/pristine/99/991cbb72d18bc0c247162288f2252af39ce79d64.svn-base b/.svn/pristine/99/991cbb72d18bc0c247162288f2252af39ce79d64.svn-base
new file mode 100644
index 0000000..6b5aebc
--- /dev/null
+++ b/.svn/pristine/99/991cbb72d18bc0c247162288f2252af39ce79d64.svn-base
@@ -0,0 +1,13 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.svn/pristine/9c/9c6761fb524730184dcea7c0adfd5da1cad12852.svn-base b/.svn/pristine/9c/9c6761fb524730184dcea7c0adfd5da1cad12852.svn-base
new file mode 100644
index 0000000..58a425c
--- /dev/null
+++ b/.svn/pristine/9c/9c6761fb524730184dcea7c0adfd5da1cad12852.svn-base
@@ -0,0 +1,93 @@
+package com.ifish.jpush.common.resp;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public abstract class BaseResult implements IRateLimiting {
+ public static final int ERROR_CODE_NONE = -1;
+ public static final int ERROR_CODE_OK = 0;
+ public static final String ERROR_MESSAGE_NONE = "None error message.";
+
+ protected static final int RESPONSE_OK = 200;
+ protected static Gson _gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+
+ private ResponseWrapper responseWrapper;
+
+ public void setResponseWrapper(ResponseWrapper responseWrapper) {
+ this.responseWrapper = responseWrapper;
+ }
+
+ public String getOriginalContent() {
+ if (null != responseWrapper) {
+ return responseWrapper.responseContent;
+ }
+ return null;
+ }
+
+ public int getResponseCode() {
+ if(null != responseWrapper) {
+ return responseWrapper.responseCode;
+ }
+ return -1;
+ }
+
+ public boolean isResultOK() {
+ if(null != responseWrapper) {
+ return ( responseWrapper.responseCode / 200 ) == 1;
+ }
+ return false;
+ }
+
+ public static T fromResponse(
+ ResponseWrapper responseWrapper, Class clazz) {
+ T result = null;
+
+ if (responseWrapper.isServerResponse()) {
+ result = _gson.fromJson(responseWrapper.responseContent, clazz);
+ } else {
+ try {
+ result = clazz.newInstance();
+ } catch (InstantiationException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ }
+ if(result!=null){
+ result.setResponseWrapper(responseWrapper);
+ }
+ return result;
+ }
+
+
+ @Override
+ public int getRateLimitQuota() {
+ if (null != responseWrapper) {
+ return responseWrapper.rateLimitQuota;
+ }
+ return 0;
+ }
+
+ @Override
+ public int getRateLimitRemaining() {
+ if (null != responseWrapper) {
+ return responseWrapper.rateLimitRemaining;
+ }
+ return 0;
+ }
+
+ @Override
+ public int getRateLimitReset() {
+ if (null != responseWrapper) {
+ return responseWrapper.rateLimitReset;
+ }
+ return 0;
+ }
+
+ @Override
+ public String toString() {
+ return _gson.toJson(this);
+ }
+
+
+}
diff --git a/.svn/pristine/9c/9cb3803e02aaecf5ce52a2922f46b8d0c7fe5943.svn-base b/.svn/pristine/9c/9cb3803e02aaecf5ce52a2922f46b8d0c7fe5943.svn-base
new file mode 100644
index 0000000..70de5e6
--- /dev/null
+++ b/.svn/pristine/9c/9cb3803e02aaecf5ce52a2922f46b8d0c7fe5943.svn-base
@@ -0,0 +1,204 @@
+package com.ifish.jpush.examples;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.JsonObject;
+import com.ifish.jpush.JPushClient;
+import com.ifish.jpush.common.ClientConfig;
+import com.ifish.jpush.common.resp.APIConnectionException;
+import com.ifish.jpush.common.resp.APIRequestException;
+import com.ifish.jpush.push.PushResult;
+import com.ifish.jpush.push.model.Message;
+import com.ifish.jpush.push.model.Options;
+import com.ifish.jpush.push.model.Platform;
+import com.ifish.jpush.push.model.PushPayload;
+import com.ifish.jpush.push.model.audience.Audience;
+import com.ifish.jpush.push.model.audience.AudienceTarget;
+import com.ifish.jpush.push.model.notification.AndroidNotification;
+import com.ifish.jpush.push.model.notification.IosNotification;
+import com.ifish.jpush.push.model.notification.Notification;
+
+public class PushExample {
+ protected static final Logger LOG = LoggerFactory.getLogger(PushExample.class);
+
+ // demo App defined in resources/jpush-api.conf
+ private static final String appKey ="d970d5e193cb2a0bbe41653c";
+ private static final String masterSecret = "60162c8cf195ce9f4dc76629";
+
+ public static final String TITLE = "Test from API example";
+ public static final String ALERT = "Test from API Example - alert";
+ public static final String MSG_CONTENT = "Test from API Example - msgContent";
+ public static final String REGISTRATION_ID = "0900e8d85ef";
+ public static final String TAG = "tag_api";
+
+ public static void main(String[] args) {
+ //testSendPushWithCustomConfig();
+ Map map = new HashMap();
+ map.put("device_id", "1");
+ map.put("device_name", "设备1");
+ map.put("msg_type", "remove_device");
+ testSendIosAlert("300","设备解除绑定", "你已失去对“设备1”设备的控制权", map);
+ //testSendAndroidNotification("40","标题401","内容40",map);
+ //testSendAndroidNotification("40","标题","内容");
+ }
+
+
+ public static void testSendPush() {
+ // HttpProxy proxy = new HttpProxy("localhost", 3128);
+ // Can use this https proxy: https://github.com/Exa-Networks/exaproxy
+ JPushClient jpushClient = new JPushClient(masterSecret, appKey, 3);
+
+ // For push, all you need do is to build PushPayload object.
+ PushPayload payload = buildPushObject_all_all_alert();
+
+ try {
+ PushResult result = jpushClient.sendPush(payload);
+ LOG.info("Got result - " + result);
+
+ } catch (APIConnectionException e) {
+ LOG.error("Connection error. Should retry later. ", e);
+
+ } catch (APIRequestException e) {
+ LOG.error("Error response from JPush server. Should review and fix it. ", e);
+ LOG.info("HTTP Status: " + e.getStatus());
+ LOG.info("Error Code: " + e.getErrorCode());
+ LOG.info("Error Message: " + e.getErrorMessage());
+ LOG.info("Msg ID: " + e.getMsgId());
+ }
+ }
+
+ public static PushPayload buildPushObject_all_all_alert() {
+ return PushPayload.alertAll(ALERT);
+ }
+
+ public static PushPayload buildPushObject_all_alias_alert() {
+ return PushPayload.newBuilder()
+ .setPlatform(Platform.all())
+ .setAudience(Audience.alias("alias1"))
+ .setNotification(Notification.alert(ALERT))
+ .build();
+ }
+
+ public static PushPayload buildPushObject_android_tag_alertWithTitle() {
+ return PushPayload.newBuilder()
+ .setPlatform(Platform.android())
+ .setAudience(Audience.tag("tag1"))
+ .setNotification(Notification.android(ALERT, TITLE, null))
+ .build();
+ }
+
+ public static PushPayload buildPushObject_android_and_ios() {
+ return PushPayload.newBuilder()
+ .setPlatform(Platform.android_ios())
+ .setAudience(Audience.tag("tag1"))
+ .setNotification(Notification.newBuilder()
+ .setAlert("alert content")
+ .addPlatformNotification(AndroidNotification.newBuilder()
+ .setTitle("Android Title").build())
+ .addPlatformNotification(IosNotification.newBuilder()
+ .incrBadge(1)
+ .addExtra("extra_key", "extra_value").build())
+ .build())
+ .build();
+ }
+
+ public static PushPayload buildPushObject_ios_tagAnd_alertWithExtrasAndMessage() {
+ return PushPayload.newBuilder()
+ .setPlatform(Platform.ios())
+ .setAudience(Audience.tag_and("tag1", "tag_all"))
+ .setNotification(Notification.newBuilder()
+ .addPlatformNotification(IosNotification.newBuilder()
+ .setAlert(ALERT)
+ .setBadge(5)
+ .setSound("happy")
+ .addExtra("from", "JPush")
+ .build())
+ .build())
+ .setMessage(Message.content(MSG_CONTENT))
+ .setOptions(Options.newBuilder()
+ .setApnsProduction(true)
+ .build())
+ .build();
+ }
+
+ public static PushPayload buildPushObject_ios_audienceMore_messageWithExtras() {
+ return PushPayload.newBuilder()
+ .setPlatform(Platform.android_ios())
+ .setAudience(Audience.newBuilder()
+ .addAudienceTarget(AudienceTarget.tag("tag1", "tag2"))
+ .addAudienceTarget(AudienceTarget.alias("alias1", "alias2"))
+ .build())
+ .setMessage(Message.newBuilder()
+ .setMsgContent(MSG_CONTENT)
+ .addExtra("from", "JPush")
+ .build())
+ .build();
+ }
+
+ public static void testSendPushWithCustomConfig() {
+ ClientConfig config = ClientConfig.getInstance();
+ // Setup the custom hostname
+ config.setPushHostName("https://api.jpush.cn");
+
+ JPushClient jpushClient = new JPushClient(masterSecret, appKey, 3, null, config);
+
+ // For push, all you need do is to build PushPayload object.
+ PushPayload payload = buildPushObject_all_all_alert();
+
+ try {
+ PushResult result = jpushClient.sendPush(payload);
+ LOG.info("Got result - " + result);
+
+ } catch (APIConnectionException e) {
+ LOG.error("Connection error. Should retry later. ", e);
+
+ } catch (APIRequestException e) {
+ LOG.error("Error response from JPush server. Should review and fix it. ", e);
+ LOG.info("HTTP Status: " + e.getStatus());
+ LOG.info("Error Code: " + e.getErrorCode());
+ LOG.info("Error Message: " + e.getErrorMessage());
+ LOG.info("Msg ID: " + e.getMsgId());
+ }
+ }
+
+ public static void testSendIosAlert(String alias,String title,String body,Map extras) {
+ JPushClient jpushClient = new JPushClient(masterSecret, appKey, true ,86400);
+ try {
+ JsonObject json = new JsonObject();
+ json.addProperty("title", title);
+ json.addProperty("body", body);
+ PushResult result = jpushClient.sendIosNotificationWithAlias(json, extras, alias);
+ System.out.println("Got result - " + result);
+ } catch (APIConnectionException e) {
+ LOG.error("Connection error. Should retry later. ", e);
+ } catch (APIRequestException e) {
+ LOG.error("Error response from JPush server. Should review and fix it. "+e);
+ LOG.error("HTTP Status: " + e.getStatus());
+ LOG.error("Error Code: " + e.getErrorCode());
+ System.out.println(e.getErrorCode());
+ LOG.error("Error Message: " + e.getErrorMessage());
+ }
+ }
+
+ public static void testSendAndroidNotification(String alias,String title,String alert,Map map) {
+ JPushClient jpushClient = new JPushClient(masterSecret, appKey , true ,86400);
+ try {
+ PushResult result = jpushClient.sendAndroidNotificationWithAlias(title ,alert, map, alias);
+ System.out.println("Got result - " + result);
+ } catch (APIConnectionException e) {
+ LOG.error("Connection error. Should retry later. ", e);
+ } catch (APIRequestException e) {
+ LOG.error("Error response from JPush server. Should review and fix it. "+e);
+ LOG.error("HTTP Status: " + e.getStatus());
+ LOG.error("Error Code: " + e.getErrorCode());
+ System.out.println(e.getMessage());
+ LOG.error("Error Message: " + e.getErrorMessage());
+ }
+ }
+
+}
+
diff --git a/.svn/pristine/a1/a112be21c325d37ebc17baafd40c0386b5d09df1.svn-base b/.svn/pristine/a1/a112be21c325d37ebc17baafd40c0386b5d09df1.svn-base
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.svn/pristine/a1/a112be21c325d37ebc17baafd40c0386b5d09df1.svn-base
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/.svn/pristine/a1/a159236f78915408fd99a618a299000657fd2c8d.svn-base b/.svn/pristine/a1/a159236f78915408fd99a618a299000657fd2c8d.svn-base
new file mode 100644
index 0000000..bf44638
--- /dev/null
+++ b/.svn/pristine/a1/a159236f78915408fd99a618a299000657fd2c8d.svn-base
@@ -0,0 +1,163 @@
+package com.ifish.jpush.push.model.notification;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.ifish.jpush.push.model.PushModel;
+import com.ifish.jpush.utils.Preconditions;
+
+public class Notification implements PushModel {
+ private final Object alert;
+ private final Set notifications;
+
+ private Notification(Object alert, Set notifications) {
+ this.alert = alert;
+ this.notifications = notifications;
+ }
+
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ /**
+ * Quick set all platform alert.
+ * Platform notification can override this alert.
+ *
+ * @param alert Notification alert
+ * @return first level notification object
+ */
+ public static Notification alert(Object alert) {
+ return newBuilder().setAlert(alert).build();
+ }
+
+ /**
+ * shortcut
+ */
+ public static Notification android(String alert, String title, Map extras) {
+ return newBuilder()
+ .addPlatformNotification(AndroidNotification.newBuilder()
+ .setAlert(alert)
+ .setTitle(title)
+ .setBuilderId(1)
+ .addExtras(extras)
+ .build())
+ .build();
+ }
+
+ /**
+ * shortcut
+ */
+ public static Notification ios(Object alert, Map extras) {
+ return newBuilder()
+ .addPlatformNotification(IosNotification.newBuilder()
+ .setAlert(alert)
+ .setSound("default")
+ .setCategory("INVITE_CATEGORY")
+ .addExtras(extras)
+ .build())
+ .build();
+ }
+
+ /**
+ * shortcut
+ */
+ public static Notification ios_auto_badge() {
+ return newBuilder()
+ .addPlatformNotification(IosNotification.newBuilder()
+ .setAlert("")
+ .autoBadge()
+ .build())
+ .build();
+ }
+
+ /**
+ * shortcut
+ */
+ public static Notification ios_set_badge(int badge) {
+ return newBuilder()
+ .addPlatformNotification(IosNotification.newBuilder()
+ .setAlert("")
+ .setBadge(badge)
+ .build())
+ .build();
+ }
+
+ /**
+ * shortcut
+ */
+ public static Notification ios_incr_badge(int badge) {
+ return newBuilder()
+ .addPlatformNotification(IosNotification.newBuilder()
+ .setAlert("")
+ .incrBadge(badge)
+ .build())
+ .build();
+ }
+
+ /**
+ * shortcut
+ */
+ public static Notification winphone(String alert, Map extras) {
+ return newBuilder()
+ .addPlatformNotification(WinphoneNotification.newBuilder()
+ .setAlert(alert)
+ .addExtras(extras)
+ .build())
+ .build();
+ }
+
+ public JsonElement toJSON() {
+ JsonObject json = new JsonObject();
+ if (null != alert) {
+ if(alert instanceof JsonObject) {
+ json.add(PlatformNotification.ALERT, (JsonObject) alert);
+ } else if (alert instanceof IosAlert) {
+ json.add(PlatformNotification.ALERT, ((IosAlert) alert).toJSON());
+ } else {
+ json.add(PlatformNotification.ALERT, new JsonPrimitive(alert.toString()));
+ }
+ }
+ if (null != notifications) {
+ for (PlatformNotification pn : notifications) {
+ if (this.alert != null && pn.getAlert() == null) {
+ pn.setAlert(this.alert);
+ }
+
+ Preconditions.checkArgument(! (null == pn.getAlert()),
+ "For any platform notification, alert field is needed. It can be empty string.");
+
+ json.add(pn.getPlatform(), pn.toJSON());
+ }
+ }
+ return json;
+ }
+
+ public static class Builder {
+ private Object alert;
+ private Set builder;
+
+ public Builder setAlert(Object alert) {
+ this.alert = alert;
+ return this;
+ }
+
+ public Builder addPlatformNotification(PlatformNotification notification) {
+ if (null == builder) {
+ builder = new HashSet();
+ }
+ builder.add(notification);
+ return this;
+ }
+
+ public Notification build() {
+ Preconditions.checkArgument(! (null == builder && null == alert),
+ "No notification payload is set.");
+ return new Notification(alert, builder);
+ }
+ }
+}
+
diff --git a/.svn/pristine/aa/aa268d45232b073aeb1fa3778addf777ec53e566.svn-base b/.svn/pristine/aa/aa268d45232b073aeb1fa3778addf777ec53e566.svn-base
new file mode 100644
index 0000000..15f0aee
--- /dev/null
+++ b/.svn/pristine/aa/aa268d45232b073aeb1fa3778addf777ec53e566.svn-base
@@ -0,0 +1,331 @@
+package com.ifish.jpush.common.connection;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.Authenticator;
+import java.net.HttpURLConnection;
+import java.net.PasswordAuthentication;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.ifish.jpush.common.resp.APIConnectionException;
+import com.ifish.jpush.common.resp.APIRequestException;
+import com.ifish.jpush.common.resp.ResponseWrapper;
+
+/**
+ * The implementation has no connection pool mechanism, used origin java connection.
+ *
+ * 本实现没有连接池机制，基于 Java 原始的 HTTP 连接实现。
+ *
+ * 遇到连接超时，会自动重连指定的次数（默认为 3）；如果是读取超时，则不会自动重连。
+ *
+ * 可选支持 HTTP 代理，同时支持 2 种方式：1) HTTP 头上加上 Proxy-Authorization 信息；2）全局配置 Authenticator.setDefault；
+ */
+public class NativeHttpClient implements IHttpClient {
+ private static final Logger LOG = LoggerFactory.getLogger(NativeHttpClient.class);
+ private static final String KEYWORDS_CONNECT_TIMED_OUT = "connect timed out";
+ private static final String KEYWORDS_READ_TIMED_OUT = "Read timed out";
+
+ private int _maxRetryTimes = 0;
+ private String _authCode;
+ private HttpProxy _proxy;
+
+ /**
+ * 默认的重连次数是 3
+ */
+ public NativeHttpClient(String authCode) {
+ this(authCode, DEFAULT_MAX_RETRY_TIMES, null);
+ }
+
+ public NativeHttpClient(String authCode, int maxRetryTimes, HttpProxy proxy) {
+ this._maxRetryTimes = maxRetryTimes;
+ LOG.info("Created instance with _maxRetryTimes = " + _maxRetryTimes);
+
+ this._authCode = authCode;
+ this._proxy = proxy;
+
+ if ( null != _proxy && _proxy.isAuthenticationNeeded()) {
+ Authenticator.setDefault(new SimpleProxyAuthenticator(
+ _proxy.getUsername(), _proxy.getPassword()));
+ }
+
+ initSSL();
+ }
+
+ public ResponseWrapper sendGet(String url)
+ throws APIConnectionException, APIRequestException {
+ return sendGet(url, null);
+ }
+
+ public ResponseWrapper sendGet(String url, String content)
+ throws APIConnectionException, APIRequestException {
+ return doRequest(url, content, RequestMethod.GET);
+ }
+
+ public ResponseWrapper sendDelete(String url)
+ throws APIConnectionException, APIRequestException {
+ return sendDelete(url, null);
+ }
+
+ public ResponseWrapper sendDelete(String url, String content)
+ throws APIConnectionException, APIRequestException {
+ return doRequest(url, content, RequestMethod.DELETE);
+ }
+
+ public ResponseWrapper sendPost(String url, String content)
+ throws APIConnectionException, APIRequestException {
+ return doRequest(url, content, RequestMethod.POST);
+ }
+
+ public ResponseWrapper sendPut(String url, String content)
+ throws APIConnectionException, APIRequestException {
+ return doRequest(url, content, RequestMethod.PUT);
+ }
+
+ public ResponseWrapper doRequest(String url, String content,
+ RequestMethod method) throws APIConnectionException, APIRequestException {
+ ResponseWrapper response = null;
+ for (int retryTimes = 0; ; retryTimes++) {
+ try {
+ response = _doRequest(url, content, method);
+ break;
+ } catch (SocketTimeoutException e) {
+ if (KEYWORDS_READ_TIMED_OUT.equals(e.getMessage())) {
+ // Read timed out. For push, maybe should not re-send.
+ throw new APIConnectionException(READ_TIMED_OUT_MESSAGE, e, true);
+ } else { // connect timed out
+ if (retryTimes >= _maxRetryTimes) {
+ throw new APIConnectionException(CONNECT_TIMED_OUT_MESSAGE, e, retryTimes);
+ } else {
+ LOG.debug("connect timed out - retry again - " + (retryTimes + 1));
+ }
+ }
+ }
+ }
+ return response;
+ }
+
+ private ResponseWrapper _doRequest(String url, String content,
+ RequestMethod method) throws APIConnectionException, APIRequestException,
+ SocketTimeoutException {
+
+ LOG.debug("Send request - " + method.toString() + " "+ url);
+ if (null != content) {
+ LOG.debug("Request Content - " + content);
+ }
+ HttpURLConnection conn = null;
+ OutputStream out = null;
+ StringBuffer sb = new StringBuffer();
+ ResponseWrapper wrapper = new ResponseWrapper();
+
+ try {
+ URL aUrl = new URL(url);
+
+ if (null != _proxy) {
+ conn = (HttpURLConnection) aUrl.openConnection(_proxy.getNetProxy());
+ if (_proxy.isAuthenticationNeeded()) {
+ conn.setRequestProperty("Proxy-Authorization", _proxy.getProxyAuthorization());
+ }
+ } else {
+ conn = (HttpURLConnection) aUrl.openConnection();
+ }
+
+ conn.setConnectTimeout(DEFAULT_CONNECTION_TIMEOUT);
+ conn.setReadTimeout(DEFAULT_READ_TIMEOUT);
+ conn.setUseCaches(false);
+ conn.setRequestMethod(method.name());
+ conn.setRequestProperty("User-Agent", JPUSH_USER_AGENT);
+ conn.setRequestProperty("Connection", "Keep-Alive");
+ conn.setRequestProperty("Accept-Charset", CHARSET);
+ conn.setRequestProperty("Charset", CHARSET);
+ conn.setRequestProperty("Authorization", _authCode);
+ conn.setRequestProperty("Content-Type", CONTENT_TYPE_JSON);
+
+ if(null == content) {
+ conn.setDoOutput(false);
+ } else {
+ conn.setDoOutput(true);
+ byte[] data = content.getBytes(CHARSET);
+ conn.setRequestProperty("Content-Length", String.valueOf(data.length));
+ out = conn.getOutputStream();
+ out.write(data);
+ out.flush();
+ }
+
+ int status = conn.getResponseCode();
+ InputStream in = null;
+ if (status / 100 == 2) {
+ in = conn.getInputStream();
+ } else {
+ in = conn.getErrorStream();
+ }
+
+ if (null != in) {
+ InputStreamReader reader = new InputStreamReader(in, CHARSET);
+ char[] buff = new char[1024];
+ int len;
+ while ((len = reader.read(buff)) > 0) {
+ sb.append(buff, 0, len);
+ }
+ }
+
+ String responseContent = sb.toString();
+ wrapper.responseCode = status;
+ wrapper.responseContent = responseContent;
+
+ String quota = conn.getHeaderField(RATE_LIMIT_QUOTA);
+ String remaining = conn.getHeaderField(RATE_LIMIT_Remaining);
+ String reset = conn.getHeaderField(RATE_LIMIT_Reset);
+ wrapper.setRateLimit(quota, remaining, reset);
+
+ if (status >= 200 && status < 300) {
+ LOG.debug("Succeed to get response OK - responseCode:" + status);
+ LOG.debug("Response Content - " + responseContent);
+
+ } else if (status >= 300 && status < 400) {
+ LOG.warn("Normal response but unexpected - responseCode:" + status + ", responseContent:" + responseContent);
+
+ } else {
+ LOG.warn("Got error response - responseCode:" + status + ", responseContent:" + responseContent);
+
+ switch (status) {
+ case 400:
+ LOG.error("Your request params is invalid. Please check them according to error message.");
+ wrapper.setErrorObject();
+ break;
+ case 401:
+ LOG.error("Authentication failed! Please check authentication params according to docs.");
+ wrapper.setErrorObject();
+ break;
+ case 403:
+ LOG.error("Request is forbidden! Maybe your appkey is listed in blacklist or your params is invalid.");
+ wrapper.setErrorObject();
+ break;
+ case 404:
+ LOG.error("Request page is not found! Maybe your params is invalid.");
+ wrapper.setErrorObject();
+ break;
+ case 410:
+ LOG.error("Request resource is no longer in service. Please according to notice on official website.");
+ wrapper.setErrorObject();
+ case 429:
+ LOG.error("Too many requests! Please review your appkey's request quota.");
+ wrapper.setErrorObject();
+ break;
+ case 500:
+ case 502:
+ case 503:
+ case 504:
+ LOG.error("Seems encountered server error. Maybe JPush is in maintenance? Please retry later.");
+ break;
+ default:
+ LOG.error("Unexpected response.");
+ }
+
+ throw new APIRequestException(wrapper);
+ }
+
+ } catch (SocketTimeoutException e) {
+ if (e.getMessage().contains(KEYWORDS_CONNECT_TIMED_OUT)) {
+ throw e;
+ } else if (e.getMessage().contains(KEYWORDS_READ_TIMED_OUT)) {
+ throw new SocketTimeoutException(KEYWORDS_READ_TIMED_OUT);
+ }
+ LOG.debug(IO_ERROR_MESSAGE, e);
+ throw new APIConnectionException(IO_ERROR_MESSAGE, e);
+
+ } catch (IOException e) {
+ LOG.debug(IO_ERROR_MESSAGE, e);
+ throw new APIConnectionException(IO_ERROR_MESSAGE, e);
+
+ } finally {
+ if (null != out) {
+ try {
+ out.close();
+ } catch (IOException e) {
+ LOG.error("Failed to close stream.", e);
+ }
+ }
+ if (null != conn) {
+ conn.disconnect();
+ }
+ }
+
+ return wrapper;
+ }
+
+ protected void initSSL() {
+ TrustManager[] tmCerts = new javax.net.ssl.TrustManager[1];
+ tmCerts[0] = new SimpleTrustManager();
+ try {
+ SSLContext sslContext = SSLContext.getInstance("SSL");
+ sslContext.init(null, tmCerts, null);
+ HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
+
+ HostnameVerifier hostnameVerifier = new SimpleHostnameVerifier();
+ HttpsURLConnection.setDefaultHostnameVerifier(hostnameVerifier);
+ } catch (Exception e) {
+ LOG.error("Init SSL error", e);
+ }
+ }
+
+
+ private static class SimpleHostnameVerifier implements HostnameVerifier {
+
+ @Override
+ public boolean verify(String hostname, SSLSession session) {
+ return true;
+ }
+
+ }
+
+ private static class SimpleTrustManager implements TrustManager, X509TrustManager {
+
+ @Override
+ public void checkClientTrusted(X509Certificate[] chain, String authType)
+ throws CertificateException {
+ return;
+ }
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] chain, String authType)
+ throws CertificateException {
+ return;
+ }
+
+ @Override
+ public X509Certificate[] getAcceptedIssuers() {
+ return null;
+ }
+ }
+
+ private static class SimpleProxyAuthenticator extends java.net.Authenticator {
+ private String username;
+ private String password;
+
+ public SimpleProxyAuthenticator(String username, String password) {
+ this.username = username;
+ this.password = password;
+ }
+
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(
+ this.username,
+ this.password.toCharArray());
+ }
+ }
+}
diff --git a/.svn/pristine/ad/ad4a453d3f25c885d477bee96c2c72748db1b12c.svn-base b/.svn/pristine/ad/ad4a453d3f25c885d477bee96c2c72748db1b12c.svn-base
new file mode 100644
index 0000000..50e7352
--- /dev/null
+++ b/.svn/pristine/ad/ad4a453d3f25c885d477bee96c2c72748db1b12c.svn-base
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/.svn/pristine/ae/ae2895863af03cacfa731223e977c6828dd17104.svn-base b/.svn/pristine/ae/ae2895863af03cacfa731223e977c6828dd17104.svn-base
new file mode 100644
index 0000000..05335b9
--- /dev/null
+++ b/.svn/pristine/ae/ae2895863af03cacfa731223e977c6828dd17104.svn-base
@@ -0,0 +1,153 @@
+package com.ifish.jpush.push.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.ifish.jpush.utils.Preconditions;
+
+public class Message implements PushModel {
+ private static final String TITLE = "title";
+ private static final String MSG_CONTENT = "msg_content";
+ private static final String CONTENT_TYPE = "content_type";
+ private static final String EXTRAS = "extras";
+
+ private final String title;
+ private final String msgContent;
+ private final String contentType;
+ private final Map extras;
+ private final Map numberExtras;
+ private final Map booleanExtras;
+
+ private Message(String title, String msgContent, String contentType,
+ Map extras,
+ Map numberExtras,
+ Map booleanExtras) {
+ this.title = title;
+ this.msgContent = msgContent;
+ this.contentType = contentType;
+ this.extras = extras;
+ this.numberExtras = numberExtras;
+ this.booleanExtras = booleanExtras;
+ }
+
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ public static Message content(String msgContent) {
+ return new Builder().setMsgContent(msgContent).build();
+ }
+
+ @Override
+ public JsonElement toJSON() {
+ JsonObject json = new JsonObject();
+ if (null != title) {
+ json.add(TITLE, new JsonPrimitive(title));
+ }
+ if (null != msgContent) {
+ json.add(MSG_CONTENT, new JsonPrimitive(msgContent));
+ }
+ if (null != contentType) {
+ json.add(CONTENT_TYPE, new JsonPrimitive(contentType));
+ }
+
+ JsonObject extrasObject = null;
+ if (null != extras || null != numberExtras || null != booleanExtras) {
+ extrasObject = new JsonObject();
+ }
+
+ if (null != extras) {
+ for (String key : extras.keySet()) {
+ extrasObject.add(key, new JsonPrimitive(extras.get(key)));
+ }
+ }
+ if (null != numberExtras) {
+ for (String key : numberExtras.keySet()) {
+ extrasObject.add(key, new JsonPrimitive(numberExtras.get(key)));
+ }
+ }
+ if (null != booleanExtras) {
+ for (String key : booleanExtras.keySet()) {
+ extrasObject.add(key, new JsonPrimitive(booleanExtras.get(key)));
+ }
+ }
+
+ if (null != extras || null != numberExtras || null != booleanExtras) {
+ json.add(EXTRAS, extrasObject);
+ }
+
+ return json;
+ }
+
+ public static class Builder {
+ private String title;
+ private String msgContent;
+ private String contentType;
+ private Map extrasBuilder;
+ private Map numberExtrasBuilder;
+ private Map booleanExtrasBuilder;
+
+ public Builder setTitle(String title) {
+ this.title = title;
+ return this;
+ }
+
+ public Builder setMsgContent(String msgContent) {
+ this.msgContent = msgContent;
+ return this;
+ }
+
+ public Builder setContentType(String contentType) {
+ this.contentType = contentType;
+ return this;
+ }
+
+ public Builder addExtra(String key, String value) {
+ Preconditions.checkArgument(! (null == key || null == value), "Key/Value should not be null.");
+ if (null == extrasBuilder) {
+ extrasBuilder = new HashMap();
+ }
+ extrasBuilder.put(key, value);
+ return this;
+ }
+
+ public Builder addExtras(Map extras) {
+ Preconditions.checkArgument(! (null == extras), "extras should not be null.");
+ if (null == extrasBuilder) {
+ extrasBuilder = new HashMap();
+ }
+ for (String key : extras.keySet()) {
+ extrasBuilder.put(key, extras.get(key));
+ }
+ return this;
+ }
+
+ public Builder addExtra(String key, Number value) {
+ Preconditions.checkArgument(! (null == key || null == value), "Key/Value should not be null.");
+ if (null == numberExtrasBuilder) {
+ numberExtrasBuilder = new HashMap();
+ }
+ numberExtrasBuilder.put(key, value);
+ return this;
+ }
+
+ public Builder addExtra(String key, Boolean value) {
+ Preconditions.checkArgument(! (null == key || null == value), "Key/Value should not be null.");
+ if (null == booleanExtrasBuilder) {
+ booleanExtrasBuilder = new HashMap();
+ }
+ booleanExtrasBuilder.put(key, value);
+ return this;
+ }
+
+ public Message build() {
+ Preconditions.checkArgument(! (null == msgContent),
+ "msgContent should be set");
+ return new Message(title, msgContent, contentType,
+ extrasBuilder, numberExtrasBuilder, booleanExtrasBuilder);
+ }
+ }
+}
diff --git a/.svn/pristine/af/afd98b4d7befb8975ddca106ff887710597c159d.svn-base b/.svn/pristine/af/afd98b4d7befb8975ddca106ff887710597c159d.svn-base
new file mode 100644
index 0000000..dc68569
--- /dev/null
+++ b/.svn/pristine/af/afd98b4d7befb8975ddca106ff887710597c159d.svn-base
@@ -0,0 +1,170 @@
+package com.ifish.job;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.ifish.enums.PhoneTypeEnum;
+import com.ifish.jpush.JPushNotification;
+import com.ifish.netease.NeteaseIM;
+import com.ifish.util.IfishUtil;
+
+public class job{
+ @Autowired
+ private NeteaseIM neteaseIM;
+ @Autowired
+ private JPushNotification jPushNotification2;
+
+ private Connection connection = null;
+ private Statement stmt = null;
+ private PreparedStatement prest = null;
+
+ /**
+ * 查询需要推送的用户并且推送完修改为下一次提醒日期
+ */
+ public void pushRemind(){
+ System.out.println(new Date()+"开始任务");
+ try {
+ Class.forName("com.mysql.jdbc.Driver");
+ connection = DriverManager.getConnection("jdbc:mysql://localhost:3306/myfishdb?characterEncoding=UTF-8", "ifish", "ifish7pwd");
+ stmt = connection.createStatement();
+ prest = connection.prepareStatement("update tbl_tmp_push_remind set is_push=? where user_id=? and device_id=?");
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ }
+ //结果集
+ ResultSet result = null;
+ try {
+ //推送提醒数
+ int rowCount = 0;
+ //按分页来获取数据
+ int pageNo = 0;
+ //云信限制每次最多500条
+ int pageSize = 500;
+ //查询总共需要推送的用户数
+ String countSql = "select count(1) as countRow from tbl_tmp_push_remind where is_push='0'";
+ result = stmt.executeQuery(countSql);
+ if(result.next()){
+ rowCount=result.getInt("countRow");
+ pageNo = (rowCount+pageSize-1)/pageSize;
+ }
+ System.out.println(pageNo);
+ for (int i = 0; i < pageNo; i++) {
+ result = stmt.executeQuery("select device_id,user_id,show_name,login_type from tbl_tmp_push_remind where is_push='0' limit 0,"+pageSize);
+ //推送的用户
+ List androidUser = new ArrayList();
+ List iosUser = new ArrayList();
+ List ids = new ArrayList();
+ //更新提醒过的用户
+ while(result.next()){
+ Integer deviceId= result.getInt("device_id");
+ Integer userId = result.getInt("user_id");
+ String loginType = result.getString("login_type");
+ prest.setString(1, "1");
+ prest.setInt(2, userId);
+ prest.setInt(3, deviceId);
+ prest.addBatch();
+ //云信
+ ids.add(userId.toString());
+ //极光
+ if(loginType.toLowerCase().equals(PhoneTypeEnum.android.getKey())){
+ androidUser.add(userId.toString());
+ }
+ else if(loginType.toLowerCase().equals(PhoneTypeEnum.ios.getKey())){
+ iosUser.add(userId.toString());
+ }
+ }
+ //发送云信消息
+ if(ids.size()>0){
+ neteaseIM.sendBatchMsg("ifish", JSONArray.fromObject(ids).toString(), "【换水提醒】您的水族箱需要换水啦～您可以在水箱设置中更改提醒设置");
+ }
+ //极光推送
+ Integer iosSize = iosUser.size();
+ Integer androidSize = androidUser.size();
+ if(iosSize>0){
+ push(PhoneTypeEnum.ios,iosUser.toArray(new String[iosSize]));
+ }
+ if(androidSize>0){
+ push(PhoneTypeEnum.android,androidUser.toArray(new String[androidSize]));
+ }
+ //批量提交
+ prest.executeBatch();
+ //云信一分钟访问不超过120次
+ Thread.sleep(600);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ finally{
+ if(result!=null){
+ try {
+ result.close();
+ result = null;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ if(stmt!=null){
+ try {
+ stmt.close();
+ stmt = null;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ if(prest!=null){
+ try {
+ prest.close();
+ prest = null;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ if(connection!=null){
+ try {
+ connection.close();
+ connection = null;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ /**
+ * 推送提醒
+ * @param type
+ * @param ids
+ */
+ public void push(PhoneTypeEnum type,String[] ids){
+ try {
+ Map map = new HashMap();
+ map.put("timestamp", IfishUtil.format2(new Date()));
+ //推送android
+ /*if(type.equals(PhoneTypeEnum.android)){
+ System.out.println(new Date()+"android推送"+ids.length+"个");
+ jPushNotification.sendAndroidNotification(ids, "换水提醒", "您的水族箱需要换水啦～您可以在水箱设置中更改提醒设置", map);
+ }*/
+ //推送IOS
+ if(type.equals(PhoneTypeEnum.ios)){
+ System.out.println(new Date()+"ios推送"+ids.length+"个");
+ jPushNotification2.sendIosNotification(ids, "换水提醒", "您的水族箱需要换水啦～您可以在水箱设置中更改提醒设置", map);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
\ No newline at end of file
diff --git a/.svn/pristine/b3/b3eaa950e890123a437a2ea04a57255b1dbed628.svn-base b/.svn/pristine/b3/b3eaa950e890123a437a2ea04a57255b1dbed628.svn-base
new file mode 100644
index 0000000..bffa040
--- /dev/null
+++ b/.svn/pristine/b3/b3eaa950e890123a437a2ea04a57255b1dbed628.svn-base
@@ -0,0 +1,157 @@
+package com.ifish.job;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.ifish.enums.PhoneTypeEnum;
+import com.ifish.jpush.JPushNotification;
+import com.ifish.util.IfishUtil;
+
+public class job{
+ @Autowired
+ private JPushNotification jPushNotification;
+ @Autowired
+ private JPushNotification jPushNotification2;
+
+ private Connection connection = null;
+ private Statement stmt = null;
+ private PreparedStatement prest = null;
+
+ /**
+ * 查询需要推送的用户并且推送完修改为下一次提醒日期
+ */
+ public void pushRemind(){
+ System.out.println(new Date()+"开始任务");
+ try {
+ Class.forName("com.mysql.jdbc.Driver");
+ connection = DriverManager.getConnection("jdbc:mysql://localhost:3306/myfishdb?characterEncoding=UTF-8", "ifish", "ifish7pwd");
+ stmt = connection.createStatement();
+ prest = connection.prepareStatement("update tbl_tmp_push_remind set is_push=? where user_id=? and device_id=?");
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ }
+ //结果集
+ ResultSet result = null;
+ try {
+ //推送提醒数
+ int rowCount = 0;
+ //按分页来获取数据
+ int pageNo = 0;
+ int pageSize = 900;
+ //查询总共需要推送的用户数
+ String countSql = "select count(1) as countRow from tbl_tmp_push_remind where is_push='0'";
+ result = stmt.executeQuery(countSql);
+ if(result.next()){
+ rowCount=result.getInt("countRow");
+ pageNo = (rowCount+pageSize-1)/pageSize;
+ }
+ System.out.println(pageNo);
+ for (int i = 0; i < pageNo; i++) {
+ result = stmt.executeQuery("select device_id,user_id,show_name,login_type from tbl_tmp_push_remind where is_push='0' limit 0,"+pageSize);
+ //推送的用户
+ List androidUser = new ArrayList();
+ List iosUser = new ArrayList();
+ //更新提醒过的用户
+ while(result.next()){
+ Integer deviceId= result.getInt("device_id");
+ Integer userId = result.getInt("user_id");
+ String loginType = result.getString("login_type");
+ prest.setString(1, "1");
+ prest.setInt(2, userId);
+ prest.setInt(3, deviceId);
+ prest.addBatch();
+ if(loginType.toLowerCase().equals(PhoneTypeEnum.android.getKey())){
+ androidUser.add(userId.toString());
+ }
+ else if(loginType.toLowerCase().equals(PhoneTypeEnum.ios.getKey())){
+ iosUser.add(userId.toString());
+ }
+ }
+ //推送
+ Integer iosSize = iosUser.size();
+ Integer androidSize = androidUser.size();
+ if(iosSize>0){
+ push(PhoneTypeEnum.ios,iosUser.toArray(new String[iosSize]));
+ }
+ if(androidSize>0){
+ System.out.println(androidUser.toString());
+ push(PhoneTypeEnum.android,androidUser.toArray(new String[androidSize]));
+ }
+ //批量提交
+ prest.executeBatch();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ finally{
+ if(result!=null){
+ try {
+ result.close();
+ result = null;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ if(stmt!=null){
+ try {
+ stmt.close();
+ stmt = null;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ if(prest!=null){
+ try {
+ prest.close();
+ prest = null;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ if(connection!=null){
+ try {
+ connection.close();
+ connection = null;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ /**
+ * 推送提醒
+ * @param type
+ * @param ids
+ */
+ public void push(PhoneTypeEnum type,String[] ids){
+ try {
+ Map map = new HashMap();
+ map.put("timestamp", IfishUtil.format2(new Date()));
+ //推送android
+ if(type.equals(PhoneTypeEnum.android)){
+ System.out.println(new Date()+"android推送"+ids.length+"个");
+ jPushNotification.sendAndroidNotification(ids, "换水提醒", "您的水族箱需要换水啦～您可以在水箱设置中更改提醒设置", map);
+ }
+ //推送IOS
+ else if(type.equals(PhoneTypeEnum.ios)){
+ System.out.println(new Date()+"ios推送"+ids.length+"个");
+ jPushNotification2.sendIosNotification(ids, "换水提醒", "您的水族箱需要换水啦～您可以在水箱设置中更改提醒设置", map);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
\ No newline at end of file
diff --git a/.svn/pristine/b4/b435b36fb458ffe445bc484179aa76c524877a32.svn-base b/.svn/pristine/b4/b435b36fb458ffe445bc484179aa76c524877a32.svn-base
new file mode 100644
index 0000000..f157947
--- /dev/null
+++ b/.svn/pristine/b4/b435b36fb458ffe445bc484179aa76c524877a32.svn-base
@@ -0,0 +1,61 @@
+package com.ifish.jpush.common.connection;
+
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.ifish.jpush.common.ServiceHelper;
+import com.ifish.jpush.utils.Preconditions;
+
+public class HttpProxy {
+ private static final Logger LOG = LoggerFactory.getLogger(HttpProxy.class);
+
+ private String host;
+ private int port;
+ private String username;
+ private String password;
+
+ private boolean authenticationNeeded = false;
+
+ public HttpProxy(String host, int port) {
+ this.host = host;
+ this.port = port;
+ }
+
+ public HttpProxy(String host, int port, String username, String password) {
+ this(host, port);
+
+ Preconditions.checkArgument(! (null == username), "username should not be null");
+ Preconditions.checkArgument(! (null == password), "password should not be null");
+
+ this.username = username;
+ this.password = password;
+ authenticationNeeded = true;
+
+ LOG.info("Http Proxy - host:" + host + ", port:" + port
+ + ", username:" + username + ", password:" + password);
+ }
+
+
+ public Proxy getNetProxy() {
+ return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(host, port));
+ }
+
+ public boolean isAuthenticationNeeded() {
+ return this.authenticationNeeded;
+ }
+
+ public String getProxyAuthorization() {
+ return ServiceHelper.getBasicAuthorization(username, password);
+ }
+
+ public String getUsername() {
+ return this.username;
+ }
+
+ public String getPassword() {
+ return this.password;
+ }
+}
diff --git a/.svn/pristine/b6/b6d6945c0f50e065acd39c9fb75448eac4af25f3.svn-base b/.svn/pristine/b6/b6d6945c0f50e065acd39c9fb75448eac4af25f3.svn-base
new file mode 100644
index 0000000..a006513
--- /dev/null
+++ b/.svn/pristine/b6/b6d6945c0f50e065acd39c9fb75448eac4af25f3.svn-base
@@ -0,0 +1,39 @@
+package com.ifish.jpush.report;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.ifish.jpush.common.TimeUnit;
+import com.ifish.jpush.common.resp.BaseResult;
+
+public class UsersResult extends BaseResult {
+
+ @Expose public TimeUnit time_unit;
+ @Expose public String start;
+ @Expose public int duration;
+ @Expose public List items = new ArrayList();
+
+
+ public static class User {
+ @Expose public String time;
+ @Expose public Android android;
+ @Expose public Ios ios;
+ }
+
+ public static class Android {
+ @SerializedName("new") @Expose public long add;
+ @Expose public int online;
+ @Expose public int active;
+ }
+
+ public static class Ios {
+ @SerializedName("new") @Expose public long add;
+ @Expose public int online;
+ @Expose public int active;
+ }
+
+}
+
+
diff --git a/.svn/pristine/b7/b706e84fc8b85bae21c10f4025f3a84b9f4e23e8.svn-base b/.svn/pristine/b7/b706e84fc8b85bae21c10f4025f3a84b9f4e23e8.svn-base
new file mode 100644
index 0000000..9b6a574
--- /dev/null
+++ b/.svn/pristine/b7/b706e84fc8b85bae21c10f4025f3a84b9f4e23e8.svn-base
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{50} %msg%n
+
+
+
+
+
+ ${LOG_HOME}/quartzPro/localhost.log
+
+ ${LOG_HOME}/quartzPro/%d{yyyy-MM-dd}.log
+ 30
+
+ 100MB
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss} 【%-5level】 【%logger{50}】 %msg%n
+ UTF-8
+
+
+ WARN
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.svn/pristine/b7/b7ceaa99fbad034b531d9587a425a9e0a3f00bbd.svn-base b/.svn/pristine/b7/b7ceaa99fbad034b531d9587a425a9e0a3f00bbd.svn-base
new file mode 100644
index 0000000..e5d16a0
--- /dev/null
+++ b/.svn/pristine/b7/b7ceaa99fbad034b531d9587a425a9e0a3f00bbd.svn-base
@@ -0,0 +1,29 @@
+package com.ifish.enums;
+
+public enum PhoneTypeEnum {
+ ios("ios","ios"),
+ android("android","安卓");
+
+ private PhoneTypeEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/.svn/pristine/bb/bbccd5d3ec93b58b964171e92e1c29b173b057e3.svn-base b/.svn/pristine/bb/bbccd5d3ec93b58b964171e92e1c29b173b057e3.svn-base
new file mode 100644
index 0000000..8fc0b0e
--- /dev/null
+++ b/.svn/pristine/bb/bbccd5d3ec93b58b964171e92e1c29b173b057e3.svn-base
@@ -0,0 +1,108 @@
+package com.ifish.jpush.push.model;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.ifish.jpush.common.DeviceType;
+import com.ifish.jpush.utils.Preconditions;
+
+public class Platform implements PushModel {
+ private static final String ALL = "all";
+
+ private final boolean all;
+ private final Set deviceTypes;
+
+ private Platform(boolean all, Set deviceTypes) {
+ this.all = all;
+ this.deviceTypes = deviceTypes;
+ }
+
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ public static Platform all() {
+ return newBuilder().setAll(true).build();
+ }
+
+ public static Platform android() {
+ return newBuilder().addDeviceType(DeviceType.Android).build();
+ }
+
+ public static Platform ios() {
+ return newBuilder().addDeviceType(DeviceType.IOS).build();
+ }
+
+ public static Platform winphone() {
+ return newBuilder().addDeviceType(DeviceType.WinPhone).build();
+ }
+
+ public static Platform android_ios() {
+ return newBuilder()
+ .addDeviceType(DeviceType.Android)
+ .addDeviceType(DeviceType.IOS)
+ .build();
+ }
+
+ public static Platform android_winphone() {
+ return newBuilder()
+ .addDeviceType(DeviceType.Android)
+ .addDeviceType(DeviceType.WinPhone)
+ .build();
+ }
+
+ public static Platform ios_winphone() {
+ return newBuilder()
+ .addDeviceType(DeviceType.IOS)
+ .addDeviceType(DeviceType.WinPhone)
+ .build();
+ }
+
+ public boolean isAll() {
+ return all;
+ }
+
+ @Override
+ public JsonElement toJSON() {
+ if (all) {
+ return new JsonPrimitive(ALL);
+ }
+
+ JsonArray json = new JsonArray();
+ for (DeviceType deviceType : deviceTypes) {
+ json.add(new JsonPrimitive(deviceType.value()));
+ }
+ return json;
+ }
+
+
+ public static class Builder {
+ private boolean all;
+ private Set deviceTypes;
+
+ public Builder setAll(boolean all) {
+ this.all = all;
+ return this;
+ }
+
+ public Builder addDeviceType(DeviceType deviceType) {
+ if (null == deviceTypes) {
+ deviceTypes = new HashSet();
+ }
+ deviceTypes.add(deviceType);
+ return this;
+ }
+
+ public Platform build() {
+ Preconditions.checkArgument(! (all && null != deviceTypes), "Since all is enabled, any platform should not be set.");
+ Preconditions.checkArgument(! (!all && null == deviceTypes), "No any deviceType is set.");
+ return new Platform(all, deviceTypes);
+ }
+ }
+
+}
+
+
diff --git a/.svn/pristine/bc/bcfce3275a30b04ad638d76ba584ddbd2e8e647d.svn-base b/.svn/pristine/bc/bcfce3275a30b04ad638d76ba584ddbd2e8e647d.svn-base
new file mode 100644
index 0000000..63276a1
--- /dev/null
+++ b/.svn/pristine/bc/bcfce3275a30b04ad638d76ba584ddbd2e8e647d.svn-base
@@ -0,0 +1,14 @@
+package com.ifish.jpush.device;
+
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.ifish.jpush.common.resp.BaseResult;
+
+public class TagAliasResult extends BaseResult {
+
+ @Expose public List tags;
+ @Expose public String alias;
+
+}
+
diff --git a/.svn/pristine/bd/bd491e32befc373ab3d8bfbb2b314443d3a9f3d6.svn-base b/.svn/pristine/bd/bd491e32befc373ab3d8bfbb2b314443d3a9f3d6.svn-base
new file mode 100644
index 0000000..3288fc4
--- /dev/null
+++ b/.svn/pristine/bd/bd491e32befc373ab3d8bfbb2b314443d3a9f3d6.svn-base
@@ -0,0 +1,107 @@
+package com.ifish.tianqi;
+
+
+import javax.crypto.Mac;
+import java.net.URLEncoder;
+import java.security.InvalidKeyException;
+import javax.crypto.spec.SecretKeySpec;
+
+public class javaDemo {
+
+ private static final char last2byte = (char) Integer.parseInt("00000011", 2);
+ private static final char last4byte = (char) Integer.parseInt("00001111", 2);
+ private static final char last6byte = (char) Integer.parseInt("00111111", 2);
+ private static final char lead6byte = (char) Integer.parseInt("11111100", 2);
+ private static final char lead4byte = (char) Integer.parseInt("11110000", 2);
+ private static final char lead2byte = (char) Integer.parseInt("11000000", 2);
+ private static final char[] encodeTable = new char[] { 'A', 'B', 'C', 'D',
+ 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q',
+ 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
+ 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
+ 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3',
+ '4', '5', '6', '7', '8', '9', '+', '/'
+ };
+
+ public static String standardURLEncoder(String data, String key) {
+ byte[] byteHMAC = null;
+ String urlEncoder = "";
+ try {
+ Mac mac = Mac.getInstance("HmacSHA1");
+ SecretKeySpec spec = new SecretKeySpec(key.getBytes(), "HmacSHA1");
+ mac.init(spec);
+ byteHMAC = mac.doFinal(data.getBytes());
+ if (byteHMAC != null) {
+ String oauth = encode(byteHMAC);
+ if (oauth != null) {
+ urlEncoder = URLEncoder.encode(oauth, "utf8");
+ }
+ }
+ } catch (InvalidKeyException e1) {
+ e1.printStackTrace();
+ } catch (Exception e2) {
+ e2.printStackTrace();
+ }
+ return urlEncoder;
+ }
+
+ public static String encode(byte[] from) {
+ StringBuffer to = new StringBuffer((int) (from.length * 1.34) + 3);
+ int num = 0;
+ char currentByte = 0;
+ for (int i = 0; i < from.length; i++) {
+ num = num % 8;
+ while (num < 8) {
+ switch (num) {
+ case 0:
+ currentByte = (char) (from[i] & lead6byte);
+ currentByte = (char) (currentByte >>> 2);
+ break;
+ case 2:
+ currentByte = (char) (from[i] & last6byte);
+ break;
+ case 4:
+ currentByte = (char) (from[i] & last4byte);
+ currentByte = (char) (currentByte << 2);
+ if ((i + 1) < from.length) {
+ currentByte |= (from[i + 1] & lead2byte) >>> 6;
+ }
+ break;
+ case 6:
+ currentByte = (char) (from[i] & last2byte);
+ currentByte = (char) (currentByte << 4);
+ if ((i + 1) < from.length) {
+ currentByte |= (from[i + 1] & lead4byte) >>> 4;
+ }
+ break;
+ }
+ to.append(encodeTable[currentByte]);
+ num += 6;
+ }
+ }
+ if (to.length() % 4 != 0) {
+ for (int i = 4 - to.length() % 4; i > 0; i--) {
+ to.append("=");
+ }
+ }
+ return to.toString();
+ }
+
+
+ public static void main(String[] args) {
+ try {
+
+ //需要加密的数据
+ String data = "http://open.weather.com.cn/data/?areaid=101020100&type=forecast_v&date=201603011100&appid=ee35072ca2850278";
+ //密钥
+ String key = "c4a99d_SmartWeatherAPI_a164e18";
+
+ String str = standardURLEncoder(data, key);
+
+ System.out.println(str);
+ // http://open.weather.com.cn/data/?areaid=101020100&type=forecast_v&date=201603011100&appid=ee3507&key=WCD90OiAMNfP3g5qhdhXiUnyBnA%3D
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/.svn/pristine/bf/bf24c84f94978ecd56df2d031e928a497b952ba3.svn-base b/.svn/pristine/bf/bf24c84f94978ecd56df2d031e928a497b952ba3.svn-base
new file mode 100644
index 0000000..0066f02
--- /dev/null
+++ b/.svn/pristine/bf/bf24c84f94978ecd56df2d031e928a497b952ba3.svn-base
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.svn/pristine/c1/c1adf8303c9b905a6e1d405929c58eeb4d6ad040.svn-base b/.svn/pristine/c1/c1adf8303c9b905a6e1d405929c58eeb4d6ad040.svn-base
new file mode 100644
index 0000000..596b3f2
--- /dev/null
+++ b/.svn/pristine/c1/c1adf8303c9b905a6e1d405929c58eeb4d6ad040.svn-base
@@ -0,0 +1,128 @@
+package com.ifish.jpush.push.model;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.ifish.jpush.common.ServiceHelper;
+import com.ifish.jpush.utils.Preconditions;
+
+public class Options implements PushModel {
+ private static final String SENDNO = "sendno";
+ private static final String OVERRIDE_MSG_ID = "override_msg_id";
+ private static final String TIME_TO_LIVE = "time_to_live";
+ private static final String APNS_PRODUCTION = "apns_production";
+ private static final String BIG_PUSH_DURATION = "big_push_duration";
+
+ private static final long NONE_TIME_TO_LIVE = -1;
+
+ private final int sendno;
+ private final long overrideMsgId;
+ private long timeToLive;
+ private boolean apnsProduction;
+ private int bigPushDuration; // minutes
+
+ private Options(int sendno, long overrideMsgId, long timeToLive, boolean apnsProduction,
+ int bigPushDuration) {
+ this.sendno = sendno;
+ this.overrideMsgId = overrideMsgId;
+ this.timeToLive = timeToLive;
+ this.apnsProduction = apnsProduction;
+ this.bigPushDuration = bigPushDuration;
+ }
+
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ public static Options sendno() {
+ return newBuilder().setSendno(ServiceHelper.generateSendno()).build();
+ }
+
+ public static Options sendno(int sendno) {
+ return newBuilder().setSendno(sendno).build();
+ }
+
+ public void setApnsProduction(boolean apnsProduction) {
+ this.apnsProduction = apnsProduction;
+ }
+
+ public void setTimeToLive(long timeToLive) {
+ this.timeToLive = timeToLive;
+ }
+
+ public void setBigPushDuration(int bigPushDuration) {
+ this.bigPushDuration = bigPushDuration;
+ }
+
+ public int getSendno() {
+ return this.sendno;
+ }
+
+ @Override
+ public JsonElement toJSON() {
+ JsonObject json = new JsonObject();
+ if (sendno > 0) {
+ json.add(SENDNO, new JsonPrimitive(sendno));
+ }
+ if (overrideMsgId > 0) {
+ json.add(OVERRIDE_MSG_ID, new JsonPrimitive(overrideMsgId));
+ }
+ if (timeToLive >= 0) {
+ json.add(TIME_TO_LIVE, new JsonPrimitive(timeToLive));
+ }
+
+ json.add(APNS_PRODUCTION, new JsonPrimitive(apnsProduction));
+
+ if (bigPushDuration > 0) {
+ json.add(BIG_PUSH_DURATION, new JsonPrimitive(bigPushDuration));
+ }
+
+ return json;
+ }
+
+ public static class Builder {
+ private int sendno = 0;
+ private long overrideMsgId = 0;
+ private long timeToLive = NONE_TIME_TO_LIVE;
+ private boolean apnsProduction = false;
+ private int bigPushDuration = 0;
+
+ public Builder setSendno(int sendno) {
+ this.sendno = sendno;
+ return this;
+ }
+
+ public Builder setOverrideMsgId(long overrideMsgId) {
+ this.overrideMsgId = overrideMsgId;
+ return this;
+ }
+
+ public Builder setTimeToLive(long timeToLive) {
+ this.timeToLive = timeToLive;
+ return this;
+ }
+
+ public Builder setApnsProduction(boolean apnsProduction) {
+ this.apnsProduction = apnsProduction;
+ return this;
+ }
+
+ public Builder setBigPushDuration(int bigPushDuration) {
+ this.bigPushDuration = bigPushDuration;
+ return this;
+ }
+
+ public Options build() {
+ Preconditions.checkArgument(sendno >= 0, "sendno should be greater than 0.");
+ Preconditions.checkArgument(overrideMsgId >= 0, "override_msg_id should be greater than 0.");
+ Preconditions.checkArgument(timeToLive >= NONE_TIME_TO_LIVE, "time_to_live should be greater than 0.");
+ Preconditions.checkArgument(bigPushDuration >= 0, "bigPushDuration should be greater than 0.");
+ if (sendno <= 0) {
+ sendno = ServiceHelper.generateSendno();
+ }
+
+ return new Options(sendno, overrideMsgId, timeToLive, apnsProduction, bigPushDuration);
+ }
+ }
+
+}
diff --git a/.svn/pristine/c3/c3c66f0a4b971c3070f3f22a856c402bafb27cf0.svn-base b/.svn/pristine/c3/c3c66f0a4b971c3070f3f22a856c402bafb27cf0.svn-base
new file mode 100644
index 0000000..4a43aef
--- /dev/null
+++ b/.svn/pristine/c3/c3c66f0a4b971c3070f3f22a856c402bafb27cf0.svn-base
@@ -0,0 +1,17 @@
+
+
+ Archetype Created Web Application
+
+ index.jsp
+
+
+ contextConfigLocation
+
+ classpath:quartz.xml
+
+
+
+ org.springframework.web.context.ContextLoaderListener
+
+
+
\ No newline at end of file
diff --git a/.svn/pristine/c4/c414204bcc55f784435fc0bbec4fdf0610b9cf10.svn-base b/.svn/pristine/c4/c414204bcc55f784435fc0bbec4fdf0610b9cf10.svn-base
new file mode 100644
index 0000000..97577c0
--- /dev/null
+++ b/.svn/pristine/c4/c414204bcc55f784435fc0bbec4fdf0610b9cf10.svn-base
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/.svn/pristine/ca/ca016d1d4f48d7aa2b6ea75639d53b124ad189a8.svn-base b/.svn/pristine/ca/ca016d1d4f48d7aa2b6ea75639d53b124ad189a8.svn-base
new file mode 100644
index 0000000..5a7c6fb
Binary files /dev/null and b/.svn/pristine/ca/ca016d1d4f48d7aa2b6ea75639d53b124ad189a8.svn-base differ
diff --git a/.svn/pristine/d4/d484a833555f187f2c607a59d136f423ef3a0af4.svn-base b/.svn/pristine/d4/d484a833555f187f2c607a59d136f423ef3a0af4.svn-base
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/.svn/pristine/d4/d484a833555f187f2c607a59d136f423ef3a0af4.svn-base
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/.svn/pristine/d8/d890560ae3d9aa93d9140755d4e2dda5d67f8170.svn-base b/.svn/pristine/d8/d890560ae3d9aa93d9140755d4e2dda5d67f8170.svn-base
new file mode 100644
index 0000000..4df6d69
--- /dev/null
+++ b/.svn/pristine/d8/d890560ae3d9aa93d9140755d4e2dda5d67f8170.svn-base
@@ -0,0 +1,10 @@
+package com.ifish.jpush.common;
+
+public enum TimeUnit {
+
+ HOUR,
+ DAY,
+ MONTH,
+ WEEK
+
+}
diff --git a/.svn/pristine/da/dac62c700e5adb0fc6496a747ed08369301a8bfc.svn-base b/.svn/pristine/da/dac62c700e5adb0fc6496a747ed08369301a8bfc.svn-base
new file mode 100644
index 0000000..66dd7eb
--- /dev/null
+++ b/.svn/pristine/da/dac62c700e5adb0fc6496a747ed08369301a8bfc.svn-base
@@ -0,0 +1,31 @@
+package com.ifish.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class IfishUtil {
+
+ private static final String formatDate1 ="yyyy-MM-dd";
+ private static final String formatDate2 ="yyyy-MM-dd HH:mm:ss";
+
+ /**
+ * 格式化日期yyyy-MM-dd HH:mm:ss
+ * @param date
+ * @return
+ */
+ public static String format2(Date date){
+ SimpleDateFormat format = new SimpleDateFormat(formatDate2);
+ return format.format(date);
+ }
+
+ /**
+ * 格式化日期yyyy-MM-dd
+ * @param date
+ * @return
+ */
+ public static String format1(Date date){
+ SimpleDateFormat format = new SimpleDateFormat(formatDate1);
+ return format.format(date);
+ }
+
+}
diff --git a/.svn/pristine/dc/dc9568b9c8f006a4af2c6400b3cbb76b657d1cce.svn-base b/.svn/pristine/dc/dc9568b9c8f006a4af2c6400b3cbb76b657d1cce.svn-base
new file mode 100644
index 0000000..00f2066
--- /dev/null
+++ b/.svn/pristine/dc/dc9568b9c8f006a4af2c6400b3cbb76b657d1cce.svn-base
@@ -0,0 +1,148 @@
+package com.ifish.jpush.push.model.audience;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.ifish.jpush.push.model.PushModel;
+import com.ifish.jpush.utils.Preconditions;
+
+public class Audience implements PushModel {
+ private static final String ALL = "all";
+
+ private final boolean all;
+ private final Set targets;
+
+ private Audience(boolean all, Set targets) {
+ this.all = all;
+ this.targets = targets;
+ }
+
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ public static Audience all() {
+ return newBuilder().setAll(true).build();
+ }
+
+ public static Audience tag(String... tagValue) {
+ AudienceTarget target = AudienceTarget.newBuilder()
+ .setAudienceType(AudienceType.TAG)
+ .addAudienceTargetValues(tagValue).build();
+ return newBuilder().addAudienceTarget(target).build();
+ }
+
+ public static Audience tag(Collection tagValues) {
+ AudienceTarget target = AudienceTarget.newBuilder()
+ .setAudienceType(AudienceType.TAG)
+ .addAudienceTargetValues(tagValues).build();
+ return newBuilder().addAudienceTarget(target).build();
+ }
+
+ public static Audience tag_and(String... tagValue) {
+ AudienceTarget target = AudienceTarget.newBuilder()
+ .setAudienceType(AudienceType.TAG_AND)
+ .addAudienceTargetValues(tagValue).build();
+ return newBuilder().addAudienceTarget(target).build();
+ }
+
+ public static Audience tag_and(Collection tagValues) {
+ AudienceTarget target = AudienceTarget.newBuilder()
+ .setAudienceType(AudienceType.TAG_AND)
+ .addAudienceTargetValues(tagValues).build();
+ return newBuilder().addAudienceTarget(target).build();
+ }
+
+ public static Audience alias(String... alias) {
+ AudienceTarget target = AudienceTarget.newBuilder()
+ .setAudienceType(AudienceType.ALIAS)
+ .addAudienceTargetValues(alias).build();
+ return newBuilder().addAudienceTarget(target).build();
+ }
+
+ public static Audience alias(Collection aliases) {
+ AudienceTarget target = AudienceTarget.newBuilder()
+ .setAudienceType(AudienceType.ALIAS)
+ .addAudienceTargetValues(aliases).build();
+ return newBuilder().addAudienceTarget(target).build();
+ }
+
+ public static Audience segment(String... segment) {
+ AudienceTarget target = AudienceTarget.newBuilder()
+ .setAudienceType(AudienceType.SEGMENT)
+ .addAudienceTargetValues(segment).build();
+ return newBuilder().addAudienceTarget(target).build();
+ }
+
+ public static Audience segment(Collection segments) {
+ AudienceTarget target = AudienceTarget.newBuilder()
+ .setAudienceType(AudienceType.SEGMENT)
+ .addAudienceTargetValues(segments).build();
+ return newBuilder().addAudienceTarget(target).build();
+ }
+
+ public static Audience registrationId(String... registrationId) {
+ AudienceTarget target = AudienceTarget.newBuilder()
+ .setAudienceType(AudienceType.REGISTRATION_ID)
+ .addAudienceTargetValues(registrationId).build();
+ return newBuilder().addAudienceTarget(target).build();
+ }
+
+ public static Audience registrationId(Collection registrationIds) {
+ AudienceTarget target = AudienceTarget.newBuilder()
+ .setAudienceType(AudienceType.REGISTRATION_ID)
+ .addAudienceTargetValues(registrationIds).build();
+ return newBuilder().addAudienceTarget(target).build();
+ }
+
+
+ public boolean isAll() {
+ return this.all;
+ }
+
+ public JsonElement toJSON() {
+ if (all) {
+ return new JsonPrimitive(ALL);
+ }
+
+ // if not all, there will be target be set.
+ JsonObject json = new JsonObject();
+ if (null != targets) {
+ for (AudienceTarget target : targets) {
+ json.add(target.getAudienceTypeValue(), target.toJSON());
+ }
+ }
+ return json;
+ }
+
+ public static class Builder {
+ private boolean all = false;
+ private Set audienceBuilder = null;
+
+ public Builder setAll(boolean all) {
+ this.all = all;
+ return this;
+ }
+
+ public Builder addAudienceTarget(AudienceTarget target) {
+ if (null == audienceBuilder) {
+ audienceBuilder = new HashSet();
+ }
+ audienceBuilder.add(target);
+ return this;
+ }
+
+ public Audience build() {
+ Preconditions.checkArgument(! (all && null != audienceBuilder), "If audience is all, no any other audience may be set.");
+ Preconditions.checkArgument(! (all == false && null == audienceBuilder), "No any audience target is set.");
+ return new Audience(all, audienceBuilder);
+ }
+ }
+
+}
+
+
diff --git a/.svn/pristine/df/dfc05dd4812eaf19bc73b84b94a11ee724fd0956.svn-base b/.svn/pristine/df/dfc05dd4812eaf19bc73b84b94a11ee724fd0956.svn-base
new file mode 100644
index 0000000..e2b3956
--- /dev/null
+++ b/.svn/pristine/df/dfc05dd4812eaf19bc73b84b94a11ee724fd0956.svn-base
@@ -0,0 +1,9 @@
+package com.ifish.jpush.common.resp;
+
+import com.google.gson.annotations.Expose;
+
+public class BooleanResult extends DefaultResult {
+
+ @Expose public boolean result;
+
+}
diff --git a/.svn/pristine/e2/e2000b073a99f5394df7fff808102576f780240b.svn-base b/.svn/pristine/e2/e2000b073a99f5394df7fff808102576f780240b.svn-base
new file mode 100644
index 0000000..f1d1602
--- /dev/null
+++ b/.svn/pristine/e2/e2000b073a99f5394df7fff808102576f780240b.svn-base
@@ -0,0 +1,68 @@
+package com.ifish.jpush.examples;
+
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.ifish.jpush.JPushClient;
+import com.ifish.jpush.common.resp.APIConnectionException;
+import com.ifish.jpush.common.resp.APIRequestException;
+import com.ifish.jpush.device.OnlineStatus;
+import com.ifish.jpush.device.TagAliasResult;
+
+public class DevcieExample {
+ protected static final Logger LOG = LoggerFactory.getLogger(DevcieExample.class);
+
+ private static final String appKey = "dd1066407b044738b6479275";
+ private static final String masterSecret = "6b135be0037a5c1e693c3dfa";
+ private static final String TAG1 = "tag1";
+ private static final String ALIAS1 = "alias1";
+ private static final String ALIAS2 = "alias2";
+ private static final String REGISTRATION_ID1 = "0900e8d85ef";
+ private static final String REGISTRATION_ID2 = "0a04ad7d8b4";
+
+ private static JPushClient jpushClient = new JPushClient(masterSecret, appKey);
+
+ public static void main(String[] args) {
+// testGetDeviceTagAlias();
+ testGetUserOnlineStatus();
+ }
+
+ public static void testGetDeviceTagAlias() {
+ try {
+ TagAliasResult result = jpushClient.getDeviceTagAlias(REGISTRATION_ID1);
+
+ LOG.info(result.alias);
+ LOG.info(result.tags.toString());
+
+ } catch (APIConnectionException e) {
+ LOG.error("Connection error. Should retry later. ", e);
+
+ } catch (APIRequestException e) {
+ LOG.error("Error response from JPush server. Should review and fix it. ", e);
+ LOG.info("HTTP Status: " + e.getStatus());
+ LOG.info("Error Code: " + e.getErrorCode());
+ LOG.info("Error Message: " + e.getErrorMessage());
+ }
+ }
+
+ public static void testGetUserOnlineStatus() {
+ try {
+ Map result = jpushClient.getUserOnlineStatus(REGISTRATION_ID1, REGISTRATION_ID2);
+
+ LOG.info(result.get(REGISTRATION_ID1).toString());
+ LOG.info(result.get(REGISTRATION_ID2).toString());
+ } 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());
+ }
+ }
+
+}
+
+
diff --git a/.svn/pristine/e3/e3057d3ba6db57f138c76d4bf1f23a9906bbfa8f.svn-base b/.svn/pristine/e3/e3057d3ba6db57f138c76d4bf1f23a9906bbfa8f.svn-base
new file mode 100644
index 0000000..e7340bf
--- /dev/null
+++ b/.svn/pristine/e3/e3057d3ba6db57f138c76d4bf1f23a9906bbfa8f.svn-base
@@ -0,0 +1,31 @@
+package com.ifish.jpush.schedule;
+
+
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.ifish.jpush.common.resp.BaseResult;
+
+public class ScheduleListResult extends BaseResult{
+
+ @Expose int total_count;
+ @Expose int total_pages;
+ @Expose int page;
+ @Expose List schedules;
+
+ public int getTotal_count() {
+ return total_count;
+ }
+
+ public int getTotal_pages() {
+ return total_pages;
+ }
+
+ public int getPage() {
+ return page;
+ }
+
+ public List getSchedules() {
+ return schedules;
+ }
+}
diff --git a/.svn/pristine/e6/e6b4793cda7267c5f22d39a849da2a9d901d2eb0.svn-base b/.svn/pristine/e6/e6b4793cda7267c5f22d39a849da2a9d901d2eb0.svn-base
new file mode 100644
index 0000000..f5d9316
--- /dev/null
+++ b/.svn/pristine/e6/e6b4793cda7267c5f22d39a849da2a9d901d2eb0.svn-base
@@ -0,0 +1,12 @@
+package com.ifish.jpush.common.resp;
+
+public interface IRateLimiting {
+
+ public int getRateLimitQuota();
+
+ public int getRateLimitRemaining();
+
+ public int getRateLimitReset();
+
+}
+
diff --git a/.svn/pristine/e9/e9856d0dd103d59a7ca563d919d983470d81e004.svn-base b/.svn/pristine/e9/e9856d0dd103d59a7ca563d919d983470d81e004.svn-base
new file mode 100644
index 0000000..254272e
--- /dev/null
+++ b/.svn/pristine/e9/e9856d0dd103d59a7ca563d919d983470d81e004.svn-base
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
diff --git a/.svn/pristine/eb/eb2d8b5f7c7c38e5af1c91bd8cfde995df5ea1c4.svn-base b/.svn/pristine/eb/eb2d8b5f7c7c38e5af1c91bd8cfde995df5ea1c4.svn-base
new file mode 100644
index 0000000..bf774a3
--- /dev/null
+++ b/.svn/pristine/eb/eb2d8b5f7c7c38e5af1c91bd8cfde995df5ea1c4.svn-base
@@ -0,0 +1,68 @@
+package com.ifish.jpush.common.connection;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.ifish.jpush.common.resp.APIConnectionException;
+import com.ifish.jpush.common.resp.APIRequestException;
+import com.ifish.jpush.common.resp.ResponseWrapper;
+
+public interface IHttpClient {
+
+ public static final String CHARSET = "UTF-8";
+ public static final String CONTENT_TYPE_JSON = "application/json";
+ public static final String CONTENT_TYPE_FORM = "application/x-www-form-urlencoded";
+
+ public static final String RATE_LIMIT_QUOTA = "X-Rate-Limit-Limit";
+ public static final String RATE_LIMIT_Remaining = "X-Rate-Limit-Remaining";
+ public static final String RATE_LIMIT_Reset = "X-Rate-Limit-Reset";
+ public static final String JPUSH_USER_AGENT = "JPush-API-Java-Client";
+
+ public static final int RESPONSE_OK = 200;
+
+ public enum RequestMethod {
+ GET,
+ POST,
+ PUT,
+ DELETE
+ }
+
+ public static final String IO_ERROR_MESSAGE = "Connection IO error. \n"
+ + "Can not connect to JPush Server. "
+ + "Please ensure your internet connection is ok. \n"
+ + "If the problem persists, please let us know at support@jpush.cn.";
+
+ public static final String CONNECT_TIMED_OUT_MESSAGE = "connect timed out. \n"
+ + "Connect to JPush Server timed out, and already retried some times. \n"
+ + "Please ensure your internet connection is ok. \n"
+ + "If the problem persists, please let us know at support@jpush.cn.";
+
+ public static final String READ_TIMED_OUT_MESSAGE = "Read timed out. \n"
+ + "Read response from JPush Server timed out. \n"
+ + "If this is a Push action, you may not want to retry. \n"
+ + "It may be due to slowly response from JPush server, or unstable connection. \n"
+ + "If the problem persists, please let us know at support@jpush.cn.";
+
+ public static Gson _gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+
+
+ //设置连接超时时间
+ public static final int DEFAULT_CONNECTION_TIMEOUT = (5 * 1000); // milliseconds
+
+ //设置读取超时时间
+ public static final int DEFAULT_READ_TIMEOUT = (30 * 1000); // milliseconds
+
+ public static final int DEFAULT_MAX_RETRY_TIMES = 3;
+
+ public ResponseWrapper sendGet(String url)
+ throws APIConnectionException, APIRequestException;
+
+ public ResponseWrapper sendDelete(String url)
+ throws APIConnectionException, APIRequestException;
+
+ public ResponseWrapper sendPost(String url, String content)
+ throws APIConnectionException, APIRequestException;
+
+
+ public ResponseWrapper sendPut(String url, String content)
+ throws APIConnectionException, APIRequestException;
+}
diff --git a/.svn/pristine/eb/ebd11658aae083ea7c3c68857896b9e838bad001.svn-base b/.svn/pristine/eb/ebd11658aae083ea7c3c68857896b9e838bad001.svn-base
new file mode 100644
index 0000000..f37558d
--- /dev/null
+++ b/.svn/pristine/eb/ebd11658aae083ea7c3c68857896b9e838bad001.svn-base
@@ -0,0 +1,11 @@
+package com.ifish.jpush.common;
+
+public enum Week {
+ MON,
+ TUE,
+ WED,
+ THU,
+ FRI,
+ SAT,
+ SUN
+}
diff --git a/.svn/pristine/f5/f55db755b6f0fc57bbf923919fbe41367430df63.svn-base b/.svn/pristine/f5/f55db755b6f0fc57bbf923919fbe41367430df63.svn-base
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.svn/pristine/f5/f55db755b6f0fc57bbf923919fbe41367430df63.svn-base
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/=UTF-8
diff --git a/.svn/pristine/f6/f6664b7f5095c93ef8f31f9c4f185b70bb777223.svn-base b/.svn/pristine/f6/f6664b7f5095c93ef8f31f9c4f185b70bb777223.svn-base
new file mode 100644
index 0000000..f20d58c
--- /dev/null
+++ b/.svn/pristine/f6/f6664b7f5095c93ef8f31f9c4f185b70bb777223.svn-base
@@ -0,0 +1,32 @@
+c3p0.driverClassName=com.mysql.jdbc.Driver
+c3p0.url=jdbc\:mysql\://localhost\:3306/myfishdb?characterEncoding\=UTF-8
+c3p0.username=ifish
+c3p0.password=ifish7pwd
+#c3p0.username=root
+#c3p0.password=123456
+
+c3p0.autoCommitOnClose=true
+c3p0.initialPoolSize=50
+c3p0.minPoolSize=50
+c3p0.maxPoolSize=100
+c3p0.acquireIncrement=3
+
+c3p0.checkoutTimeout=5000
+c3p0.maxIdleTime=7200
+c3p0.idleConnectionTestPeriod=18000
+#c3p0.maxIdleTimeExcessConnections=1800
+
+#c3p0.automaticTestTable=C3P0TestTable
+#c3p0.testConnectionOnCheckout=false
+#c3p0.testConnectionOnCheckin=false
+
+#org.hibernate.dialect.MySQLInnoDBDialect
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
+hibernate.show_sql=false
+hibernate.format_sql=true
+hibernate.hbm2ddl.auto=false
+hibernate.jdbc.batch_size=50
+hibernate.query.substitutions=true 1,false 0
+hibernate.cache.use_second_level_cache=false
+hibernate.cache.use_query_cache=false
+hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory
\ No newline at end of file
diff --git a/.svn/pristine/f7/f7fedbddb795244d60e0d1e4b6582118f3717188.svn-base b/.svn/pristine/f7/f7fedbddb795244d60e0d1e4b6582118f3717188.svn-base
new file mode 100644
index 0000000..57416c9
--- /dev/null
+++ b/.svn/pristine/f7/f7fedbddb795244d60e0d1e4b6582118f3717188.svn-base
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+