Merge pull request xingePush#25 from xingePush/19

caofangkun · web-flow · commit 88bba3fef46b · 2018-10-10T19:19:08.000+08:00
xingePush#19 https 域名访问偶发错误
diff --git a/src/main/java/com/tencent/xinge/bean/ios/Aps.java b/src/main/java/com/tencent/xinge/bean/ios/Aps.java
@@ -16,7 +16,7 @@ public class Aps {
   private int badge_type;
 
   @JsonProperty(value = "sound")
-  private Sound sound;
+  private String sound;
 
   @JsonProperty(value = "content-available")
   private int content_available;
@@ -85,11 +85,11 @@ public void setCategory(String category) {
     this.category = category;
   }
 
-  public Sound getSound() {
+  public String getSound() {
     return sound;
   }
 
-  public void setSound(Sound sound) {
+  public void setSound(String sound) {
     this.sound = sound;
   }
 
diff --git a/src/test/java/com/tencent/xinge/push/app/PushSingleAccountIOSTest.java b/src/test/java/com/tencent/xinge/push/app/PushSingleAccountIOSTest.java
@@ -39,7 +39,7 @@ public void testPushSingleAccountIOS() {
         pushAppRequest.setEnvironment(Environment.dev);
         pushAppRequest.setMessage_type(MessageType.notify);
         pushAppRequest.setMessage(message);
-        pushAppRequest.setSend_time("1111111");
+        pushAppRequest.setSend_time("2018-10-10 10:49:22");
         pushAppRequest.setStat_tag("test");
         pushAppRequest.setPush_id("0");
         pushAppRequest.setAccount_list(accountList);

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class Aps {`
`16`	`16`	`private int badge_type;`
`17`	`17`
`18`	`18`	`@JsonProperty(value = "sound")`
`19`		`- private Sound sound;`
	`19`	`+ private String sound;`
`20`	`20`
`21`	`21`	`@JsonProperty(value = "content-available")`
`22`	`22`	`private int content_available;`
`@@ -85,11 +85,11 @@ public void setCategory(String category) {`
`85`	`85`	`this.category = category;`
`86`	`86`	`}`
`87`	`87`
`88`		`- public Sound getSound() {`
	`88`	`+ public String getSound() {`
`89`	`89`	`return sound;`
`90`	`90`	`}`
`91`	`91`
`92`		`- public void setSound(Sound sound) {`
	`92`	`+ public void setSound(String sound) {`
`93`	`93`	`this.sound = sound;`
`94`	`94`	`}`
`95`	`95`