diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 43d3edd35..f24d220e5 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -899,13 +899,18 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter, AsyncXmlReada } public boolean isCloudAnalyticsDelay() { - return designerPushUpdateConfigManager.isCloudAnalyticsDelay(); + return designerPushUpdateConfigManager.isCloudAnalyticsDelay() || designerPushUpdateConfigManager.isUseCloudAnalyticsDelayFirst(); } public void setCloudAnalyticsDelay(boolean cloudAnalyticsDelay) { designerPushUpdateConfigManager.setCloudAnalyticsDelay(cloudAnalyticsDelay); } + public void setUseCloudAnalyticsDelayFirst(boolean useCloudAnalyticsDelayFirst) { + designerPushUpdateConfigManager.setUseCloudAnalyticsDelayFirst(useCloudAnalyticsDelayFirst); + } + + /** * 设计器登录相关配置 */ diff --git a/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateConfigManager.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateConfigManager.java index 950d76d7b..ea279bb03 100644 --- a/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateConfigManager.java +++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateConfigManager.java @@ -15,7 +15,8 @@ public class DesignerPushUpdateConfigManager implements XMLReadable, XMLWriter { private static DesignerPushUpdateConfigManager singleton; private boolean autoPushUpdateEnabled = true; // 是否开启自动推送更新 - private boolean cloudAnalyticsDelay = false; // 是否云端运维模块延迟启动 + private boolean cloudAnalyticsDelay = true; // 是否云端运维模块延迟启动 + private boolean useCloudAnalyticsDelayFirst = true; // 默认打开,如果有手动改延迟启动配置则按客户配置的来 private String lastIgnoredVersion = StringUtils.EMPTY; // 最近一次跳过的更新版本 private DesignerPushUpdateConfigManager() { @@ -33,7 +34,8 @@ public class DesignerPushUpdateConfigManager implements XMLReadable, XMLWriter { if (reader.isAttr()) { this.setAutoPushUpdateEnabled(reader.getAttrAsBoolean("autoPushUpdateEnabled", true)); this.setLastIgnoredVersion(reader.getAttrAsString("lastIgnoredVersion", StringUtils.EMPTY)); - this.setCloudAnalyticsDelay(reader.getAttrAsBoolean("cloudAnalyticsDelay", false)); + this.setCloudAnalyticsDelay(reader.getAttrAsBoolean("cloudAnalyticsDelay", true)); + this.setUseCloudAnalyticsDelayFirst(reader.getAttrAsBoolean("useCloudAnalyticsDelayFirst", true)); } } @@ -43,6 +45,7 @@ public class DesignerPushUpdateConfigManager implements XMLReadable, XMLWriter { writer.attr("autoPushUpdateEnabled", autoPushUpdateEnabled); writer.attr("lastIgnoredVersion", lastIgnoredVersion); writer.attr("cloudAnalyticsDelay", cloudAnalyticsDelay); + writer.attr("useCloudAnalyticsDelayFirst", useCloudAnalyticsDelayFirst); writer.end(); } @@ -69,4 +72,12 @@ public class DesignerPushUpdateConfigManager implements XMLReadable, XMLWriter { public void setCloudAnalyticsDelay(boolean cloudAnalyticsDelay) { this.cloudAnalyticsDelay = cloudAnalyticsDelay; } + + public boolean isUseCloudAnalyticsDelayFirst() { + return useCloudAnalyticsDelayFirst; + } + + public void setUseCloudAnalyticsDelayFirst(boolean useCloudAnalyticsDelayFirst) { + this.useCloudAnalyticsDelayFirst = useCloudAnalyticsDelayFirst; + } }