From 235921d820f29b04b1e82f6a6f0d4a1957a900ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 五月 2020 12:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java
index 91ad672..e5922e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java
@@ -18,7 +18,7 @@
import com.yeshi.fanli.entity.bus.msg.UserSystemMsgTypeEnum;
import com.yeshi.fanli.entity.push.PushInfo;
import com.yeshi.fanli.entity.push.PushInfo.PushTypeEnum;
-import com.yeshi.fanli.exception.PushException;
+import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.exception.push.PushInfoException;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
@@ -265,7 +265,7 @@
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void executePush(PushInfo record) throws Exception, PushInfoException, PushException {
if (PushInfo.STATE_SUCCESS == record.getState()) {
@@ -357,7 +357,7 @@
case 1: // 绔欏唴淇�
pushService.pushZNX(uid, title, content, listIOS, listAndroid);
userSystemMsgService.addUserSystemMsg(uid, UserSystemMsgTypeEnum.question, title, content,
- UserSystemMsg.TIME_TAG_EMERGENT, null);
+ UserSystemMsg.TIME_TAG_COMMON, null);
break;
case 2: // 缃戦〉鎺ㄩ��
pushService.pushUrl(uid, title, content, url, listIOS, listAndroid);
--
Gitblit v1.8.0