From 9f2747d395a6f76ad1678563491fdc6612f8d324 Mon Sep 17 00:00:00 2001 From: khalil Date: Wed, 17 Apr 2024 18:11:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80-=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E8=AE=BA=E5=9D=9B-=E5=B0=8F=E7=A7=98=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- accompany-base/accompany-common/pom.xml | 8 + .../core/enumeration/I18nAlertEnum.java | 20 +- .../business/vo/message/CommunityMessage.java | 2 +- .../business/vo/message/MessageLayout.java | 37 +-- .../business/vo/message/WorldMessage.java | 268 ------------------ .../community/CommunityMessageService.java | 109 +++++-- 6 files changed, 138 insertions(+), 306 deletions(-) delete mode 100644 accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/WorldMessage.java diff --git a/accompany-base/accompany-common/pom.xml b/accompany-base/accompany-common/pom.xml index e9cf4cd31..f0a67ccfa 100644 --- a/accompany-base/accompany-common/pom.xml +++ b/accompany-base/accompany-common/pom.xml @@ -12,4 +12,12 @@ accompany-common jar + + + org.apache.tomcat.embed + tomcat-embed-core + compile + + + \ No newline at end of file diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/I18nAlertEnum.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/I18nAlertEnum.java index c2be083da..0d22db056 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/I18nAlertEnum.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/I18nAlertEnum.java @@ -22,9 +22,7 @@ public enum I18nAlertEnum { //红包 RED_ENVELOPE_AUTO_RESPOND("感謝%s的大紅包"), - RED_ENVELOPE_TIME_OUT_BACK("您的紅包'%s'已返還%s鑽石"), - RED_ENVELOPE_SEND_SERVER("%s發出一個全服紅包"), //VIP @@ -57,6 +55,24 @@ public enum I18nAlertEnum { MINI_GAME_DENY_MSG("%s拒絕了你的邀請"), + + //社区论坛 + COMMUNITY_LIKE("%s 贊了你的動態!"), + COMMUNITY_SHARE("%s 分享了你的動態!"), + COMMUNITY_COMMENT("%s 評論了你的動態"), + COMMUNITY_COMMENT_REPLY("%s 回復了你的評論"), + COMMUNITY_COMMENT_REPLY_COMPLETE("%s 回復了 %s 的評論"), + + //社区论坛小秘书定制通知 + COMMUNITY_SECRET_APPROVE_TITLE("動態審核通知"), + COMMUNITY_SECRET_APPROVE_CONTENT_FIRST_SPAN("你在%s話題發布的動態："), + COMMUNITY_SECRET_APPROVE_CONTENT_WITHOUT_WORLD_FIRST_SPAN("你發布的動態："), + COMMUNITY_SECRET_APPROVE_PASS_CONTENT_SECOND_SPAN("審核通過，已發布"), + COMMUNITY_SECRET_APPROVE_NOT_PASS_CONTENT_SECOND_SPAN("因：%s，審核不通過，該動態已刪除。"), + COMMUNITY_SECRET_DELETE_TITLE("違禁刪除"), + COMMUNITY_SECRET_DELETE_DYNAMIC_CONTENT("你於 %s 發布的動態“%s”，由於 %s 被刪除，予以警告。如有疑問，請聯繫在線客服。"), + COMMUNITY_SECRET_DELETE_DYNAMIC_WITHOUT_CONTENT("你於 %s 發布的動態，由於 %s 被刪除，予以警告。如有疑問，請聯繫在線客服。"), + COMMUNITY_SECRET_DELETE_COMMENT_CONTENT("你於 %s 發布的動態，由於 %s 被刪除，予以警告。如有疑問，請聯繫在線客服。"), ; private final String defaultStr; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/CommunityMessage.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/CommunityMessage.java index 8d74612fa..0e11a33fd 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/CommunityMessage.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/CommunityMessage.java @@ -80,7 +80,7 @@ public class CommunityMessage { public static final MessageLayout APPROVE_PASS_WITHOUT_CONTENT_WORLD = new MessageLayout(). titleContent("動態審核通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("你發布的動態，").contentsFontColor("#999999").contentsFontSize(24 / 2) + .contentsNextContent("你發布的動態：").contentsFontColor("#999999").contentsFontSize(24 / 2) .contengBr() .contentsNextContent("審核通過，已發布").contentsFontColor("#67CD44").contentsFontSize(24 / 2); diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/MessageLayout.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/MessageLayout.java index 29918f864..b223894f8 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/MessageLayout.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/MessageLayout.java @@ -1,6 +1,10 @@ package com.accompany.business.vo.message; +import org.springframework.beans.BeanUtils; +import org.springframework.util.CollectionUtils; + import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class MessageLayout { @@ -22,7 +26,13 @@ public class MessageLayout { } - + public MessageLayout clone(){ + MessageLayout clone = new MessageLayout(); + BeanUtils.copyProperties(this, clone); + return clone; + } + + public MessageLayout titleContent(String titleContent) { title.setContent(titleContent); return this; @@ -59,14 +69,7 @@ public class MessageLayout { time.setFontColor(fontColor); return this; } - - public MessageLayout timeFontBold(boolean fontBold) { - time.setFontBold(fontBold); - return this; - } - - - + public MessageLayout contengBr() { Content content = new Content(); content.setFontSize(null); @@ -77,7 +80,13 @@ public class MessageLayout { return this; } - + + public MessageLayout contentsContent(String contentsContent, int index) { + Content content = CollectionUtils.isEmpty(contents)? lastConetnt(): contents.get(index); + content.setContent(contentsContent); + return this; + } + public MessageLayout contentsContent(String contentsContent) { Content content = lastConetnt(); content.setContent(contentsContent); @@ -149,12 +158,4 @@ public class MessageLayout { return content; } - - - - - - - - } diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/WorldMessage.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/WorldMessage.java deleted file mode 100644 index 8d8f91a01..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/WorldMessage.java +++ /dev/null @@ -1,268 +0,0 @@ -package com.accompany.business.vo.message; - -public class WorldMessage { - - /** - * 退出话题通知创建人 {时间} {用户昵称} - */ - public static final MessageLayout EXIT_WORLD_NOTIFY_OWNER = new MessageLayout(). - titleContent("退出话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("用户名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("已退出话题：").contentsFontColor("#FF6565").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2); - - /** - * 退出话题通知用户 {时间} {用户昵称} {话题名称} - */ - public static final MessageLayout EXIT_WORLD_NOTIFY_USER = new MessageLayout(). - titleContent("退出话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("用户名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("您已退出话题：").contentsFontColor("#FF6565").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2); - - /** - * 踢出话题通知创建人 {时间} {用户昵称} {创建人昵称} - */ - public static final MessageLayout CLICK_OUT_WORLD_NOTIFY_OWNER = new MessageLayout(). - titleContent("移出话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("用户名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("已被移出话题").contentsFontColor("#FF6565").contentsFontSize(28 / 2) - .contengBr() - .contentsNextContent("操作者：").contentsFontColor("#67CD44").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#67CD44").contentsFontSize(28 / 2); - - /** - * 踢出话题通知用户 {时间} {用户昵称} {话题昵称} {创建人昵称} - */ - public static final MessageLayout CLICK_OUT_WORLD_NOTIFY_USER = new MessageLayout(). - titleContent("移出话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("用户名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("您已被移出话题：").contentsFontColor("#FF6565").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("操作者：").contentsFontColor("#67CD44").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#67CD44").contentsFontSize(28 / 2); - /** - * 管理后台踢出话题通知创建人 {时间} {用户昵称} {创建人昵称} - */ - public static final MessageLayout ADMIN_CLICK_OUT_WORLD_NOTIFY_OWNER = new MessageLayout(). - titleContent("移出话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("用户名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("已被移出话题").contentsFontColor("#FF6565").contentsFontSize(28 / 2); - - /** - * 管理后台踢出话题通知用户 {时间} {用户昵称} {话题昵称} {创建人昵称} - */ - public static final MessageLayout ADMIN_CLICK_OUT_WORLD_NOTIFY_USER = new MessageLayout(). - titleContent("移出话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("用户名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("您已被移出话题：").contentsFontColor("#FF6565").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2); - - /** - * 自动移出话题通知用户 {时间} {话题昵称} - */ - public static final MessageLayout AUTO_CLEAN_USER_NOTIFY_USER = new MessageLayout(). - titleContent("移出话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("小可爱~因潜水太久，你已与").contentsFontColor("#333333").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#FF6565").contentsFontSize(28 / 2) - .contentsNextContent("话题失去联系，需要点击重连吗？").contentsFontColor("#333333").contentsFontSize(28 / 2); - - /** - * 退出话题群聊通知创建人 {时间} {用户昵称} {话题名称} {群聊名称} - */ - public static final MessageLayout EXIT_GROUP_CHAT_NOTIFY_OWNER = new MessageLayout(). - titleContent("退出群聊通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("用户名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("已退出").contentsFontColor("#333333").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#FF6565").contentsFontSize(28 / 2) - .contentsNextContent("话题群聊").contentsFontColor("#333333").contentsFontSize(28 / 2) - .contentsNextContent("“%s”").contentsFontColor("#FF6565").contentsFontSize(28 / 2); - - /** - * 退出话题群聊通知创建人 {时间} {用户昵称} {话题名称} {群聊名称} - */ - public static final MessageLayout AUTO_CLEAR_FROM_GROUP_CHAT_NOTIFY_OWNER = new MessageLayout(). - titleContent("退出群聊通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("小可爱~因潜水太久，你已与").contentsFontColor("#333333").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#FF6565").contentsFontSize(28 / 2) - .contentsNextContent("话题群聊").contentsFontColor("#333333").contentsFontSize(28 / 2) - .contentsNextContent("“%s”").contentsFontColor("#FF6565").contentsFontSize(28 / 2) - .contentsNextContent("失去联系，需要点击重连吗？").contentsFontColor("#333333").contentsFontSize(28 / 2); - - /** - * 解散话题通知 创建人 - */ - public static final MessageLayout WORLD_DISS_NOTIFY_OWNER = new MessageLayout(). - titleContent("话题解散通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("话题解散申请已经通过。所有话题成员将被移出话题且退出群聊") - .contentsFontColor("#67CD44").contentsFontSize(28 / 2); - - /** - * 话题解散通知 成员 {时间} {创建人昵称} {话题名称} - */ - public static final MessageLayout WORLD_DISS_NOTIFY_MEMBER = new MessageLayout(). - titleContent("话题解散通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("话题名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("话题已解散").contentsFontColor("#67CD44").contentsFontSize(28 / 2); - - /** - * 话题自动解散通知 成员 {时间} {创建人昵称} {话题名称} - */ - public static final MessageLayout WORLD_AUTO_DISS_NOTIFY = new MessageLayout(). - titleContent("话题解散通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("您所创建的话题：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("由于成员数过低，已被解散") - .contentsFontColor("#67CD44").contentsFontSize(28 / 2); - - /** - * 话题自动解散预警 成员 {时间} {创建人昵称} {话题名称} - */ - public static final MessageLayout WORLD_DISS_ALARM = new MessageLayout(). - titleContent("话题解散通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("您所创建的话题：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("由于成员数过低，3天后将被解散") - .contentsFontColor("#67CD44").contentsFontSize(28 / 2); - - /** - * 话题自动解散通知 成员 {时间} {创建人昵称} {话题名称} - */ - public static final MessageLayout WORLD_ADMIN_DISS_NOTIFY = new MessageLayout(). - titleContent("话题解散通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("话题名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("话题已解散") - .contentsFontColor("#67CD44").contentsFontSize(28 / 2); - - /** - * 加入话题通知 用户 {时间} {话题名称} {验证信息} {话题创建人} - */ - public static final MessageLayout JOIN_WORLD_SUCCESS = new MessageLayout(). - titleContent("加入话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("你已成功加入话题").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("话题名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2); - - /** - * 加入话题通知创建人 {时间} {用户昵称} - */ - public static final MessageLayout JOIN_WORLD_SUCCESS_FOR_OWNER = new MessageLayout(). - titleContent("加入话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("%s已成功加入话题").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("话题名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2);; - - - /** - * 拒绝加入话题通知 用户 {时间} {话题名称} - */ - public static final MessageLayout JOIN_WORLD_FAILD = new MessageLayout(). - titleContent("加入话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("你的申请被拒绝").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("话题名称：").contentsFontColor("#999999").contentsFontSize(24 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(24 / 2) - .contengBr() - .contentsNextContent("操作者：").contentsFontColor("#67CD44").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#67CD44").contentsFontSize(28 / 2); - - /** - * 创建话题 通知创建人 {时间} - */ - public static final MessageLayout CREATE_WORLD = new MessageLayout(). - titleContent("创建话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("话题创建成功。点击前往查看>>").contentsFontColor("#999999").contentsFontSize(28 / 2); - - /** - * 加入话题申请 通知创建人 {时间} {申请人昵称} {世界名} - */ - public static final MessageLayout APPLY_JOIN_WORLD_TO_OWNER = new MessageLayout(). - titleContent("加入话题申请").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("用户名称: ").contentsFontColor("#999999").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(28 / 2) - .contengBr() - .contentsNextContent("申请加入话题").contentsFontColor("#67CD44").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(28 / 2); - - /** - * 设为创建人通知 {时间} {话题名称} - */ - public static final MessageLayout SET_OWNER = new MessageLayout(). - titleContent("话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("你已被设置为创建人").contentsFontColor("#67CD44").contentsFontSize(28 / 2) - .contengBr() - .contentsNextContent("话题名称: ").contentsFontColor("#999999").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(28 / 2); - - - /** - * 取消创建人通知 {时间} {话题名称} - */ - public static final MessageLayout CANCEL_OWNER = new MessageLayout(). - titleContent("话题通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("你已被取消世界创建人").contentsFontColor("#FF6565").contentsFontSize(28 / 2) - .contengBr() - .contentsNextContent("话题名称: ").contentsFontColor("#999999").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(28 / 2); - - /** - * 申请过期提醒 通知用户 {时间} {} {验证信息} {成员被踢信息} - */ - public static final MessageLayout WORLD_APPLY_EXPIRED_NOTIFY = new MessageLayout(). - titleContent("申请过期提醒").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true) - .timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999") - .contentsNextContent("你的申请未处理，已经过期").contentsFontColor("#999999").contentsFontSize(28 / 2) - .contengBr() - .contentsNextContent("申请时间：").contentsFontColor("#999999").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(28 / 2) - .contengBr() - .contentsNextContent("话题名称：").contentsFontColor("#999999").contentsFontSize(28 / 2) - .contentsNextContent("%s").contentsFontColor("#333333").contentsFontSize(28 / 2) - .contengBr() - .contentsNextContent("请重新申请加入话题").contentsFontColor("#999999").contentsFontSize(28 / 2); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/CommunityMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/CommunityMessageService.java index ea499745b..4bbdfeef2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/CommunityMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/CommunityMessageService.java @@ -12,10 +12,14 @@ import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; import com.accompany.common.constant.MessageConstant; +import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.community.entity.Dynamic; +import com.accompany.core.enumeration.I18nAlertEnum; +import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.service.base.BaseService; +import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.core.util.StringUtils; import com.accompany.sharding.model.DynamicComment; import com.accompany.world.entity.World; @@ -50,6 +54,11 @@ public class CommunityMessageService extends BaseService { * @param reason */ public void sendDeleteDynamicMessage(Dynamic record, String reason) { + Users u = usersService.getUsersByUid(record.getUid()); + if (null == u){ + throw new ServiceException(BusiStatus.USERNOTEXISTS); + } + String formatTime = DateTimeUtil.convertDate(new Date(), DateTimeUtil.DEFAULT_DATE_MINUTE_PATTERN); String publishTime = DateTimeUtil.convertDate(record.getCreateTime(), DateTimeUtil.DEFAULT_DATE_MINUTE_PATTERN); @@ -58,13 +67,19 @@ public class CommunityMessageService extends BaseService { if(content.length() > 10) { content = content.substring(0, 10) + "......"; } + MessageLayout layout = CommunityMessage.DELETE_DYNAMIC.clone() + .titleContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_DELETE_TITLE, null, u.getPartitionId())) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_DELETE_DYNAMIC_CONTENT, null, u.getPartitionId())); Object[] args = {formatTime, publishTime, content, reason}; this.sendSysMessage(MessageConstant.WORLD, MessageConstant.WORLD_NOMAL, - CommunityMessage.DELETE_DYNAMIC, args, record.getUid(), null, null); + layout, args, record.getUid(), null, null); } else { + MessageLayout layout = CommunityMessage.DELETE_DYNAMIC_WITHOUT_CONTENT.clone() + .titleContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_DELETE_TITLE, null, u.getPartitionId())) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_DELETE_DYNAMIC_WITHOUT_CONTENT, null, u.getPartitionId())); Object[] args = {formatTime, publishTime, reason}; this.sendSysMessage(Constant.DefineProtocol.CUSTOM_DYNAMIC, Constant.DefineProtocol.CUSTOM_DYNAMIC_BAN_DELETE, - CommunityMessage.DELETE_DYNAMIC_WITHOUT_CONTENT, args, record.getUid(), null, null); + layout, args, record.getUid(), null, null); } } @@ -74,6 +89,11 @@ public class CommunityMessageService extends BaseService { * @param record */ public void sendDeleteCommentMessage(DynamicComment record) { + Users u = usersService.getUsersByUid(record.getFromUid()); + if (null == u){ + throw new ServiceException(BusiStatus.USERNOTEXISTS); + } + String formatTime = DateTimeUtil.convertDate(new Date(), DateTimeUtil.DEFAULT_DATE_MINUTE_PATTERN); String publishTime = DateTimeUtil.convertDate(record.getCreateTime(), DateTimeUtil.DEFAULT_DATE_MINUTE_PATTERN); @@ -81,9 +101,12 @@ public class CommunityMessageService extends BaseService { if(content.length() > 10) { content = content.substring(0, 10) + "......"; } + MessageLayout layout = CommunityMessage.DELETE_COMMENT.clone() + .titleContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_DELETE_TITLE, null, u.getPartitionId())) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_DELETE_COMMENT_CONTENT, null, u.getPartitionId())); Object[] args = {formatTime, publishTime, content, record.getVerifyReason()}; this.sendSysMessage(Constant.DefineProtocol.CUSTOM_DYNAMIC, Constant.DefineProtocol.CUSTOM_DYNAMIC_BAN_DELETE, - CommunityMessage.DELETE_COMMENT, args, record.getFromUid(), null, null); + layout, args, record.getFromUid(), null, null); } @@ -93,6 +116,11 @@ public class CommunityMessageService extends BaseService { * @param world */ public void sendApprovePassMessage(Dynamic record, World world) { + Users u = usersService.getUsersByUid(record.getUid()); + if (null == u){ + throw new ServiceException(BusiStatus.USERNOTEXISTS); + } + String formatTime = DateTimeUtil.convertDate(new Date(), DateTimeUtil.DEFAULT_DATE_MINUTE_PATTERN); Map params = Maps.newHashMap(); params.put("dynamicId", record.getId()); @@ -103,13 +131,21 @@ public class CommunityMessageService extends BaseService { if(content.length() > 10) { content = content.substring(0, 10) + "......"; } + MessageLayout layout = CommunityMessage.APPROVE_PASS.clone() + .titleContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_TITLE, null, u.getPartitionId())) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_CONTENT_FIRST_SPAN, null, u.getPartitionId()), 0) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_PASS_CONTENT_SECOND_SPAN, null, u.getPartitionId()), 4); Object[] args = {formatTime, world.getName(), content}; this.sendSysMessage(Constant.DefineProtocol.CUSTOM_DYNAMIC, Constant.DefineProtocol.CUSTOM_DYNAMIC_APPROVE, - CommunityMessage.APPROVE_PASS, args, record.getUid(), null, params); + layout, args, record.getUid(), null, params); } else { + MessageLayout layout = CommunityMessage.APPROVE_PASS_WITHOUT_CONTENT.clone() + .titleContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_TITLE, null, u.getPartitionId())) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_CONTENT_FIRST_SPAN, null, u.getPartitionId()), 0) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_PASS_CONTENT_SECOND_SPAN, null, u.getPartitionId()), 2); Object[] args = {formatTime, world.getName()}; this.sendSysMessage(Constant.DefineProtocol.CUSTOM_DYNAMIC, Constant.DefineProtocol.CUSTOM_DYNAMIC_APPROVE, - CommunityMessage.APPROVE_PASS_WITHOUT_CONTENT, args, record.getUid(), null, params); + layout, args, record.getUid(), null, params); } } @@ -118,6 +154,11 @@ public class CommunityMessageService extends BaseService { * @param record */ public void sendApprovePassMessage(Dynamic record) { + Users u = usersService.getUsersByUid(record.getUid()); + if (null == u){ + throw new ServiceException(BusiStatus.USERNOTEXISTS); + } + String formatTime = DateTimeUtil.convertDate(new Date(), DateTimeUtil.DEFAULT_DATE_MINUTE_PATTERN); Map params = Maps.newHashMap(); params.put("dynamicId", record.getId()); @@ -126,13 +167,20 @@ public class CommunityMessageService extends BaseService { if (content.length() > 10) { content = content.substring(0, 10) + "......"; } - Object[] args = {formatTime, content}; + MessageLayout layout = CommunityMessage.APPROVE_PASS_WITHOUT_WORLD.clone() + .titleContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_TITLE, null, u.getPartitionId())) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_CONTENT_WITHOUT_WORLD_FIRST_SPAN, null, u.getPartitionId()), 0) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_PASS_CONTENT_SECOND_SPAN, null, u.getPartitionId()), 4); this.sendSysMessage(Constant.DefineProtocol.CUSTOM_DYNAMIC, Constant.DefineProtocol.CUSTOM_DYNAMIC_APPROVE, - CommunityMessage.APPROVE_PASS_WITHOUT_WORLD, args, record.getUid(), null, params); + layout, new Object[]{formatTime, content}, record.getUid(), null, params); } else { + MessageLayout layout = CommunityMessage.APPROVE_PASS_WITHOUT_CONTENT_WORLD.clone() + .titleContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_TITLE, null, u.getPartitionId())) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_CONTENT_WITHOUT_WORLD_FIRST_SPAN, null, u.getPartitionId()), 0) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_PASS_CONTENT_SECOND_SPAN, null, u.getPartitionId()), 2); Object[] args = {formatTime}; this.sendSysMessage(Constant.DefineProtocol.CUSTOM_DYNAMIC, Constant.DefineProtocol.CUSTOM_DYNAMIC_APPROVE, - CommunityMessage.APPROVE_PASS_WITHOUT_CONTENT_WORLD, args, record.getUid(), null, params); + layout, args, record.getUid(), null, params); } } @@ -143,6 +191,11 @@ public class CommunityMessageService extends BaseService { * @param reason */ public void sendApproveFailMessage(Dynamic record, World world, String reason) { + Users u = usersService.getUsersByUid(record.getUid()); + if (null == u){ + throw new ServiceException(BusiStatus.USERNOTEXISTS); + } + String formatTime = DateTimeUtil.convertDate(new Date(), DateTimeUtil.DEFAULT_DATE_MINUTE_PATTERN); Map params = Maps.newHashMap(); params.put("dynamicId", record.getId()); @@ -153,13 +206,21 @@ public class CommunityMessageService extends BaseService { if(content.length() > 10) { content = content.substring(0, 10) + "......"; } + MessageLayout layout = CommunityMessage.APPROVE_NOT_PASS.clone() + .titleContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_TITLE, null, u.getPartitionId())) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_CONTENT_FIRST_SPAN, null, u.getPartitionId()), 0) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_NOT_PASS_CONTENT_SECOND_SPAN, null, u.getPartitionId()), 4); Object[] args = {formatTime, world.getName(), content, reason}; this.sendSysMessage(Constant.DefineProtocol.CUSTOM_DYNAMIC, Constant.DefineProtocol.CUSTOM_DYNAMIC_APPROVE, - CommunityMessage.APPROVE_NOT_PASS, args, record.getUid(), null, params); + layout, args, record.getUid(), null, params); } else { + MessageLayout layout = CommunityMessage.APPROVE_NOT_PASS_WITHOUT_CONTENT.clone() + .titleContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_TITLE, null, u.getPartitionId())) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_CONTENT_FIRST_SPAN, null, u.getPartitionId()), 0) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_NOT_PASS_CONTENT_SECOND_SPAN, null, u.getPartitionId()), 2); Object[] args = {formatTime, world.getName(), reason}; this.sendSysMessage(Constant.DefineProtocol.CUSTOM_DYNAMIC, Constant.DefineProtocol.CUSTOM_DYNAMIC_APPROVE, - CommunityMessage.APPROVE_NOT_PASS_WITHOUT_CONTENT, args, record.getUid(), null, params); + layout, args, record.getUid(), null, params); } } @@ -169,6 +230,11 @@ public class CommunityMessageService extends BaseService { * @param reason */ public void sendApproveFailMessage(Dynamic record, String reason) { + Users u = usersService.getUsersByUid(record.getUid()); + if (null == u){ + throw new ServiceException(BusiStatus.USERNOTEXISTS); + } + String formatTime = DateTimeUtil.convertDate(new Date(), DateTimeUtil.DEFAULT_DATE_MINUTE_PATTERN); Map params = Maps.newHashMap(); params.put("dynamicId", record.getId()); @@ -178,13 +244,21 @@ public class CommunityMessageService extends BaseService { if(content.length() > 10) { content = content.substring(0, 10) + "......"; } + MessageLayout layout = CommunityMessage.APPROVE_NOT_PASS_WITHOUT_WORLD.clone() + .titleContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_TITLE, null, u.getPartitionId())) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_CONTENT_WITHOUT_WORLD_FIRST_SPAN, null, u.getPartitionId()), 0) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_NOT_PASS_CONTENT_SECOND_SPAN, null, u.getPartitionId()), 4); Object[] args = {formatTime, content, reason}; this.sendSysMessage(Constant.DefineProtocol.CUSTOM_DYNAMIC, Constant.DefineProtocol.CUSTOM_DYNAMIC_APPROVE, - CommunityMessage.APPROVE_NOT_PASS_WITHOUT_WORLD, args, record.getUid(), null, params); + layout, args, record.getUid(), null, params); } else { + MessageLayout layout = CommunityMessage.APPROVE_NOT_PASS_WITHOUT_CONTENT_WORLD.clone() + .titleContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_TITLE, null, u.getPartitionId())) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_CONTENT_WITHOUT_WORLD_FIRST_SPAN, null, u.getPartitionId()), 0) + .contentsContent(I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SECRET_APPROVE_NOT_PASS_CONTENT_SECOND_SPAN, null, u.getPartitionId()), 2); Object[] args = {formatTime, reason}; this.sendSysMessage(Constant.DefineProtocol.CUSTOM_DYNAMIC, Constant.DefineProtocol.CUSTOM_DYNAMIC_APPROVE, - CommunityMessage.APPROVE_NOT_PASS_WITHOUT_CONTENT_WORLD, args, record.getUid(), null, params); + layout, args, record.getUid(), null, params); } } @@ -197,7 +271,7 @@ public class CommunityMessageService extends BaseService { public void sendLikePushMessage(Long uid, Long receiverUid, Map countMap) { Users user = usersService.getUsersByUid(uid); Users receiver = usersService.getUsersByUid(receiverUid); - String message = user.getNick() + "赞了你的动态!" ; + String message = I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_LIKE, new Object[]{user.getNick()}, receiver.getPartitionId()); sendInteractiveMsg(user, receiver, message, countMap); } @@ -210,7 +284,7 @@ public class CommunityMessageService extends BaseService { public void sendSharePushMessage(Long uid, Long receiverUid, Map countMap) { Users user = usersService.getUsersByUid(uid); Users receiver = usersService.getUsersByUid(receiverUid); - String message = user.getNick() + "分享了你的动态!"; + String message = I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_SHARE, new Object[]{user.getNick()}, receiver.getPartitionId()); sendInteractiveMsg(user, receiver, message, countMap); } @@ -223,7 +297,7 @@ public class CommunityMessageService extends BaseService { public void sendCommentPushMessage(Long uid, Long receiverUid, Map countMap) { Users user = usersService.getUsersByUid(uid); Users receiver = usersService.getUsersByUid(receiverUid); - String message = user.getNick() + "评论了你的动态"; + String message = I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_COMMENT, new Object[]{user.getNick()}, receiver.getPartitionId()); sendInteractiveMsg(user, receiver, message, countMap); } @@ -236,7 +310,7 @@ public class CommunityMessageService extends BaseService { public void sendCommentReplyPushMessage(Long uid, Long receiverUid, Map countList) { Users user = usersService.getUsersByUid(uid); Users receiver = usersService.getUsersByUid(receiverUid); - String message = user.getNick() + "回复了你的评论"; + String message = I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_COMMENT_REPLY, new Object[]{user.getNick()}, receiver.getPartitionId()); sendInteractiveMsg(user, receiver, message, countList); } @@ -252,7 +326,8 @@ public class CommunityMessageService extends BaseService { Users user = usersService.getUsersByUid(uid); Users receiver = usersService.getUsersByUid(receiverUid); Users replier = usersService.getUsersByUid(repliedUid); - String message = user.getNick() + "回复了"+ replier.getNick() +"的评论"; + String message = I18NMessageSourceUtil.getMessage(I18nAlertEnum.COMMUNITY_COMMENT_REPLY_COMPLETE, + new Object[]{user.getNick(), replier.getNick()}, receiver.getPartitionId()); sendInteractiveMsg(user, receiver, message, countMap); }