From 7cef6f8bf289f89e4e9dd2e52046085266c05727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E9=87=91=E8=80=80?= <94180588@qq.com>
Date: Tue, 14 Jun 2022 07:24:56 +0000
Subject: [PATCH 1/2] =?UTF-8?q?!30=20=E8=A7=A3=E5=86=B3=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=89=8D=E6=AE=B5=E4=BB=A3=E7=A0=81=E5=AD=97=E5=85=B8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=87=8D=E5=A4=8Dbug=20*=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=89=8D=E6=AE=B5=E4=BB=A3=E7=A0=81=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8Dbug=EF=BC=9A?=
 =?UTF-8?q?=E4=BD=86=E4=B8=80=E4=B8=AA=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=97=E5=85=B8=E6=97=B6=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/me/zhengjie/utils/GenUtil.java             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
index b1cb249e..d197a3ca 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
@@ -1,4 +1,4 @@
-/*
+/*
  *  Copyright 2019-2020 Zheng Jie
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -276,7 +276,8 @@ public class GenUtil {
             // 主键存在字典
             if (StringUtils.isNotBlank(column.getDictName())) {
                 genMap.put("hasDict", true);
-                dicts.add(column.getDictName());
+                if(!dicts.contains(column.getDictName()))
+                    dicts.add(column.getDictName());
             }
 
             // 存储字段类型

From 20f2c6362ee12d4a44356922aff8945f6d8c7c32 Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Tue, 14 Jun 2022 16:32:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84](mast?=
 =?UTF-8?q?er):=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/MonitorServiceImpl.java        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java
index 6e7e5222..fd69a222 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java
@@ -148,9 +148,15 @@ public class MonitorServiceImpl implements MonitorService {
         cpuInfo.put("logic", processor.getLogicalProcessorCount() + "个逻辑CPU");
         // CPU信息
         long[] prevTicks = processor.getSystemCpuLoadTicks();
-        // 等待1秒...
-        Util.sleep(1000);
+        // 默认等待300毫秒...
+        long time = 300;
+        Util.sleep(time);
         long[] ticks = processor.getSystemCpuLoadTicks();
+        while (Arrays.toString(prevTicks).equals(Arrays.toString(ticks)) && time < 1000){
+            time += 25;
+            Util.sleep(25);
+            ticks = processor.getSystemCpuLoadTicks();
+        }
         long user = ticks[CentralProcessor.TickType.USER.getIndex()] - prevTicks[CentralProcessor.TickType.USER.getIndex()];
         long nice = ticks[CentralProcessor.TickType.NICE.getIndex()] - prevTicks[CentralProcessor.TickType.NICE.getIndex()];
         long sys = ticks[CentralProcessor.TickType.SYSTEM.getIndex()] - prevTicks[CentralProcessor.TickType.SYSTEM.getIndex()];