From 3d5f28fd959399424b04ab9512b452907cfcfbc3 Mon Sep 17 00:00:00 2001
From: Maximus <2788852163@qq.com>
Date: Fri, 8 Jul 2022 14:13:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-11853=20=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E9=92=9F=E6=95=B0=E5=8F=AF=E4=BB=A5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0=EF=BC=8C=E4=BD=86=E4=B8=8D=E8=83=BD=E5=B0=8F?=
 =?UTF-8?q?=E4=BA=8E1=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datapane/ESDStrategyConfigPane.java      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java
index 39b4ecb00f..f3df21df9c 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java
@@ -133,7 +133,7 @@ public class ESDStrategyConfigPane extends BasicBeanPane<StrategyConfig> {
             ob = StrategyConfigHelper.createStrategyConfig(true, false, true);
         }
         this.strategyConfig = ob;
-        this.updateInterval.setText(ob.getUpdateInterval() <= 0 ? "0" : String.format("%.0f", ob.getUpdateInterval() / (double) CacheConstants.MILLIS_OF_MINUTE));
+        this.updateInterval.setText(ob.getUpdateInterval() <= 0 ? "0" : String.valueOf(ob.getUpdateInterval() / (double) CacheConstants.MILLIS_OF_MINUTE));
         this.schemaTime.setText(StringUtils.join(",", ob.getUpdateSchema().toArray(new String[0])));
         this.shouldEvolve.setSelected(ob.shouldEvolve());
         this.selectBySchema.setSelected(ob.isScheduleBySchema());
@@ -185,7 +185,6 @@ public class ESDStrategyConfigPane extends BasicBeanPane<StrategyConfig> {
                                 this.schemaTimeCheckTips.setVisible(true);
                                 throw new IllegalArgumentException("[ESD]Update schema time interval is to short.");
                             }
-
                         } else {
                             Collections.addAll(schemaTimes, text.split(","));
                         }
@@ -200,8 +199,15 @@ public class ESDStrategyConfigPane extends BasicBeanPane<StrategyConfig> {
                     String interval = this.updateInterval.getText();
                     if (checkUpdateInterval(interval)) {
                         long intervalMillis = StringUtils.isEmpty(interval) ? 0 : (long) (Double.parseDouble(interval) * CacheConstants.MILLIS_OF_MINUTE);
-                        config.setUpdateInterval(intervalMillis);
+                        if (intervalMillis >= CacheConstants.MILLIS_OF_MINUTE) {
+                            config.setUpdateInterval(intervalMillis);
+                        } else {
+                            this.updateIntervalCheckTips.setText(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Error_Time_Interval_Too_Short"));
+                            this.updateIntervalCheckTips.setVisible(true);
+                            throw new IllegalArgumentException("[ESD]Update schema time interval is to short.");
+                        }
                     } else {
+                        this.updateIntervalCheckTips.setText(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Error_Time_Format"));
                         this.updateIntervalCheckTips.setVisible(true);
                         throw new IllegalArgumentException("[ESD]Error update interval format.");
                     }
@@ -220,7 +226,7 @@ public class ESDStrategyConfigPane extends BasicBeanPane<StrategyConfig> {
 
     private boolean checkUpdateInterval(String intervalValue) {
         try {
-            return !StringUtils.isEmpty(intervalValue) && !(Integer.parseInt(intervalValue) <= 0);
+            return !StringUtils.isEmpty(intervalValue) && !(Double.parseDouble(intervalValue) <= 0);
         } catch (NumberFormatException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
@@ -228,6 +234,7 @@ public class ESDStrategyConfigPane extends BasicBeanPane<StrategyConfig> {
         return false;
     }
 
+
     private boolean checkCornTimeInterval (String cronText) {
         // 判断后两次更新时间间隔，如果小于1分钟就返回false
         try {

From 6f8d015598e6015f6bddcc8ff8c2413a9b0d8c1d Mon Sep 17 00:00:00 2001
From: "John.Ying" <John.Ying@fanruan.com>
Date: Mon, 11 Jul 2022 21:12:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-75072=20fix:SocketIO=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E5=A4=B1=E8=B4=A5=EF=BC=8C=E7=AB=AF=E5=8F=A3=E8=A2=AB?=
 =?UTF-8?q?=E5=8D=A0=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/start/module/DesignerActivator.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
index 02152beb17..d3a30eb59b 100644
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
@@ -497,10 +497,9 @@ public class DesignerActivator extends Activator implements Prepare {
 
     @Override
     public void prepare() {
-    
-        OptimizeUtil.close(() -> {
+        if (!OptimizeUtil.isOpen()) {
             LoginAuthServer.getInstance().compatibleStart();
-        });
+        }
         ContentReplacerCenter.getInstance().register();
         EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
             @Override