更新README

Author: Cheung0-bit

README.md

@@ -159,8 +159,10 @@ public void receiveByTopicGroup2(Email email) {
 
 url : http://{ip}:{port}
 
-![image-20240204151618885](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240204151618885.png)
+![image-20240409144014635](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240409144014635.png)
 
-![image-20240204151634562](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240204151634562.png)
+![image-20240409143548079](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240409143548079.png)
 
-![image-20240204151758345](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240204151758345.png)
+![image-20240409143623118](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240409143623118.png)
+
+![image-20240409143842534](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240409143842534.png)

README_CN.md

@@ -155,8 +155,10 @@ public void receiveByTopicGroup2(Email email) {
 
 url : http://{ip}:{port}
 
-![image-20240204151618885](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240204151618885.png)
+![image-20240409144014635](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240409144014635.png)
 
-![image-20240204151634562](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240204151634562.png)
+![image-20240409143548079](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240409143548079.png)
 
-![image-20240204151758345](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240204151758345.png)
+![image-20240409143623118](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240409143623118.png)
+
+![image-20240409143842534](https://0-bit.oss-cn-beijing.aliyuncs.com/image-20240409143842534.png)

resmq-dashboard/src/main/java/io/github/resmq/dashboard/service/impl/DeadMessageImpl.java

@@ -1,9 +1,6 @@
 package io.github.resmq.dashboard.service.impl;
 
 import io.github.resmq.core.constant.Constants;
-import io.github.resmq.dashboard.entity.CommonGroupMessage;
-import io.github.resmq.dashboard.entity.CommonMessage;
-import io.github.resmq.dashboard.entity.CommonMessageSummary;
 import io.github.resmq.dashboard.entity.DeadMessage;
 import io.github.resmq.dashboard.service.DeadMessageService;
 import io.github.resmq.dashboard.util.PaginationUtils;
@@ -46,7 +43,7 @@ public Map<String, Object> getDeadMessages(int start, int length, String topic)
             for (String key : keys) {
                 String[] split = key.substring(Constants.TOPIC_PREFIX.length()).split(":");
                 String originTopic = split[0];
-                String groupName = split[1];
+                String groupName = split[2];
                 List<MapRecord<String, Object, Object>> messages = stringRedisTemplate.opsForStream().range(key, Range.rightOpen("0-0", "+"));
                 if (messages != null) {
                     deadMessages.addAll(messages.stream().map(

resmq-dashboard/src/main/java/io/github/resmq/dashboard/service/impl/IndexParamServiceImpl.java

@@ -48,7 +48,7 @@ public Map<String, Integer> getCount(long now) {
             map.put("totalCount", 0);
             map.put("dlqCount", 0);
         } else {
-            int totalCount = 0, ackCount = 0, dlqCount = 0;
+            int totalCount = 0, dlqCount = 0;
             for (String countKey : countKeys) {
                 Integer totalCountValue = Optional.ofNullable(stringRedisTemplate.opsForHash().get(countKey, "total-count"))
                         .map(value -> Integer.parseInt(value.toString()))
@@ -103,8 +103,8 @@ public ReturnT<Map<String, Object>> chartInfo(Date startDate, Date endDate) {
         int successNum_total = 0;
         int failNum_total = 0;
 
-        long start = startDate.getTime() / (24 * 60 * 60 * 1000);
-        long end = endDate.getTime() / (24 * 60 * 60 * 1000);
+        long start = startDate.getTime() / (24 * 60 * 60 * 1000) + 1;
+        long end = endDate.getTime() / (24 * 60 * 60 * 1000) + 1;
 
         for (long i = start; i <= end; i++) {
             Map<String, Integer> map = this.getCount(i);

resmq-dashboard/src/main/resources/templates/message/message.index.ftl

@@ -8,7 +8,7 @@
     <link rel="stylesheet"
           href="${request.contextPath}/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
 </head>
-<body class="hold-transition skin-blue sidebar-mini <#if cookieMap?? && cookieMap["resmq_adminlte_settings"]?exists && "off" == cookieMap["resmq_adminlte_settings"].value >sidebar-collapse</#if>">
+<body class="hold-transition skin-blue sidebar-mini <#if cookieMap?? && cookieMap["resmq_adminlte_settings"]?? && "off" == cookieMap["resmq_adminlte_settings"].value >sidebar-collapse</#if>">
 <div class="wrapper">
     <!-- header -->
     <@netCommon.commonHeader />

resmq-spring-boot-test/src/main/resources/application.yml

@@ -36,6 +36,6 @@ res-mq:
   dead-message-delivery-count: 1
   dead-message-delivery-second: 1
   dead-message-scheduled-thread-pool-core-size: 2
-  dead-message-timer-initial-delay: 1
-  dead-message-timer-delay: 1
+  dead-message-timer-initial-delay: 20
+  dead-message-timer-delay: 20
   pending-messages-pull-count: 10