From 6d821cbdf527a4b3ee2e93f8d625ecade86ba45b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 12 十二月 2019 14:23:18 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
index 8729e48..984643d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
@@ -483,11 +483,13 @@
 
 		Calendar now = Calendar.getInstance();
 		int hour = now.get(Calendar.HOUR_OF_DAY);
-		if (hour >= 8 && hour < 20) {
-			ispush = true; // 鍙帹閫�
-		} else {
-			listNotPushId = validateNotDisturb();
-		}
+//		if (hour >= 8 && hour < 20) {
+//			ispush = true; // 鍙帹閫�
+//		} else {
+//			listNotPushId = validateNotDisturb();
+//		}
+		
+		ispush=true;//TODO 澶勭悊娑堟伅鍏嶆墦鎵�
 
 		for (DeviceTokenIOS ios : list) {
 

--
Gitblit v1.8.0