From d9c263dd99625c8b2b93971776571af6c0f42673 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Mon, 23 Oct 2023 13:02:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89mq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mq/core/stream/AbstractStreamMessageListener.java |  2 ++
 .../module/infra/api/logger/ApiAccessLogApiImpl.java  | 11 +++++++----
 .../module/infra/api/logger/ApiErrorLogApiImpl.java   | 11 +++++++----
 .../win/module/infra/api/trends/TrendsApiImpl.java    | 11 +++++++----
 .../controller/notify/NotifyMessageController.java    |  2 ++
 win-server/src/main/resources/application.yaml        |  2 +-
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java b/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java
index 52a6feb4..12a21104 100644
--- a/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java
+++ b/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java
@@ -63,6 +63,8 @@ public abstract class AbstractStreamMessageListener<T extends AbstractStreamMess
             this.onMessage(messageObj);
             // ack 消息消费完成
             redisMQTemplate.getRedisTemplate().opsForStream().acknowledge(group, message);
+            // 删除消费后的数据
+            // redisMQTemplate.getRedisTemplate().opsForStream().delete(message);
             // TODO 芋艿：需要额外考虑以下几个点：
             // 1. 处理异常的情况
             // 2. 发送日志；以及事务的结合
diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java
index 36367eb6..6b2b6eee 100644
--- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java
+++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java
@@ -1,9 +1,8 @@
 package com.win.module.infra.api.logger;
 
 import com.win.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO;
-import com.win.module.infra.convert.logger.ApiAccessLogConvert;
-import com.win.module.infra.mq.message.logger.ApiAccessLogMessage;
 import com.win.module.infra.mq.producer.logger.ApiAccessLogProducer;
+import com.win.module.infra.service.logger.ApiAccessLogService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -18,13 +17,17 @@ import javax.annotation.Resource;
 @Validated
 public class ApiAccessLogApiImpl implements ApiAccessLogApi {
 
+    @Resource
+    private ApiAccessLogService apiAccessLogService;
+
     @Resource
     private ApiAccessLogProducer apiAccessLogProducer;
 
     @Override
     public void createApiAccessLog(ApiAccessLogCreateReqDTO createDTO) {
-        ApiAccessLogMessage accessLogMessage = ApiAccessLogConvert.INSTANCE.convertMessage(createDTO);
-        apiAccessLogProducer.sendMessage(accessLogMessage);
+        apiAccessLogService.createApiAccessLog(createDTO);
+        // ApiAccessLogMessage accessLogMessage = ApiAccessLogConvert.INSTANCE.convertMessage(createDTO);
+        // apiAccessLogProducer.sendMessage(accessLogMessage);
     }
 
 }
diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java
index c3664cf1..3cf2423e 100644
--- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java
+++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java
@@ -1,9 +1,8 @@
 package com.win.module.infra.api.logger;
 
 import com.win.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO;
-import com.win.module.infra.convert.logger.ApiErrorLogConvert;
-import com.win.module.infra.mq.message.logger.ApiErrorLogMessage;
 import com.win.module.infra.mq.producer.logger.ApiErrorLogProducer;
+import com.win.module.infra.service.logger.ApiErrorLogService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -18,13 +17,17 @@ import javax.annotation.Resource;
 @Validated
 public class ApiErrorLogApiImpl implements ApiErrorLogApi {
 
+    @Resource
+    private ApiErrorLogService apiErrorLogService;
+
     @Resource
     private ApiErrorLogProducer apiErrorLogProducer;
 
     @Override
     public void createApiErrorLog(ApiErrorLogCreateReqDTO createDTO) {
-        ApiErrorLogMessage errorLogMessage = ApiErrorLogConvert.INSTANCE.convertMessage(createDTO);
-        apiErrorLogProducer.sendMessage(errorLogMessage);
+        apiErrorLogService.createApiErrorLog(createDTO);
+        // ApiErrorLogMessage errorLogMessage = ApiErrorLogConvert.INSTANCE.convertMessage(createDTO);
+        // apiErrorLogProducer.sendMessage(errorLogMessage);
     }
 
 }
diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java
index 1aeb4681..de172c06 100644
--- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java
+++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java
@@ -1,9 +1,8 @@
 package com.win.module.infra.api.trends;
 
 import com.win.module.infra.api.trends.dto.TrendsCreateReqDTO;
-import com.win.module.infra.convert.trends.TrendsConvert;
-import com.win.module.infra.mq.message.trends.TrendsMessage;
 import com.win.module.infra.mq.producer.trends.TrendsProducer;
+import com.win.module.infra.service.trends.TrendsService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -21,10 +20,14 @@ public class TrendsApiImpl implements TrendsApi {
     @Resource
     private TrendsProducer trendsProducer;
 
+    @Resource
+    private TrendsService trendsService;
+
     @Override
     public void createTrends(TrendsCreateReqDTO createDTO) {
-        TrendsMessage trendsMessage = TrendsConvert.INSTANCE.convertMessage(createDTO);
-        trendsProducer.sendMessage(trendsMessage);
+        trendsService.createTrends(createDTO);
+        // TrendsMessage trendsMessage = TrendsConvert.INSTANCE.convertMessage(createDTO);
+        // trendsProducer.sendMessage(trendsMessage);
     }
 
 }
diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/notify/NotifyMessageController.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/notify/NotifyMessageController.java
index 6fa557fd..e1a72749 100644
--- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/notify/NotifyMessageController.java
+++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/notify/NotifyMessageController.java
@@ -2,6 +2,7 @@ package com.win.module.system.controller.notify;
 
 import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.PageResult;
+import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.controller.notify.vo.message.NotifyMessageMyPageReqVO;
 import com.win.module.system.controller.notify.vo.message.NotifyMessagePageReqVO;
 import com.win.module.system.controller.notify.vo.message.NotifyMessageRespVO;
@@ -85,6 +86,7 @@ public class NotifyMessageController {
 
     @GetMapping("/get-unread-count")
     @Operation(summary = "获得当前用户的未读站内信数量")
+    @OperateLog(enable = false)
     public CommonResult<Long> getUnreadNotifyMessageCount() {
         return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId()));
     }
diff --git a/win-server/src/main/resources/application.yaml b/win-server/src/main/resources/application.yaml
index fb8fb185..d89f0b25 100644
--- a/win-server/src/main/resources/application.yaml
+++ b/win-server/src/main/resources/application.yaml
@@ -139,7 +139,7 @@ win:
       pubsub:
         enable: false # 是否开启 Redis pubsub 广播消费，默认为 true。这里设置成 false，可以按需开启
       stream:
-        enable: true  # 是否开启 Redis stream 集群消费，默认为 true。这里设置成 false，可以按需开启
+        enable: false  # 是否开启 Redis stream 集群消费，默认为 true。这里设置成 false，可以按需开启
   tenant: # 多租户相关配置项
     enable: true
     ignore-urls: