feat:2.4.0

1. 重试日志添加客户端信息

doc/sql/easy_retry_mysql.sql

@@ -119,6 +119,7 @@ CREATE TABLE `retry_task_log_message`
     `unique_id`  varchar(64) NOT NULL COMMENT '同组下id唯一',
     `create_dt`  datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `message`    text        NOT NULL COMMENT '异常信息',
+    `client_info` varchar(128) DEFAULT NULL COMMENT '客户端地址 clientId#ip:port',
     PRIMARY KEY (`id`),
     KEY          `idx_group_name_unique_id` (`group_name`, `unique_id`),
     KEY          `idx_create_dt` (`create_dt`)
@@ -267,7 +268,7 @@ CREATE TABLE `job_task` (
     `parent_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '父执行器id',
     `task_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '执行的状态 0、失败 1、成功',
     `retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '重试次数',
-    `client_info` varchar(255) DEFAULT NULL COMMENT '客户端地址 clientId#ip:port',
+    `client_info` varchar(128) DEFAULT NULL COMMENT '客户端地址 clientId#ip:port',
     `result_message` text NOT NULL COMMENT '执行结果',
     `args_str` text DEFAULT NULL COMMENT '执行方法参数',
     `args_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '参数类型 ',

easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/RetryTaskLogMessage.java

@@ -40,6 +40,11 @@ public class RetryTaskLogMessage implements Serializable {
      */
     private String uniqueId;
 
+    /**
+     * 客户端信息
+     */
+    private String clientInfo;
+
     /**
      * 创建时间
      */

easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/register/ClientRegister.java

@@ -101,8 +101,7 @@ public class ClientRegister extends AbstractRegister implements Runnable {
                 // 防止刷的过快
                 try {
                     TimeUnit.MILLISECONDS.sleep(1000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
+                } catch (InterruptedException ignored) {
                 }
             }
         }

easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/exec/ExecCallbackUnitActor.java

@@ -13,6 +13,7 @@ import com.aizuda.easy.retry.server.common.akka.ActorGenerator;
 import com.aizuda.easy.retry.server.common.client.RequestBuilder;
 import com.aizuda.easy.retry.server.common.dto.RegisterNodeInfo;
 import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
+import com.aizuda.easy.retry.server.common.util.ClientInfoUtils;
 import com.aizuda.easy.retry.server.retry.task.client.RetryRpcClient;
 import com.aizuda.easy.retry.server.common.IdempotentStrategy;
 import com.aizuda.easy.retry.server.retry.task.support.context.CallbackRetryContext;
@@ -70,6 +71,7 @@ public class ExecCallbackUnitActor extends AbstractActor {
             retryTaskLog.setUniqueId(retryTask.getUniqueId());
             retryTaskLog.setRetryStatus(retryTask.getRetryStatus());
             retryTaskLog.setTriggerTime(LocalDateTime.now());
+            retryTaskLog.setClientInfo(ClientInfoUtils.generate(serverNode));
 
             try {
 

easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/exec/ExecUnitActor.java

@@ -14,6 +14,7 @@ import com.aizuda.easy.retry.common.core.util.JsonUtil;
 import com.aizuda.easy.retry.server.common.akka.ActorGenerator;
 import com.aizuda.easy.retry.server.common.client.RequestBuilder;
 import com.aizuda.easy.retry.server.common.dto.RegisterNodeInfo;
+import com.aizuda.easy.retry.server.common.util.ClientInfoUtils;
 import com.aizuda.easy.retry.server.retry.task.client.RetryRpcClient;
 import com.aizuda.easy.retry.server.common.IdempotentStrategy;
 import com.aizuda.easy.retry.server.retry.task.support.context.MaxAttemptsPersistenceRetryContext;
@@ -62,6 +63,7 @@ public class ExecUnitActor extends AbstractActor {
             retryTaskLog.setUniqueId(retryTask.getUniqueId());
             retryTaskLog.setRetryStatus(retryTask.getRetryStatus());
             retryTaskLog.setTriggerTime(LocalDateTime.now());
+            retryTaskLog.setClientInfo(ClientInfoUtils.generate(serverNode));
 
             try {
 

easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/log/LogActor.java

@@ -67,6 +67,7 @@ public class LogActor extends AbstractActor {
         RetryTaskLogMessage retryTaskLogMessage = new RetryTaskLogMessage();
         retryTaskLogMessage.setUniqueId(retryTaskLogDTO.getUniqueId());
         retryTaskLogMessage.setGroupName(retryTaskLogDTO.getGroupName());
+        retryTaskLogMessage.setClientInfo(retryTaskLogDTO.getClientInfo());
         String errorMessage = retryTaskLogDTO.getMessage();
         retryTaskLogMessage.setMessage(
             StrUtil.isBlank(errorMessage) ? StrUtil.EMPTY : errorMessage);

easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/log/RetryTaskLogDTO.java

@@ -34,6 +34,14 @@ public class RetryTaskLogDTO {
      */
     private Integer retryStatus;
 
+    /**
+     * 触发时间
+     */
     private LocalDateTime triggerTime;
 
+    /**
+     * 客户端信息
+     */
+    private String clientInfo;
+
 }

easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-251479d0.29e0bd6a.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-251479d0"],{"339f":function(t,e,r){"use strict";var a=function(){var t=this,e=t._self._c;return e("div",[e("div",{staticStyle:{margin:"20px 0","border-left":"#f5222d 5px solid","font-size":"medium","font-weight":"bold"}},[t._v("    调用日志详情 (总调度次数: "+t._s(t.total)+") ")]),e("a-card",[e("s-table",{ref:"table",attrs:{size:"default",rowKey:"key",columns:t.columns,data:t.loadData},scopedSlots:t._u([{key:"serial",fn:function(r,a){return e("span",{},[t._v(" "+t._s(a.id)+" ")])}},{key:"clientInfo",fn:function(r){return e("span",{},[t._v(" "+t._s(r?r.split("@")[1]:"无")+" ")])}}])})],1)],1)},s=[],n=r("c1df"),o=r.n(n),i=r("0fea"),l=r("2af9"),d={name:"RetryTaskLogMessageList",components:{STable:l["j"]},data:function(){var t=this;return{columns:[{title:"#",scopedSlots:{customRender:"serial"},width:"10%"},{title:"信息",dataIndex:"message",width:"50%"},{title:"地址",dataIndex:"clientInfo",scopedSlots:{customRender:"clientInfo"},width:"10%"},{title:"触发时间",dataIndex:"createDt",sorter:!0,customRender:function(t){return o()(t).format("YYYY-MM-DD HH:mm:ss")},width:"10%"}],queryParam:{},loadData:function(e){return Object(i["s"])(Object.assign(e,t.queryParam)).then((function(e){return t.total=e.total,e}))},total:0}},methods:{refreshTable:function(t){this.queryParam=t,this.$refs.table.refresh(!0)}}},c=d,f=r("2877"),u=Object(f["a"])(c,a,s,!1,null,"ea1f0aa8",null);e["a"]=u.exports},"5fe2":function(t,e,r){"use strict";r.r(e);r("b0c0");var a=function(){var t=this,e=t._self._c;return e("div",[e("page-header-wrapper",{staticStyle:{margin:"-24px -1px 0"},on:{back:function(){return t.$router.go(-1)}}},[e("div")]),e("a-card",{attrs:{bordered:!1}},[null!==t.retryInfo?e("a-descriptions",{attrs:{title:"",bordered:""}},[e("a-descriptions-item",{attrs:{label:"组名称"}},[t._v(" "+t._s(t.retryInfo.groupName)+" ")]),e("a-descriptions-item",{attrs:{label:"场景名称"}},[t._v(" "+t._s(t.retryInfo.sceneName)+" ")]),e("a-descriptions-item",{attrs:{label:"唯一id"}},[t._v(" "+t._s(t.retryInfo.uniqueId)+" ")]),e("a-descriptions-item",{attrs:{label:"幂等id",span:2}},[t._v(" "+t._s(t.retryInfo.idempotentId)+" ")]),e("a-descriptions-item",{attrs:{label:"业务编号"}},[t._v(" "+t._s(t.retryInfo.bizNo)+" ")]),e("a-descriptions-item",{attrs:{label:"当前重试状态 | 数据类型"}},[e("a-tag",{attrs:{color:"red"}},[t._v(" "+t._s(t.retryStatus[t.retryInfo.retryStatus])+" ")]),e("a-divider",{attrs:{type:"vertical"}}),e("a-tag",{attrs:{color:t.taskType[t.retryInfo.taskType].color}},[t._v(" "+t._s(t.taskType[t.retryInfo.taskType].name)+" ")])],1),e("a-descriptions-item",{attrs:{label:"创建时间"}},[t._v(" "+t._s(t.retryInfo.createDt)+" ")]),e("a-descriptions-item",{attrs:{label:"执行器名称",span:3}},[t._v(" "+t._s(t.retryInfo.executorName)+" ")]),e("a-descriptions-item",{attrs:{label:"参数",span:3}},[t._v(" "+t._s(t.retryInfo.argsStr)+" ")]),e("a-descriptions-item",{attrs:{label:"扩展参数",span:3}},[t._v(" "+t._s(t.retryInfo.extAttrs)+" ")])],1):t._e()],1),e("RetryTaskLogMessageList",{ref:"retryTaskLogMessageListRef"})],1)},s=[],n=r("0fea"),o=r("c1df"),i=r.n(o),l=r("2af9"),d=r("339f"),c={name:"RetryLogInfo",components:{RetryTaskLogMessageList:d["a"],STable:l["j"]},data:function(){return{retryInfo:null,retryStatus:{0:"处理中",1:"处理成功",2:"最大次数"},taskType:{1:{name:"重试数据",color:"#d06892"},2:{name:"回调数据",color:"#f5a22d"}}}},created:function(){var t=this,e=this.$route.query.id;e&&Object(n["r"])(e).then((function(e){t.retryInfo=e.data,t.queryParam={groupName:t.retryInfo.groupName,uniqueId:t.retryInfo.uniqueId},t.$refs.retryTaskLogMessageListRef.refreshTable(t.queryParam)}))},methods:{parseDate:function(t){return i()(t).format("YYYY-MM-DD HH:mm:ss")}}},f=c,u=r("2877"),p=Object(u["a"])(f,a,s,!1,null,"29057338",null);e["default"]=p.exports}}]);

easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-251479d0.bc8dbe0c.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-251479d0"],{"339f":function(t,e,r){"use strict";var a=function(){var t=this,e=t._self._c;return e("div",[e("div",{staticStyle:{margin:"20px 0","border-left":"#f5222d 5px solid","font-size":"medium","font-weight":"bold"}},[t._v("    调用日志详情 (总调度次数: "+t._s(t.total)+") ")]),e("a-card",[e("s-table",{ref:"table",attrs:{size:"default",rowKey:"key",columns:t.columns,data:t.loadData},scopedSlots:t._u([{key:"serial",fn:function(r,a){return e("span",{},[t._v(" "+t._s(a.id)+" ")])}}])})],1)],1)},s=[],n=r("c1df"),o=r.n(n),i=r("0fea"),l=r("2af9"),d={name:"RetryTaskLogMessageList",components:{STable:l["j"]},data:function(){var t=this;return{columns:[{title:"#",scopedSlots:{customRender:"serial"},width:"10%"},{title:"信息",dataIndex:"message",width:"50%"},{title:"触发时间",dataIndex:"createDt",sorter:!0,customRender:function(t){return o()(t).format("YYYY-MM-DD HH:mm:ss")},width:"10%"}],queryParam:{},loadData:function(e){return Object(i["s"])(Object.assign(e,t.queryParam)).then((function(e){return t.total=e.total,e}))},total:0}},methods:{refreshTable:function(t){this.queryParam=t,this.$refs.table.refresh(!0)}}},c=d,u=r("2877"),f=Object(u["a"])(c,a,s,!1,null,"10281641",null);e["a"]=f.exports},"5fe2":function(t,e,r){"use strict";r.r(e);r("b0c0");var a=function(){var t=this,e=t._self._c;return e("div",[e("page-header-wrapper",{staticStyle:{margin:"-24px -1px 0"},on:{back:function(){return t.$router.go(-1)}}},[e("div")]),e("a-card",{attrs:{bordered:!1}},[null!==t.retryInfo?e("a-descriptions",{attrs:{title:"",bordered:""}},[e("a-descriptions-item",{attrs:{label:"组名称"}},[t._v(" "+t._s(t.retryInfo.groupName)+" ")]),e("a-descriptions-item",{attrs:{label:"场景名称"}},[t._v(" "+t._s(t.retryInfo.sceneName)+" ")]),e("a-descriptions-item",{attrs:{label:"唯一id"}},[t._v(" "+t._s(t.retryInfo.uniqueId)+" ")]),e("a-descriptions-item",{attrs:{label:"幂等id",span:2}},[t._v(" "+t._s(t.retryInfo.idempotentId)+" ")]),e("a-descriptions-item",{attrs:{label:"业务编号"}},[t._v(" "+t._s(t.retryInfo.bizNo)+" ")]),e("a-descriptions-item",{attrs:{label:"当前重试状态 | 数据类型"}},[e("a-tag",{attrs:{color:"red"}},[t._v(" "+t._s(t.retryStatus[t.retryInfo.retryStatus])+" ")]),e("a-divider",{attrs:{type:"vertical"}}),e("a-tag",{attrs:{color:t.taskType[t.retryInfo.taskType].color}},[t._v(" "+t._s(t.taskType[t.retryInfo.taskType].name)+" ")])],1),e("a-descriptions-item",{attrs:{label:"创建时间"}},[t._v(" "+t._s(t.retryInfo.createDt)+" ")]),e("a-descriptions-item",{attrs:{label:"执行器名称",span:3}},[t._v(" "+t._s(t.retryInfo.executorName)+" ")]),e("a-descriptions-item",{attrs:{label:"参数",span:3}},[t._v(" "+t._s(t.retryInfo.argsStr)+" ")]),e("a-descriptions-item",{attrs:{label:"扩展参数",span:3}},[t._v(" "+t._s(t.retryInfo.extAttrs)+" ")])],1):t._e()],1),e("RetryTaskLogMessageList",{ref:"retryTaskLogMessageListRef"})],1)},s=[],n=r("0fea"),o=r("c1df"),i=r.n(o),l=r("2af9"),d=r("339f"),c={name:"RetryLogInfo",components:{RetryTaskLogMessageList:d["a"],STable:l["j"]},data:function(){return{retryInfo:null,retryStatus:{0:"处理中",1:"处理成功",2:"最大次数"},taskType:{1:{name:"重试数据",color:"#d06892"},2:{name:"回调数据",color:"#f5a22d"}}}},created:function(){var t=this,e=this.$route.query.id;e&&Object(n["r"])(e).then((function(e){t.retryInfo=e.data,t.queryParam={groupName:t.retryInfo.groupName,uniqueId:t.retryInfo.uniqueId},t.$refs.retryTaskLogMessageListRef.refreshTable(t.queryParam)}))},methods:{parseDate:function(t){return i()(t).format("YYYY-MM-DD HH:mm:ss")}}},u=c,f=r("2877"),m=Object(f["a"])(u,a,s,!1,null,"29057338",null);e["default"]=m.exports}}]);

easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-35f76107.73c3f0b7.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-35f76107"],{"339f":function(t,e,r){"use strict";var a=function(){var t=this,e=t._self._c;return e("div",[e("div",{staticStyle:{margin:"20px 0","border-left":"#f5222d 5px solid","font-size":"medium","font-weight":"bold"}},[t._v("    调用日志详情 (总调度次数: "+t._s(t.total)+") ")]),e("a-card",[e("s-table",{ref:"table",attrs:{size:"default",rowKey:"key",columns:t.columns,data:t.loadData},scopedSlots:t._u([{key:"serial",fn:function(r,a){return e("span",{},[t._v(" "+t._s(a.id)+" ")])}}])})],1)],1)},s=[],n=r("c1df"),o=r.n(n),i=r("0fea"),l=r("2af9"),d={name:"RetryTaskLogMessageList",components:{STable:l["j"]},data:function(){var t=this;return{columns:[{title:"#",scopedSlots:{customRender:"serial"},width:"10%"},{title:"信息",dataIndex:"message",width:"50%"},{title:"触发时间",dataIndex:"createDt",sorter:!0,customRender:function(t){return o()(t).format("YYYY-MM-DD HH:mm:ss")},width:"10%"}],queryParam:{},loadData:function(e){return Object(i["s"])(Object.assign(e,t.queryParam)).then((function(e){return t.total=e.total,e}))},total:0}},methods:{refreshTable:function(t){this.queryParam=t,this.$refs.table.refresh(!0)}}},u=d,c=r("2877"),f=Object(c["a"])(u,a,s,!1,null,"10281641",null);e["a"]=f.exports},"99f5":function(t,e,r){"use strict";r.r(e);r("b0c0");var a=function(){var t=this,e=t._self._c;return e("div",[e("page-header-wrapper",{staticStyle:{margin:"-24px -1px 0"},on:{back:function(){return t.$router.go(-1)}}},[e("div")]),null!==t.retryTaskInfo?e("a-card",{attrs:{bordered:!1}},[e("a-descriptions",{attrs:{title:"",bordered:""}},[e("a-descriptions-item",{attrs:{label:"组名称"}},[t._v(" "+t._s(t.retryTaskInfo.groupName)+" ")]),e("a-descriptions-item",{attrs:{label:"场景名称"}},[t._v(" "+t._s(t.retryTaskInfo.sceneName)+" ")]),e("a-descriptions-item",{attrs:{label:"幂等id"}},[t._v(" "+t._s(t.retryTaskInfo.idempotentId)+" ")]),e("a-descriptions-item",{attrs:{label:"唯一id"}},[t._v(" "+t._s(t.retryTaskInfo.uniqueId)+" ")]),e("a-descriptions-item",{attrs:{label:"业务编号"}},[t._v(" "+t._s(t.retryTaskInfo.bizNo)+" ")]),e("a-descriptions-item",{attrs:{label:"重试次数"}},[t._v(" "+t._s(t.retryTaskInfo.retryCount)+" ")]),e("a-descriptions-item",{attrs:{label:"重试状态 | 数据类型"}},[e("a-tag",{attrs:{color:"red"}},[t._v(" "+t._s(t.retryStatus[t.retryTaskInfo.retryStatus])+" ")]),e("a-divider",{attrs:{type:"vertical"}}),e("a-tag",{attrs:{color:t.taskType[t.retryTaskInfo.taskType].color}},[t._v(" "+t._s(t.taskType[t.retryTaskInfo.taskType].name)+" ")])],1),e("a-descriptions-item",{attrs:{label:"下次触发时间"}},[t._v(" "+t._s(t.retryTaskInfo.nextTriggerAt)+" ")]),e("a-descriptions-item",{attrs:{label:"更新时间"}},[t._v(" "+t._s(t.retryTaskInfo.updateDt)+" ")]),e("a-descriptions-item",{attrs:{label:"执行器名称",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.executorName)+" ")]),e("a-descriptions-item",{attrs:{label:"参数",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.argsStr)+" ")]),e("a-descriptions-item",{attrs:{label:"扩展参数",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.extAttrs)+" ")])],1)],1):t._e(),e("RetryTaskLogMessageList",{ref:"retryTaskLogMessageListRef"})],1)},s=[],n=r("0fea"),o=r("c1df"),i=r.n(o),l=r("339f"),d={name:"RetryTaskInfo",components:{RetryTaskLogMessageList:l["a"]},data:function(){return{retryTaskInfo:null,retryStatus:{0:"处理中",1:"处理成功",2:"最大次数",3:"暂停"},taskType:{1:{name:"重试数据",color:"#d06892"},2:{name:"回调数据",color:"#f5a22d"}}}},created:function(){var t=this,e=this.$route.query.id,r=this.$route.query.groupName;e&&r&&Object(n["q"])(e,{groupName:r}).then((function(e){t.retryTaskInfo=e.data,t.queryParam={groupName:t.retryTaskInfo.groupName,uniqueId:t.retryTaskInfo.uniqueId},t.$refs.retryTaskLogMessageListRef.refreshTable(t.queryParam)}))},methods:{parseDate:function(t){return i()(t).format("YYYY-MM-DD HH:mm:ss")}}},u=d,c=r("2877"),f=Object(c["a"])(u,a,s,!1,null,"7dc5d024",null);e["default"]=f.exports}}]);

easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-35f76107.80696ce6.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-35f76107"],{"339f":function(t,e,a){"use strict";var r=function(){var t=this,e=t._self._c;return e("div",[e("div",{staticStyle:{margin:"20px 0","border-left":"#f5222d 5px solid","font-size":"medium","font-weight":"bold"}},[t._v("    调用日志详情 (总调度次数: "+t._s(t.total)+") ")]),e("a-card",[e("s-table",{ref:"table",attrs:{size:"default",rowKey:"key",columns:t.columns,data:t.loadData},scopedSlots:t._u([{key:"serial",fn:function(a,r){return e("span",{},[t._v(" "+t._s(r.id)+" ")])}},{key:"clientInfo",fn:function(a){return e("span",{},[t._v(" "+t._s(a?a.split("@")[1]:"无")+" ")])}}])})],1)],1)},s=[],n=a("c1df"),o=a.n(n),i=a("0fea"),l=a("2af9"),d={name:"RetryTaskLogMessageList",components:{STable:l["j"]},data:function(){var t=this;return{columns:[{title:"#",scopedSlots:{customRender:"serial"},width:"10%"},{title:"信息",dataIndex:"message",width:"50%"},{title:"地址",dataIndex:"clientInfo",scopedSlots:{customRender:"clientInfo"},width:"10%"},{title:"触发时间",dataIndex:"createDt",sorter:!0,customRender:function(t){return o()(t).format("YYYY-MM-DD HH:mm:ss")},width:"10%"}],queryParam:{},loadData:function(e){return Object(i["s"])(Object.assign(e,t.queryParam)).then((function(e){return t.total=e.total,e}))},total:0}},methods:{refreshTable:function(t){this.queryParam=t,this.$refs.table.refresh(!0)}}},c=d,u=a("2877"),f=Object(u["a"])(c,r,s,!1,null,"ea1f0aa8",null);e["a"]=f.exports},"99f5":function(t,e,a){"use strict";a.r(e);a("b0c0");var r=function(){var t=this,e=t._self._c;return e("div",[e("page-header-wrapper",{staticStyle:{margin:"-24px -1px 0"},on:{back:function(){return t.$router.go(-1)}}},[e("div")]),null!==t.retryTaskInfo?e("a-card",{attrs:{bordered:!1}},[e("a-descriptions",{attrs:{title:"",bordered:""}},[e("a-descriptions-item",{attrs:{label:"组名称"}},[t._v(" "+t._s(t.retryTaskInfo.groupName)+" ")]),e("a-descriptions-item",{attrs:{label:"场景名称"}},[t._v(" "+t._s(t.retryTaskInfo.sceneName)+" ")]),e("a-descriptions-item",{attrs:{label:"幂等id"}},[t._v(" "+t._s(t.retryTaskInfo.idempotentId)+" ")]),e("a-descriptions-item",{attrs:{label:"唯一id"}},[t._v(" "+t._s(t.retryTaskInfo.uniqueId)+" ")]),e("a-descriptions-item",{attrs:{label:"业务编号"}},[t._v(" "+t._s(t.retryTaskInfo.bizNo)+" ")]),e("a-descriptions-item",{attrs:{label:"重试次数"}},[t._v(" "+t._s(t.retryTaskInfo.retryCount)+" ")]),e("a-descriptions-item",{attrs:{label:"重试状态 | 数据类型"}},[e("a-tag",{attrs:{color:"red"}},[t._v(" "+t._s(t.retryStatus[t.retryTaskInfo.retryStatus])+" ")]),e("a-divider",{attrs:{type:"vertical"}}),e("a-tag",{attrs:{color:t.taskType[t.retryTaskInfo.taskType].color}},[t._v(" "+t._s(t.taskType[t.retryTaskInfo.taskType].name)+" ")])],1),e("a-descriptions-item",{attrs:{label:"下次触发时间"}},[t._v(" "+t._s(t.retryTaskInfo.nextTriggerAt)+" ")]),e("a-descriptions-item",{attrs:{label:"更新时间"}},[t._v(" "+t._s(t.retryTaskInfo.updateDt)+" ")]),e("a-descriptions-item",{attrs:{label:"执行器名称",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.executorName)+" ")]),e("a-descriptions-item",{attrs:{label:"参数",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.argsStr)+" ")]),e("a-descriptions-item",{attrs:{label:"扩展参数",span:"3"}},[t._v(" "+t._s(t.retryTaskInfo.extAttrs)+" ")])],1)],1):t._e(),e("RetryTaskLogMessageList",{ref:"retryTaskLogMessageListRef"})],1)},s=[],n=a("0fea"),o=a("c1df"),i=a.n(o),l=a("339f"),d={name:"RetryTaskInfo",components:{RetryTaskLogMessageList:l["a"]},data:function(){return{retryTaskInfo:null,retryStatus:{0:"处理中",1:"处理成功",2:"最大次数",3:"暂停"},taskType:{1:{name:"重试数据",color:"#d06892"},2:{name:"回调数据",color:"#f5a22d"}}}},created:function(){var t=this,e=this.$route.query.id,a=this.$route.query.groupName;e&&a&&Object(n["q"])(e,{groupName:a}).then((function(e){t.retryTaskInfo=e.data,t.queryParam={groupName:t.retryTaskInfo.groupName,uniqueId:t.retryTaskInfo.uniqueId},t.$refs.retryTaskLogMessageListRef.refreshTable(t.queryParam)}))},methods:{parseDate:function(t){return i()(t).format("YYYY-MM-DD HH:mm:ss")}}},c=d,u=a("2877"),f=Object(u["a"])(c,r,s,!1,null,"7dc5d024",null);e["default"]=f.exports}}]);

easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskLogMessageResponseVO.java

@@ -15,6 +15,11 @@ public class RetryTaskLogMessageResponseVO {
 
     private String message;
 
+    /**
+     * 客户端信息
+     */
+    private String clientInfo;
+
     private LocalDateTime createDt;
 
 }

easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java

@@ -46,11 +46,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -189,7 +185,7 @@ public class DashBoardServiceImpl implements DashBoardService {
             serverNodeLambdaQueryWrapper.eq(ServerNode::getGroupName, queryVO.getGroupName());
         }
 
-        serverNodeLambdaQueryWrapper.ge(ServerNode::getExpireAt, LocalDateTime.now());
+        serverNodeLambdaQueryWrapper.ge(ServerNode::getExpireAt, LocalDateTime.now().minusSeconds(ServerRegister.DELAY_TIME + (ServerRegister.DELAY_TIME / 3)));
         PageDTO<ServerNode> serverNodePageDTO = serverNodeMapper.selectPage(pageDTO, serverNodeLambdaQueryWrapper.orderByDesc(ServerNode::getNodeType));
 
         List<ServerNodeResponseVO> serverNodeResponseVOS = ServerNodeResponseVOConverter.INSTANCE.toServerNodeResponseVO(serverNodePageDTO.getRecords());
@@ -220,7 +216,9 @@ public class DashBoardServiceImpl implements DashBoardService {
                 Result<List<Integer>> result = restTemplate.getForObject(format, Result.class);
                 List<Integer> data = result.getData();
                 if (!CollectionUtils.isEmpty(data)) {
-                    serverNodeResponseVO.setConsumerBuckets(new HashSet<>(data));
+                    serverNodeResponseVO.setConsumerBuckets(data.stream()
+                            .sorted(Integer::compareTo)
+                            .collect(Collectors.toCollection(LinkedHashSet::new)));
                 }
 
             } catch (Exception e) {

frontend/src/views/task/RetryTaskLogMessageList.vue

@@ -14,6 +14,9 @@
         <span slot="serial" slot-scope="text, record">
           {{ record.id }}
         </span>
+        <span slot="clientInfo" slot-scope="text">
+          {{ text ? text.split('@')[1] : '无' }}
+        </span>
       </s-table>
     </a-card>
   </div>
@@ -44,6 +47,12 @@ export default {
           dataIndex: 'message',
           width: '50%'
         },
+        {
+          title: '地址',
+          dataIndex: 'clientInfo',
+          scopedSlots: { customRender: 'clientInfo' },
+          width: '10%'
+        },
         {
           title: '触发时间',
           dataIndex: 'createDt',