From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
index 3c48baa..95b548a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
@@ -16,7 +16,7 @@
 import com.yeshi.fanli.entity.bus.user.UserCustomSettings;
 import com.yeshi.fanli.entity.bus.user.UserCustomSettings.UserSettingTypeEnum;
 import com.yeshi.fanli.entity.push.DeviceTokenHW;
-import com.yeshi.fanli.exception.PushException;
+import com.yeshi.fanli.exception.push.PushException;
 import com.yeshi.fanli.log.PushLogHelper;
 import com.yeshi.fanli.service.inter.config.AppVersionService;
 import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
@@ -105,6 +105,9 @@
 	}
 
 	private List<DeviceTokenHW> filterDeviceToken(List<DeviceTokenHW> hwDeviceList, int hour) {
+		// TODO 鏆傛椂涓嶅鐞嗘秷鎭厤鎵撴壈
+		if (1 > 0)
+			return hwDeviceList;
 		// 澶勭悊娑堟伅鍏嶆墦鎵�
 		if (hour >= 20 || hour < 8) {
 			Set<Long> uidSets = new HashSet<>();

--
Gitblit v1.8.0