From 04d08c16fc782fbfe13562fa0ff8a852e55e790b Mon Sep 17 00:00:00 2001 From: yeungchihang <842328916@qq.com> Date: Mon, 6 Feb 2023 11:19:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8-=E4=BC=81=E4=B8=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1-=E5=B0=86=E5=90=84=E6=B4=BB=E5=8A=A8=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E6=9C=BA=E5=99=A8=E4=BA=BA=E5=90=88=E5=B9=B6=E6=88=90?= =?UTF-8?q?=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accompany/common/config/WebSecurityConfig.java | 13 ++----------- .../gamemanage/GameQuotaNotifyListener.java | 4 ++-- .../LinearlyPoolPrizeWxNotifyListener.java | 2 +- .../business/service/LuckySeaPreWarningService.java | 4 ++-- .../activities/ActNewYearFireworkService.java | 6 +++--- .../callbattle/ActCallBattlePreWarningService.java | 4 ++-- .../linearlypool/LinearlyPrizePoolService.java | 2 +- .../seekelfin/SeekElfinPreWarningService.java | 4 ++-- .../accompany/scheduler/task/KryptonRankTask.java | 2 +- 9 files changed, 16 insertions(+), 25 deletions(-) diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/config/WebSecurityConfig.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/config/WebSecurityConfig.java index 200a01f5c..73ea54393 100644 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/config/WebSecurityConfig.java +++ b/accompany-base/accompany-common/src/main/java/com/accompany/common/config/WebSecurityConfig.java @@ -27,17 +27,8 @@ public class WebSecurityConfig { // 企业微信推送key private String enterpriseWechatPushKey; - // 赛事报名通知企业微信推送key - private String gameQuotaEnterpriseWechatPushKey; - // 召唤战斗活动企业微信机器人key - private String actCallBattleEnterpriseWechatPushKey; - // 寻找小精灵企业微信机器人key - private String seekElfinEnterpriseWechatPushKey; - // 线性奖池提醒企业微信机器人key - private String linearylyPoolEnterpriseWechatPushKey; - // 深海活动预警机器人key - private String luckySeaPreWarningRobotKey; - private String newYearFireworkEnterpriseWechatPushKey; + // 活动通知企业微信推送key + private String activityEnterpriseWechatPushKey; public void setJwtWebKey(String jwtWebKey) { WebSecurityConfig.jwtWebKey = jwtWebKey; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamemanage/GameQuotaNotifyListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamemanage/GameQuotaNotifyListener.java index 85cea5cbe..0e79be578 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamemanage/GameQuotaNotifyListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/gamemanage/GameQuotaNotifyListener.java @@ -121,7 +121,7 @@ public class GameQuotaNotifyListener implements ApplicationListener= 0.5d) { @@ -355,7 +355,7 @@ public class ActNewYearFireworkService implements InitializingBean, ApplicationL msg.add(MarkdownMessage.getHeaderText(3, "2023新年烟花活动产出每日产出预警")); msg.add(MarkdownMessage.getReferenceText(String.format(" %d %s 在第 %d 个池 抽出 %s 触发每日产出数量限制 %d 个的 百分之50， 目前已经产出 %s", users.getErbanNo(), users.getNick(), type, null != drawGift? drawGift.getGiftName(): cacheKey, dayLimit, todayOutputNumMap))); - enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getNewYearFireworkEnterpriseWechatPushKey(), msg); + enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getActivityEnterpriseWechatPushKey(), msg); }); } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java index 78e926d08..528b014af 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java @@ -133,7 +133,7 @@ public class ActCallBattlePreWarningService { msg.add(MarkdownMessage.getReferenceText("前"+ roundNum + "轮投入:" + stat.getGoldIn())); msg.add(MarkdownMessage.getReferenceText("前"+ roundNum + "轮产出:" + stat.getGoldOut())); msg.add(MarkdownMessage.getReferenceText("请判断是否需要前往后台查看")); - String key = webSecurityConfig.getActCallBattleEnterpriseWechatPushKey(); + String key = webSecurityConfig.getActivityEnterpriseWechatPushKey(); enterpriseWechatPushService.pushMessageByKey(key, msg); } @@ -219,7 +219,7 @@ public class ActCallBattlePreWarningService { Long stock = actCallBattleBizService.getStock(); String stockStr = new BigDecimal(stock).divide(new BigDecimal(ActCallBattleBizServiceImpl.HANDLE_STOCK_MULTIPLE), 2, RoundingMode.HALF_DOWN).toString(); msg.add(MarkdownMessage.getReferenceText("当前库存数:" + stockStr)); - String key = webSecurityConfig.getActCallBattleEnterpriseWechatPushKey(); + String key = webSecurityConfig.getActivityEnterpriseWechatPushKey(); enterpriseWechatPushService.pushMessageByKey(key, msg); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java index 3a5a26beb..872d58032 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java @@ -582,7 +582,7 @@ public class LinearlyPrizePoolService { msg.add(MarkdownMessage.getReferenceText(new StringBuilder("用户参与总数: ").append(statisticsRes.getTotalPrice()).toString())); msg.add(MarkdownMessage.getReferenceText(new StringBuilder("用户产出总价值: ").append(statisticsRes.getTotalPlatformValue()).toString())); msg.add(MarkdownMessage.getReferenceText(new StringBuilder("游戏进行次数 ").append(statisticsRes.getDrawCounts()).toString())); - enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getLinearylyPoolEnterpriseWechatPushKey(), msg); + enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getActivityEnterpriseWechatPushKey(), msg); } @Data diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinPreWarningService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinPreWarningService.java index 41cfb8c75..c6c02f8d8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinPreWarningService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinPreWarningService.java @@ -116,7 +116,7 @@ public class SeekElfinPreWarningService { msg.add(MarkdownMessage.getReferenceText("前"+ roundNum + "次投入:" + stat.getGoldIn())); msg.add(MarkdownMessage.getReferenceText("前"+ roundNum + "次产出:" + stat.getGoldOut())); msg.add(MarkdownMessage.getReferenceText("请判断是否需要前往后台查看")); - String key = webSecurityConfig.getSeekElfinEnterpriseWechatPushKey(); + String key = webSecurityConfig.getActivityEnterpriseWechatPushKey(); enterpriseWechatPushService.pushMessageByKey(key, msg); } @@ -202,7 +202,7 @@ public class SeekElfinPreWarningService { Long stock = seekElfinUtil.getStock(); String stockStr = new BigDecimal(stock).divide(new BigDecimal(SeekElfinUtil.HANDLE_STOCK_MULTIPLE), 2, RoundingMode.HALF_DOWN).toString(); msg.add(MarkdownMessage.getReferenceText("当前库存数:" + stockStr)); - String key = webSecurityConfig.getSeekElfinEnterpriseWechatPushKey(); + String key = webSecurityConfig.getActivityEnterpriseWechatPushKey(); enterpriseWechatPushService.pushMessageByKey(key, msg); } } diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/KryptonRankTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/KryptonRankTask.java index bca44003c..1361f7a83 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/KryptonRankTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/KryptonRankTask.java @@ -56,7 +56,7 @@ public class KryptonRankTask { msg.add(MarkdownMessage.getReferenceText(String.format("平台ID [%d]", u.getErbanNo()))); msg.add(MarkdownMessage.getReferenceText(String.format("昵称 [%s]", u.getNick()))); msg.add(MarkdownMessage.getReferenceText(String.format("当日累计送礼钻石价值 [%d]", score))); - enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getNewYearFireworkEnterpriseWechatPushKey(), msg); + enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getActivityEnterpriseWechatPushKey(), msg); } }