From f9f748d2b1181d999aa3050db09c27457c721247 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Fri, 31 Mar 2023 16:59:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E4=B8=9A=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kicc/commonbiz/controller/PushApplicationController.java | 4 +++- .../commonbiz/service/impl/PushApplicationServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java index b3f3b322..260e2022 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.exception.CheckedException; +import com.cloud.kicc.common.security.annotation.Inner; import com.cloud.kicc.common.security.util.SecurityUtils; import com.cloud.kicc.commonbiz.api.entity.PushApplication; import com.cloud.kicc.commonbiz.api.entity.PushChatMessage; @@ -95,7 +96,8 @@ public class PushApplicationController { } @PostMapping("/enterpriseSend") - @ApiOperation(value = "企业推送消息") + @ApiOperation("企业推送消息") + @Inner(false) public R enterpriseMessageSend(@Valid @RequestBody PushChatMessage pushChatMessage) { iPushApplicationService.enterpriseMessageSend(pushChatMessage); return R.ok(true); diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java index df255b52..571400d9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java @@ -71,7 +71,7 @@ public class PushApplicationServiceImpl extends ServiceImpl pushBlacklists = iPushBlacklistService.list(Wrappers.lambdaQuery().eq(PushBlacklist::getFanUserId, pushChatMessage.getUserId())); - pushBlacklists.forEach(item -> pushChatMessage.getAlias().replaceAll(item.getConcernUserId() + ",|$", "")); + pushBlacklists.forEach(item -> pushChatMessage.setAlias(pushChatMessage.getAlias().replaceAll(item.getConcernUserId() + ",|$", ""))); // 查询推送用户设置的推送类型,如果参数中没有指定则采用默认的推送类型