diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/order/OrderVO.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/order/OrderVO.java
index 390d3ef4..e8b05779 100644
--- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/order/OrderVO.java
+++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/order/OrderVO.java
@@ -27,8 +27,11 @@ public class OrderVO {
@ApiModelProperty(value = "工单状态, 0:待审批, 1:通过, 2:拒绝, 3:取消")
private Integer status;
- @ApiModelProperty(value = "申请/审核时间")
- private Date gmtTime;
+ @ApiModelProperty(value = "申请时间")
+ private Date gmtCreate;
+
+ @ApiModelProperty(value = "审核时间")
+ private Date gmtHandle;
public Long getId() {
return id;
@@ -70,12 +73,20 @@ public class OrderVO {
this.status = status;
}
- public Date getGmtTime() {
- return gmtTime;
+ public Date getGmtCreate() {
+ return gmtCreate;
}
- public void setGmtTime(Date gmtTime) {
- this.gmtTime = gmtTime;
+ public void setGmtCreate(Date gmtCreate) {
+ this.gmtCreate = gmtCreate;
+ }
+
+ public Date getGmtHandle() {
+ return gmtHandle;
+ }
+
+ public void setGmtHandle(Date gmtHandle) {
+ this.gmtHandle = gmtHandle;
}
public String getApplicant() {
@@ -95,7 +106,7 @@ public class OrderVO {
", applicant='" + applicant + '\'' +
", description='" + description + '\'' +
", status=" + status +
- ", gmtTime=" + gmtTime +
+ ", gmtTime=" + gmtCreate +
'}';
}
}
diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/BackoffUtils.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/BackoffUtils.java
new file mode 100644
index 00000000..f4218020
--- /dev/null
+++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/BackoffUtils.java
@@ -0,0 +1,20 @@
+package com.xiaojukeji.kafka.manager.common.utils;
+
+public class BackoffUtils {
+ private BackoffUtils() {
+ }
+
+ public static void backoff(long timeUnitMs) {
+ if (timeUnitMs <= 0) {
+ return;
+ }
+
+ try {
+ Thread.sleep(timeUnitMs);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+}
diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/jmx/JmxConnectorWrap.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/jmx/JmxConnectorWrap.java
index 5625b37f..56b3a1d5 100644
--- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/jmx/JmxConnectorWrap.java
+++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/jmx/JmxConnectorWrap.java
@@ -1,5 +1,6 @@
package com.xiaojukeji.kafka.manager.common.utils.jmx;
+import com.xiaojukeji.kafka.manager.common.utils.BackoffUtils;
import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -146,18 +147,16 @@ public class JmxConnectorWrap {
long now = System.currentTimeMillis();
while (true) {
try {
- if (System.currentTimeMillis() - now > 60000) {
- break;
- }
int num = atomicInteger.get();
if (num <= 0) {
- Thread.sleep(2);
- continue;
+ BackoffUtils.backoff(2);
}
- if (atomicInteger.compareAndSet(num, num - 1)) {
+
+ if (atomicInteger.compareAndSet(num, num - 1) || System.currentTimeMillis() - now > 6000) {
break;
}
} catch (Exception e) {
+ // ignore
}
}
}
diff --git a/kafka-manager-web/pom.xml b/kafka-manager-web/pom.xml
index b3fd5b91..a959f958 100644
--- a/kafka-manager-web/pom.xml
+++ b/kafka-manager-web/pom.xml
@@ -19,7 +19,7 @@
2.1.1.RELEASE
5.1.3.RELEASE
false
- 8.5.66
+ 8.5.72
diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/OrderConverter.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/OrderConverter.java
index bbe8c656..ebaa4e6f 100644
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/OrderConverter.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/OrderConverter.java
@@ -41,7 +41,8 @@ public class OrderConverter {
}
OrderVO orderVO = new OrderVO();
CopyUtils.copyProperties(orderVO, orderDO);
- orderVO.setGmtTime(orderDO.getGmtCreate());
+ orderVO.setGmtCreate(orderDO.getGmtCreate());
+ orderVO.setGmtHandle(orderDO.getGmtHandle());
return orderVO;
}
diff --git a/pom.xml b/pom.xml
index 6a841081..235e8165 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
1.8
UTF-8
UTF-8
- 8.5.66
+ 8.5.72
3.0.0