Browse Source

REPORT-53695 设计器在未激活情况下弹出登录引导页面

feature/10.0
Lanlan 3 years ago
parent
commit
3657f1ddeb
  1. 8
      designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideHelper.java
  2. 2
      designer-base/src/main/resources/com/fr/design/login/login.js

8
designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideHelper.java

@ -5,6 +5,7 @@ import com.fr.design.dialog.UIDialog;
import com.fr.design.event.DesignerOpenedListener;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.os.impl.SupportOSImpl;
import com.fr.stable.StringUtils;
import javax.swing.WindowConstants;
/**
@ -54,7 +55,12 @@ public class DesignerGuideHelper {
* 激活满一周
*/
private static boolean isActivatedForOneWeek() {
return (System.currentTimeMillis() - DesignerEnvManager.getEnvManager().getDesignerActivatedTime()) > ONE_WEEK;
DesignerEnvManager manager = DesignerEnvManager.getEnvManager();
String key = manager.getActivationKey();
if (StringUtils.isEmpty(key)) {
return false;
}
return (System.currentTimeMillis() - manager.getDesignerActivatedTime()) > ONE_WEEK;
}
/**

2
designer-base/src/main/resources/com/fr/design/login/login.js

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save