Browse Source

Pull request #4507: REPORT-51360 【10.0.17】设计器用户登录策略调整

Merge in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0

* commit 'd727b8f4244e224311d00fb709b8ae46bb6bedc1':
  REPORT-51360 设计器通行证和finedb里的区分开,对不支持jxbrowser的系统做兼容处理
  REPORT-51360 新增模板商城toast提示
  兼容处理
  REPORT-51360 【10.0.17】设计器用户登录策略调整
feature/10.0
Lanlan 3 years ago
parent
commit
398fc83780
  1. 122
      designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
  2. 65
      designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java
  3. 60
      designer-base/src/main/java/com/fr/design/actions/community/BugAction.java
  4. 17
      designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java
  5. 72
      designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java
  6. 13
      designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java
  7. 70
      designer-base/src/main/java/com/fr/design/actions/community/SignAction.java
  8. 21
      designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java
  9. 80
      designer-base/src/main/java/com/fr/design/actions/community/UpAction.java
  10. 60
      designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java
  11. 9
      designer-base/src/main/java/com/fr/design/actions/community/WorkOrderCenterAction.java
  12. 31
      designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java
  13. 3
      designer-base/src/main/java/com/fr/design/constants/UIConstants.java
  14. 4
      designer-base/src/main/java/com/fr/design/extra/LoginContextListener.java
  15. 38
      designer-base/src/main/java/com/fr/design/extra/LoginWebBridge.java
  16. 6
      designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java
  17. 12
      designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java
  18. 6
      designer-base/src/main/java/com/fr/design/extra/PluginUpdatePane.java
  19. 21
      designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java
  20. 5
      designer-base/src/main/java/com/fr/design/extra/UserLoginContext.java
  21. 2
      designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
  22. 7
      designer-base/src/main/java/com/fr/design/extra/exe/PluginLoginExecutor.java
  23. 92
      designer-base/src/main/java/com/fr/design/login/AbstractDesignerSSO.java
  24. 280
      designer-base/src/main/java/com/fr/design/login/DesignerLoginBridge.java
  25. 104
      designer-base/src/main/java/com/fr/design/login/DesignerLoginHelper.java
  26. 42
      designer-base/src/main/java/com/fr/design/login/DesignerLoginPane.java
  27. 45
      designer-base/src/main/java/com/fr/design/login/DesignerLoginShowDialog.java
  28. 29
      designer-base/src/main/java/com/fr/design/login/DesignerLoginSource.java
  29. 29
      designer-base/src/main/java/com/fr/design/login/DesignerLoginType.java
  30. 49
      designer-base/src/main/java/com/fr/design/login/bean/BBSAccountLogin.java
  31. 226
      designer-base/src/main/java/com/fr/design/login/config/DesignerLoginConfigManager.java
  32. 30
      designer-base/src/main/java/com/fr/design/login/executor/DesignerLoginBrowserExecutor.java
  33. 45
      designer-base/src/main/java/com/fr/design/login/executor/DesignerLoginExecutor.java
  34. 45
      designer-base/src/main/java/com/fr/design/login/executor/DesignerSendCaptchaExecutor.java
  35. 47
      designer-base/src/main/java/com/fr/design/login/executor/DesignerSmsLoginExecutor.java
  36. 49
      designer-base/src/main/java/com/fr/design/login/executor/DesignerSmsRegisterExecutor.java
  37. 83
      designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideBridge.java
  38. 114
      designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideHelper.java
  39. 37
      designer-base/src/main/java/com/fr/design/login/guide/DesignerGuidePane.java
  40. 35
      designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideShowDialog.java
  41. 19
      designer-base/src/main/java/com/fr/design/login/guide/utils/DesignerGuideUtils.java
  42. 167
      designer-base/src/main/java/com/fr/design/login/service/DesignerLoginClient.java
  43. 82
      designer-base/src/main/java/com/fr/design/login/service/DesignerLoginResult.java
  44. 114
      designer-base/src/main/java/com/fr/design/login/service/DesignerPassportManager.java
  45. 87
      designer-base/src/main/java/com/fr/design/login/socketio/LoginAuthServer.java
  46. 51
      designer-base/src/main/java/com/fr/design/login/task/DesignerLoginTaskWorker.java
  47. 35
      designer-base/src/main/java/com/fr/design/login/utils/DesignerLoginUtils.java
  48. 5
      designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfo.java
  49. 10
      designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java
  50. 5
      designer-base/src/main/java/com/fr/design/ui/EmbProtocolHandler.java
  51. 10
      designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java
  52. 16
      designer-base/src/main/java/com/fr/design/upm/UpmBridge.java
  53. 2
      designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
  54. 4
      designer-base/src/main/java/com/fr/design/upm/event/CertificateEvent.java
  55. 2
      designer-base/src/main/resources/com/fr/design/login/designer_login.properties
  56. 52
      designer-base/src/main/resources/com/fr/design/login/guide.css
  57. 25
      designer-base/src/main/resources/com/fr/design/login/guide.html
  58. 1
      designer-base/src/main/resources/com/fr/design/login/guide.js
  59. BIN
      designer-base/src/main/resources/com/fr/design/login/img/icon_cantuse.png
  60. 23
      designer-base/src/main/resources/com/fr/design/login/img/icon_close40x40_normal.svg
  61. BIN
      designer-base/src/main/resources/com/fr/design/login/img/icon_close9x9_hover.png
  62. BIN
      designer-base/src/main/resources/com/fr/design/login/img/icon_close9x9_normal.png
  63. BIN
      designer-base/src/main/resources/com/fr/design/login/img/icon_close_normal.png
  64. BIN
      designer-base/src/main/resources/com/fr/design/login/img/icon_disable-new.png
  65. BIN
      designer-base/src/main/resources/com/fr/design/login/img/icon_disable.png
  66. BIN
      designer-base/src/main/resources/com/fr/design/login/img/icon_marked.png
  67. BIN
      designer-base/src/main/resources/com/fr/design/login/img/icon_new.png
  68. BIN
      designer-base/src/main/resources/com/fr/design/login/img/login_guide.png
  69. BIN
      designer-base/src/main/resources/com/fr/design/login/img/login_loading.gif
  70. BIN
      designer-base/src/main/resources/com/fr/design/login/img/product-01.png
  71. BIN
      designer-base/src/main/resources/com/fr/design/login/img/warning.png
  72. 5619
      designer-base/src/main/resources/com/fr/design/login/lib/bluebird.js
  73. 6540
      designer-base/src/main/resources/com/fr/design/login/lib/bundle.css
  74. 53
      designer-base/src/main/resources/com/fr/design/login/lib/fineui.ie.min.js
  75. 54
      designer-base/src/main/resources/com/fr/design/login/lib/fineui.min.js
  76. BIN
      designer-base/src/main/resources/com/fr/design/login/lib/font/iconfont.eot
  77. 1703
      designer-base/src/main/resources/com/fr/design/login/lib/font/iconfont.svg
  78. BIN
      designer-base/src/main/resources/com/fr/design/login/lib/font/iconfont.ttf
  79. BIN
      designer-base/src/main/resources/com/fr/design/login/lib/font/iconfont.woff
  80. BIN
      designer-base/src/main/resources/com/fr/design/login/lib/font/iconfont.woff2
  81. 5
      designer-base/src/main/resources/com/fr/design/login/lib/locale/login_en_US.js
  82. 5
      designer-base/src/main/resources/com/fr/design/login/lib/locale/login_ja_JP.js
  83. 5
      designer-base/src/main/resources/com/fr/design/login/lib/locale/login_ko_KR.js
  84. 59
      designer-base/src/main/resources/com/fr/design/login/lib/locale/login_zh_CN.js
  85. 5
      designer-base/src/main/resources/com/fr/design/login/lib/locale/login_zh_TW.js
  86. 40
      designer-base/src/main/resources/com/fr/design/login/lib/locale/transform-i18n.js
  87. 3
      designer-base/src/main/resources/com/fr/design/login/lib/polyfill.min.js
  88. 230
      designer-base/src/main/resources/com/fr/design/login/login.css
  89. 25
      designer-base/src/main/resources/com/fr/design/login/login.html
  90. 1
      designer-base/src/main/resources/com/fr/design/login/login.js
  91. 9
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/OnlineWidgetBlock.java
  92. 3
      designer-realize/src/main/java/com/fr/design/mainframe/ActiveKeyGenerator.java
  93. 3
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
  94. 44
      designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java
  95. 11
      designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoPane.java
  96. 3
      designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java
  97. 3
      designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/entity/FileEntityBuilder.java
  98. 4
      designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareLoginLabel.java
  99. 10
      designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java
  100. 1
      designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java
  101. Some files were not shown because too many files have changed in this diff Show More

122
designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@ -18,6 +18,8 @@ import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.i18n.Toolkit;
import com.fr.design.locale.impl.ProductImproveMark;
import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
import com.fr.design.login.DesignerLoginType;
import com.fr.design.login.config.DesignerLoginConfigManager;
import com.fr.design.mainframe.vcs.VcsConfigManager;
import com.fr.design.notification.SnapChatConfig;
import com.fr.design.port.DesignerPortContext;
@ -195,6 +197,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
private ComponentReuseNotificationInfo notificationInfo = ComponentReuseNotificationInfo.getInstance();
private DesignerLoginConfigManager designerLoginConfigManager = DesignerLoginConfigManager.getInstance();
/**
* DesignerEnvManager.
*/
@ -738,6 +742,113 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
designerPushUpdateConfigManager.setAutoPushUpdateEnabled(autoPushUpdateEnabled);
}
/**
* 设计器登录相关配置
*/
public void setDesignerLoginUid(int uid) {
designerLoginConfigManager.setUid(uid);
}
public int getDesignerLoginUid() {
return designerLoginConfigManager.getUid();
}
public void setDesignerLoginUsername(String username) {
designerLoginConfigManager.setUsername(username);
}
public String getDesignerLoginUsername() {
return designerLoginConfigManager.getUsername();
}
public void setDesignerLoginAppId(String appId) {
designerLoginConfigManager.setAppId(appId);
}
public String getDesignerLoginAppId() {
return designerLoginConfigManager.getAppId();
}
public void setDesignerLoginRefreshToken(String refreshToken) {
designerLoginConfigManager.setRefreshToken(refreshToken);
}
public String getDesignerLoginRefreshToken() {
return designerLoginConfigManager.getRefreshToken();
}
public void setDesignerLoginDoNotRemind(boolean doNotRemind) {
designerLoginConfigManager.setDoNotRemind(doNotRemind);
}
public boolean isDesignerLoginDoNotRemind() {
return designerLoginConfigManager.isDoNotRemind();
}
public void setDesignerLoginDoNotRemindSelectedTime(long doNotRemindSelectedTime) {
designerLoginConfigManager.setDoNotRemindSelectedTime(doNotRemindSelectedTime);
}
public long getDesignerLoginDoNotRemindSelectedTime() {
return designerLoginConfigManager.getDoNotRemindSelectedTime();
}
public void setDesignerActivatedTime(long designerActivatedTime) {
designerLoginConfigManager.setDesignerActivatedTime(designerActivatedTime);
}
public long getDesignerActivatedTime() {
return designerLoginConfigManager.getDesignerActivatedTime();
}
public void setDesignerLastLoginTime(long lastLoginTime) {
designerLoginConfigManager.setLastLoginTime(lastLoginTime);
}
public long getDesignerLastLoginTime() {
return designerLoginConfigManager.getLastLoginTime();
}
public void setCurrentVersionFirstLaunch(boolean currentVersionFirstLaunch) {
designerLoginConfigManager.setCurrentVersionFirstLaunch(currentVersionFirstLaunch);
}
public boolean isCurrentVersionFirstLaunch() {
return designerLoginConfigManager.isCurrentVersionFirstLaunch();
}
public DesignerLoginType getLastLoginType() {
return designerLoginConfigManager.getLastLoginType();
}
public void setLastLoginType(DesignerLoginType lastLoginType) {
designerLoginConfigManager.setLastLoginType(lastLoginType);
}
public String getLastLoginAccount() {
return designerLoginConfigManager.getLastLoginAccount();
}
public void setLastLoginAccount(String lastLoginAccount) {
designerLoginConfigManager.setLastLoginAccount(lastLoginAccount);
}
public boolean isLoginRemindBeforeJumpBBS() {
return designerLoginConfigManager.isLoginRemindBeforeJumpBBS();
}
public void setLoginRemindBeforeJumpBBS(boolean loginRemindBeforeJumpBBS) {
designerLoginConfigManager.setLoginRemindBeforeJumpBBS(loginRemindBeforeJumpBBS);
}
public boolean isPluginRemindOnFirstLaunch() {
return designerLoginConfigManager.isPluginRemindOnFirstLaunch();
}
public void setPluginRemindOnFirstLaunch(boolean pluginRemindOnFirstLaunch) {
designerLoginConfigManager.setPluginRemindOnFirstLaunch(pluginRemindOnFirstLaunch);
}
/**
* 内置服务器是否使用时启动
*
@ -1579,6 +1690,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
readDesignerPort(reader);
} else if (name.equals(SnapChatConfig.XML_TAG)) {
readSnapChatConfig(reader);
} else if (name.equals(DesignerLoginConfigManager.XML_TAG)) {
readDesignerLoginAttr(reader);
} else {
readLayout(reader, name);
}
@ -1811,6 +1924,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
writeDesignerPort(writer);
writeSnapChatConfig(writer);
writeComponentReuseNotificationInfo(writer);
writeDesignerLoginAttr(writer);
writer.end();
}
@ -2088,6 +2202,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
this.vcsConfigManager = vcsConfigManager;
}
private void readDesignerLoginAttr(XMLableReader reader) {
reader.readXMLObject(designerLoginConfigManager);
}
private void writeDesignerLoginAttr(XMLPrintWriter writer) {
this.designerLoginConfigManager.writeXML(writer);
}
enum XmlHandler {
Self;
public void handle(Throwable throwable) {

65
designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java

@ -1,54 +1,43 @@
package com.fr.design.actions.community;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.login.AbstractDesignerSSO;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
import javax.swing.*;
import java.awt.event.ActionEvent;
public class BBSAction extends AbstractDesignerSSO {
public class BBSAction extends UpdateAction
{
public BBSAction() {
this.setMenuKeySet(BBS);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/bbs/bbs");
public BBSAction()
{
this.setMenuKeySet(BBS);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/bbs/bbs");
}
}
/**
* 动作
* @param arg0 事件
*/
@Override
public void actionPerformed(ActionEvent arg0)
{
String url = CloudCenter.getInstance().acquireUrlByKind("bbs");
BrowseUtils.browser(url);
public String getJumpUrl() {
return CloudCenter.getInstance().acquireUrlByKind("bbs");
}
public static final MenuKeySet BBS = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'B';
}
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Bbs");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
public static final MenuKeySet BBS = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'B';
}
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Bbs");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
}

60
designer-base/src/main/java/com/fr/design/actions/community/BugAction.java

@ -1,50 +1,42 @@
package com.fr.design.actions.community;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.login.AbstractDesignerSSO;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
import javax.swing.*;
import java.awt.event.ActionEvent;
public class BugAction extends AbstractDesignerSSO {
public class BugAction extends UpdateAction
{
public BugAction() {
this.setMenuKeySet(BUG);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/bbs/bug");
}
public BugAction()
{ this.setMenuKeySet(BUG);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/bbs/bug");
}
@Override
public void actionPerformed(ActionEvent arg0)
{
String url = CloudCenter.getInstance().acquireUrlByKind("bbs.bugs");
BrowseUtils.browser(url);
@Override
public String getJumpUrl() {
return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs");
}
}
public static final MenuKeySet BUG = new MenuKeySet() {
public static final MenuKeySet BUG = new MenuKeySet() {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Bug");
}
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Bug");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
@Override
public char getMnemonic()
{
@Override
public char getMnemonic() {
return 'U';
}
};
return 'U';
}
};
}

17
designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java

@ -1,33 +1,26 @@
package com.fr.design.actions.community;
import com.fr.base.svg.IconUtils;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
import javax.swing.KeyStroke;
import java.awt.event.ActionEvent;
/**
* Created by XINZAI on 2018/8/23.
*/
public class CenterAction extends UpAction{
public CenterAction()
{
public class CenterAction extends UpAction {
public CenterAction() {
this.setMenuKeySet(CENTER);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/bbs/center");
}
@Override
public void actionPerformed(ActionEvent arg0)
{
String url = CloudCenter.getInstance().acquireUrlByKind("bbs.center");
BrowseUtils.browser(url);
public String getJumpUrl() {
return CloudCenter.getInstance().acquireUrlByKind("bbs.center");
}
public static final MenuKeySet CENTER = new MenuKeySet() {
@Override
public char getMnemonic() {

72
designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java

@ -1,49 +1,41 @@
package com.fr.design.actions.community;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.login.AbstractDesignerSSO;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
import javax.swing.*;
import java.awt.event.ActionEvent;
public class NeedAction extends UpdateAction
{
public NeedAction()
{
this.setMenuKeySet(NEED);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/bbs/need");
}
@Override
public void actionPerformed(ActionEvent arg0)
{
String url = CloudCenter.getInstance().acquireUrlByKind("bbs.needs");
BrowseUtils.browser(url);
}
public static final MenuKeySet NEED = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'N';
}
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Commuinity_Need");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
public class NeedAction extends AbstractDesignerSSO {
public NeedAction() {
this.setMenuKeySet(NEED);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/bbs/need");
}
@Override
public String getJumpUrl() {
return CloudCenter.getInstance().acquireUrlByKind("bbs.needs");
}
public static final MenuKeySet NEED = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'N';
}
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Commuinity_Need");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
}

13
designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java

@ -1,16 +1,12 @@
package com.fr.design.actions.community;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.login.AbstractDesignerSSO;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
import javax.swing.*;
import java.awt.event.ActionEvent;
public class QuestionAction extends UpdateAction {
public class QuestionAction extends AbstractDesignerSSO {
public QuestionAction() {
this.setMenuKeySet(QUESTIONS);
@ -21,9 +17,8 @@ public class QuestionAction extends UpdateAction {
}
@Override
public void actionPerformed(ActionEvent arg0) {
String url = CloudCenter.getInstance().acquireUrlByKind("bbs.questions");
BrowseUtils.browser(url);
public String getJumpUrl() {
return CloudCenter.getInstance().acquireUrlByKind("bbs.questions");
}
public static final MenuKeySet QUESTIONS = new MenuKeySet() {

70
designer-base/src/main/java/com/fr/design/actions/community/SignAction.java

@ -1,49 +1,41 @@
package com.fr.design.actions.community;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.login.AbstractDesignerSSO;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
import javax.swing.*;
import java.awt.event.ActionEvent;
public class SignAction extends UpdateAction
{
public SignAction()
{
this.setMenuKeySet(SIGN);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/bbs/sign");
}
@Override
public void actionPerformed(ActionEvent arg0)
{
String url = CloudCenter.getInstance().acquireUrlByKind("bbs.aut");
BrowseUtils.browser(url);
}
public static final MenuKeySet SIGN = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'S';
}
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_sign");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
public class SignAction extends AbstractDesignerSSO {
public SignAction() {
this.setMenuKeySet(SIGN);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/bbs/sign");
}
@Override
public String getJumpUrl() {
return CloudCenter.getInstance().acquireUrlByKind("bbs.aut");
}
public static final MenuKeySet SIGN = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'S';
}
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_sign");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
}

21
designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java

@ -1,23 +1,16 @@
package com.fr.design.actions.community;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.login.AbstractDesignerSSO;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
import javax.swing.KeyStroke;
import java.awt.event.ActionEvent;
/**
* Created by XINZAI on 2018/8/23.
*/
public class TechSolutionAction extends UpdateAction{
public TechSolutionAction()
{
public class TechSolutionAction extends AbstractDesignerSSO {
public TechSolutionAction() {
this.setMenuKeySet(TSO);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
@ -26,12 +19,10 @@ public class TechSolutionAction extends UpdateAction{
}
@Override
public void actionPerformed(ActionEvent arg0)
{
String url = CloudCenter.getInstance().acquireUrlByKind("bbs.solution");
BrowseUtils.browser(url);
public String getJumpUrl() {
return CloudCenter.getInstance().acquireUrlByKind("bbs.solution");
}
public static final MenuKeySet TSO = new MenuKeySet() {
@Override
public char getMnemonic() {

80
designer-base/src/main/java/com/fr/design/actions/community/UpAction.java

@ -1,69 +1,41 @@
package com.fr.design.actions.community;
import com.fr.base.BaseUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.login.AbstractDesignerSSO;
import com.fr.design.menu.MenuKeySet;
import com.fr.general.CloudCenter;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils;
import javax.swing.JOptionPane;
import javax.swing.KeyStroke;
import java.awt.Desktop;
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
public class UpAction extends UpdateAction
{
public class UpAction extends AbstractDesignerSSO {
public UpAction()
{
this.setMenuKeySet(UPDATE);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/update.png"));
}
public UpAction() {
this.setMenuKeySet(UPDATE);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/update.png"));
}
@Override
public void actionPerformed(ActionEvent arg0)
{
String url = CloudCenter.getInstance().acquireUrlByKind("bbs.update");
if (StringUtils.isEmpty(url)) {
FineLoggerFactory.getLogger().info("The URL is empty!");
return;
}
try {
Desktop.getDesktop().browse(new URI(url));
} catch (IOException exp) {
FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
} catch (URISyntaxException exp) {
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
} catch (Exception exp) {
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
FineLoggerFactory.getLogger().error("Can not open the browser for URL: " + url);
}
public String getJumpUrl() {
return CloudCenter.getInstance().acquireUrlByKind("bbs.update");
}
public static final MenuKeySet UPDATE = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'U';
}
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Update");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
public static final MenuKeySet UPDATE = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'U';
}
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Update");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
}

60
designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java

@ -1,49 +1,43 @@
package com.fr.design.actions.community;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.locale.impl.VideoMark;
import com.fr.design.login.AbstractDesignerSSO;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.locale.LocaleCenter;
import com.fr.general.locale.LocaleMark;
import javax.swing.*;
import java.awt.event.ActionEvent;
public class VideoAction extends AbstractDesignerSSO {
public class VideoAction extends UpdateAction
{
public VideoAction()
{
this.setMenuKeySet(VIDEO);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/bbs/video");
}
public VideoAction() {
this.setMenuKeySet(VIDEO);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/bbs/video");
}
@Override
public void actionPerformed(ActionEvent arg0)
{
public String getJumpUrl() {
LocaleMark<String> localeMark = LocaleCenter.getMark(VideoMark.class);
BrowseUtils.browser(localeMark.getValue());
return localeMark.getValue();
}
public static final MenuKeySet VIDEO = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'V';
}
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Video");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
public static final MenuKeySet VIDEO = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'V';
}
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Video");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
}

9
designer-base/src/main/java/com/fr/design/actions/community/WorkOrderCenterAction.java

@ -1,12 +1,8 @@
package com.fr.design.actions.community;
import com.fr.design.i18n.Toolkit;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
import java.awt.event.ActionEvent;
/**
* @Description 工单中心
* @Author Henry.Wang
@ -19,8 +15,7 @@ public class WorkOrderCenterAction extends UpAction {
}
@Override
public void actionPerformed(ActionEvent arg0) {
String url = CloudCenter.getInstance().acquireUrlByKind("bbs.work.order.center");
BrowseUtils.browser(url);
public String getJumpUrl() {
return CloudCenter.getInstance().acquireUrlByKind("bbs.work.order.center");
}
}

31
designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java

@ -1,12 +1,10 @@
package com.fr.design.actions.help;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.login.AbstractDesignerSSO;
import com.fr.design.menu.MenuKeySet;
import com.fr.general.CloudCenter;
import com.fr.general.GeneralContext;
import com.fr.general.http.HttpToolbox;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.CommonUtils;
import com.fr.stable.ProductConstants;
import com.fr.stable.StringUtils;
@ -15,14 +13,9 @@ import com.fr.third.org.apache.http.StatusLine;
import com.fr.third.org.apache.http.client.methods.HttpGet;
import javax.swing.KeyStroke;
import java.awt.Desktop;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.net.URI;
public class TutorialAction extends UpdateAction {
private static final String URL_FOR_TEST_NETWORK = "https://www.baidu.com";
public class TutorialAction extends AbstractDesignerSSO {
public TutorialAction() {
this.setMenuKeySet(HELP_TUTORIAL);
@ -32,29 +25,15 @@ public class TutorialAction extends UpdateAction {
this.setAccelerator(getMenuKeySet().getKeyStroke());
}
/**
* 动作
* @param evt 事件
*/
@Override
public void actionPerformed(ActionEvent evt) {
String helpURL = CloudCenter.getInstance().acquireUrlByKind(createDocKey());
// 用第三方网址去判断是否处在离线状态
if (isServerOnline(URL_FOR_TEST_NETWORK)) {
try {
Desktop.getDesktop().browse(new URI(helpURL));
return;
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
}
FineLoggerFactory.getLogger().warn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Offline_Helptutorial_Msg"));
public String getJumpUrl() {
return CloudCenter.getInstance().acquireUrlByKind(createDocKey());
}
// 生成帮助文档 sitecenter key, help.zh_CN.10
protected String createDocKey() {
String locale = GeneralContext.getLocale().toString();
return CommonUtils.join(new String[]{ "help", locale, ProductConstants.MAIN_VERSION }, ".");
return CommonUtils.join(new String[]{"help", locale, ProductConstants.MAIN_VERSION}, ".");
}
// 判断是否可以访问在线文档

3
designer-base/src/main/java/com/fr/design/constants/UIConstants.java

@ -148,7 +148,8 @@ public interface UIConstants {
public static final Color TAB_BUTTON_PRESS_SELECTED = new Color(236, 236, 238);
public static final Color POPUP_TITLE_BACKGROUND = new Color(0xd8f2fd);
public static final Color LIST_ITEM_SPLIT_LINE = new Color(0xf0f0f3);
public static final Color DESIGNER_LOGIN_BACKGROUND = new Color(0xf1ad14);
public static final Color DESIGNER_LOGIN_BACKGROUND_ONCLICK = new Color(0xd89600);
public static final BufferedImage DRAG_BAR = IOUtils.readImage("com/fr/design/images/control/bar.png");
public static final BufferedImage DRAG_BAR_LIGHT = IOUtils.readImage("com/fr/design/images/control/bar-light.png");

4
designer-base/src/main/java/com/fr/design/extra/LoginContextListener.java

@ -1,8 +1,10 @@
package com.fr.design.extra;
import com.fr.design.login.DesignerLoginSource;
/**
* Created by lp on 2016/8/16.
*/
public interface LoginContextListener {
void showLoginContext();
void showLoginContext(DesignerLoginSource source);
}

38
designer-base/src/main/java/com/fr/design/extra/LoginWebBridge.java

@ -1,13 +1,15 @@
package com.fr.design.extra;
import com.fr.base.passport.FinePassportManager;
import com.fr.concurrent.NamedThreadFactory;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.UIDialog;
import com.fr.design.extra.exe.PluginLoginExecutor;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.locale.impl.BbsRegisterMark;
import com.fr.design.locale.impl.BbsResetMark;
import com.fr.design.login.service.DesignerLoginClient;
import com.fr.design.login.service.DesignerLoginResult;
import com.fr.general.CloudCenter;
import com.fr.general.http.HttpClient;
import com.fr.general.locale.LocaleCenter;
@ -80,17 +82,15 @@ public class LoginWebBridge {
*/
public void setMessageCount(int count) {
if (count == MIN_MESSAGE_COUNT) {
uiLabel.setText(MarketConfig.getInstance().getBbsUsername());
MarketConfig.getInstance().setInShowBBsName(MarketConfig.getInstance().getBbsUsername());
MarketConfig.getInstance().setInShowBBsName(DesignerEnvManager.getEnvManager().getDesignerLoginUsername());
return;
}
this.messageCount = count;
StringBuilder sb = new StringBuilder();
sb.append(StringUtils.BLANK).append(MarketConfig.getInstance().getBbsUsername())
sb.append(StringUtils.BLANK).append(DesignerEnvManager.getEnvManager().getDesignerLoginUsername())
.append("(").append(this.messageCount)
.append(")").append(StringUtils.BLANK);
MarketConfig.getInstance().setInShowBBsName(sb.toString());
uiLabel.setText(sb.toString());
}
public void setQQDialog(UIDialog qqDialog) {
@ -163,20 +163,11 @@ public class LoginWebBridge {
* @return 登录信息标志
*/
public String login(String userInfo, String password) {
if (!StringUtils.isNotBlank(userInfo) && !StringUtils.isNotBlank(password)) {
return LOGIN_INFO_EMPTY;
}
if (!testConnection()) {
return NET_FAILED;
}
int uid = 0;
try {
uid = FinePassportManager.getInstance().login(userInfo, password);
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
DesignerLoginClient client = new DesignerLoginClient();
DesignerLoginResult result = client.login(userInfo, password);
int uid = result.getUid();
if (uid > 0) {
loginSuccess(MarketConfig.getInstance().getBbsUsername());
closeWindow();
}
return String.valueOf(uid);
}
@ -191,17 +182,6 @@ public class LoginWebBridge {
}
}
/**
* 关闭窗口并且重新赋值
*
* @param username 用户名
*/
private void loginSuccess(String username) {
closeWindow();
uiLabel.setText(username);
uiLabel.setBackground(LOGIN_BACKGROUND);
}
/**
* 关闭QQ授权窗口
*/

6
designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java

@ -1,6 +1,6 @@
package com.fr.design.extra;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.tradition.callback.UpdateOnlineCallback;
import com.fr.design.gui.frpane.UITabbedPane;
@ -190,10 +190,10 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
}
private void doUpdateOnline(final PluginStatusCheckCompletePane pane) {
if (!StringUtils.isNotEmpty(MarketConfig.getInstance().getBbsUsername())) {
if (!StringUtils.isNotEmpty(DesignerEnvManager.getEnvManager().getDesignerLoginUsername())) {
LoginCheckContext.fireLoginCheckListener();
}
if (StringUtils.isNotEmpty(MarketConfig.getInstance().getBbsUsername())) {
if (StringUtils.isNotEmpty(DesignerEnvManager.getEnvManager().getDesignerLoginUsername())) {
PluginView plugin = controlPane.getSelectedPlugin();
if (plugin == null) {
FineLoggerFactory.getLogger().error("selected plugin is null");

12
designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java

@ -1,6 +1,6 @@
package com.fr.design.extra;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.bridge.exec.JSCallback;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.exe.callback.InstallFromDiskCallback;
@ -9,7 +9,6 @@ import com.fr.design.extra.exe.callback.ModifyStatusCallback;
import com.fr.design.extra.exe.callback.UninstallPluginCallback;
import com.fr.design.extra.exe.callback.UpdateFromDiskCallback;
import com.fr.design.extra.exe.callback.UpdateOnlineCallback;
import com.fr.design.gui.ilable.UILabel;
import com.fr.general.CloudCenter;
import com.fr.general.http.HttpClient;
import com.fr.json.JSONArray;
@ -193,15 +192,12 @@ public class PluginOperateUtils {
}
}
public static void getLoginInfo(JSCallback jsCallback, UILabel uiLabel) {
String username = MarketConfig.getInstance().getBbsUsername();
public static void getLoginInfo(JSCallback jsCallback) {
String username = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
if (StringUtils.isEmpty(username)) {
jsCallback.execute(StringUtils.EMPTY);
uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn"));
} else {
uiLabel.setText(username);
String result = username;
jsCallback.execute(result);
jsCallback.execute(username);
}
}

6
designer-base/src/main/java/com/fr/design/extra/PluginUpdatePane.java

@ -1,6 +1,6 @@
package com.fr.design.extra;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.tradition.callback.UpdateOnlineCallback;
import com.fr.design.gui.frpane.UITabbedPane;
@ -170,10 +170,10 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
}
private void doUpdateOnline(final PluginStatusCheckCompletePane pane) {
if (!StringUtils.isNotEmpty(MarketConfig.getInstance().getBbsUsername())) {
if (!StringUtils.isNotEmpty(DesignerEnvManager.getEnvManager().getDesignerLoginUsername())) {
LoginCheckContext.fireLoginCheckListener();
}
if (StringUtils.isNotEmpty(MarketConfig.getInstance().getBbsUsername())) {
if (StringUtils.isNotEmpty(DesignerEnvManager.getEnvManager().getDesignerLoginUsername())) {
try {
PluginView plugin = controlPane.getSelectedPlugin();
PluginMarker pluginMarker = PluginMarker.create(plugin.getID(), plugin.getVersion());

21
designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java

@ -1,7 +1,7 @@
package com.fr.design.extra;
import com.fr.base.passport.FinePassportManager;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.RestartHelper;
import com.fr.design.bridge.exec.JSCallback;
import com.fr.design.dialog.UIDialog;
@ -12,13 +12,12 @@ import com.fr.design.extra.exe.GetPluginPrefixExecutor;
import com.fr.design.extra.exe.PluginLoginExecutor;
import com.fr.design.extra.exe.ReadUpdateOnlineExecutor;
import com.fr.design.extra.exe.SearchOnlineExecutor;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.locale.impl.BbsRegisterMark;
import com.fr.design.locale.impl.BbsResetMark;
import com.fr.design.locale.impl.BbsSpaceMark;
import com.fr.design.login.DesignerLoginSource;
import com.fr.design.plugin.DesignerPluginContext;
import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
import com.fr.general.CloudCenter;
import com.fr.general.locale.LocaleCenter;
import com.fr.general.locale.LocaleMark;
import com.fr.json.JSONObject;
@ -66,8 +65,6 @@ public class PluginWebBridge {
private Map<String, Object> config;
private WebEngine webEngine;
private UILabel uiLabel;
private ExecutorService threadPoolExecutor = new ThreadPoolExecutor(COREPOOLSIZE, MAXPOOLSIZE,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(COREPOOLSIZE),
@ -423,7 +420,7 @@ public class PluginWebBridge {
*/
public String getLoginInfo(final JSObject callback) {
registerLoginInfo(callback);
return MarketConfig.getInstance().getBbsUsername();
return DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
}
/**
@ -433,7 +430,7 @@ public class PluginWebBridge {
*/
public void registerLoginInfo(final JSObject callback) {
JSCallback jsCallback = new JSCallback(PluginJavaFxExecutor.create(webEngine, callback));
PluginOperateUtils.getLoginInfo(jsCallback, uiLabel);
PluginOperateUtils.getLoginInfo(jsCallback);
}
/**
@ -455,7 +452,7 @@ public class PluginWebBridge {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
UserLoginContext.fireLoginContextListener();
UserLoginContext.fireLoginContextListener(DesignerLoginSource.NORMAL);
}
});
}
@ -526,10 +523,6 @@ public class PluginWebBridge {
}
}
public void setUILabel(UILabel uiLabel) {
this.uiLabel = uiLabel;
}
/**
* 设计器端的用户登录
*
@ -546,7 +539,7 @@ public class PluginWebBridge {
* 通过QQ登录后通知登录
*/
public void ucsynLogin(long uid, String username, String password, final JSONObject callback) {
uiLabel.setText(username);
}
/**
@ -554,8 +547,6 @@ public class PluginWebBridge {
*/
public void clearUserInfo() {
MarketConfig.getInstance().setInShowBBsName(StringUtils.EMPTY);
FinePassportManager.getInstance().logout();
uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn"));
}
public void getPackInfo(final JSObject callback){

5
designer-base/src/main/java/com/fr/design/extra/UserLoginContext.java

@ -1,5 +1,6 @@
package com.fr.design.extra;
import com.fr.design.login.DesignerLoginSource;
import java.util.ArrayList;
/**
@ -11,9 +12,9 @@ public class UserLoginContext {
/**
* 触发登录框弹出的监听器
*/
public static void fireLoginContextListener() {
public static void fireLoginContextListener(DesignerLoginSource source) {
for (LoginContextListener l : fireLoginContextListener) {
l.showLoginContext();
l.showLoginContext(source);
}
}

2
designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java

@ -5,6 +5,7 @@ import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.dialog.UIDialog;
import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.design.login.utils.DesignerLoginUtils;
import com.fr.design.mainframe.DesignerContext;
import com.fr.general.CloudCenter;
import com.fr.general.CommonIOUtils;
@ -206,6 +207,7 @@ public class WebViewDlgHelper {
UIDialog dlg = new ShopDialog(DesignerContext.getDesignerFrame(), managerPane);
PluginWebBridge.getHelper().setDialogHandle(dlg);
dlg.setVisible(true);
DesignerLoginUtils.showPluginRemindOnFirstLaunch();
} catch (Exception e) {
// ignored
FineLoggerFactory.getLogger().error(e.getMessage(), e);

7
designer-base/src/main/java/com/fr/design/extra/exe/PluginLoginExecutor.java

@ -2,6 +2,7 @@ package com.fr.design.extra.exe;
import com.fr.design.extra.LoginWebBridge;
import com.fr.design.extra.Process;
import com.fr.design.login.service.DesignerPassportManager;
/**
* @author vito
@ -34,7 +35,11 @@ public class PluginLoginExecutor implements Executor {
@Override
public void run(Process<String> process) {
result = LoginWebBridge.getHelper().login(username, password);
int uid = DesignerPassportManager.getInstance().login(username, password);
if (uid > 0) {
LoginWebBridge.getHelper().closeWindow();
}
result = String.valueOf(uid);
}
}
};

92
designer-base/src/main/java/com/fr/design/login/AbstractDesignerSSO.java

@ -0,0 +1,92 @@
package com.fr.design.login;
import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.UpdateAction;
import com.fr.design.os.impl.SupportOSImpl;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
import com.fr.general.log.MessageFormatter;
import com.fr.json.JSONObject;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils;
import com.fr.third.org.bouncycastle.util.encoders.Hex;
import java.awt.event.ActionEvent;
import java.security.SecureRandom;
import java.util.HashMap;
import java.util.Map;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/6/7
*/
public abstract class AbstractDesignerSSO extends UpdateAction {
private static final String PRODUCT_FINEREPORT = "product-finereport";
private static final String KEY = "i7hP48WAcuTrmxfN";
@Override
public void actionPerformed(ActionEvent event) {
String url = getJumpUrl();
if (!SupportOSImpl.DESIGNER_LOGIN.support()) {
BrowseUtils.browser(url);
return;
}
DesignerEnvManager manager = DesignerEnvManager.getEnvManager();
int uid = manager.getDesignerLoginUid();
if (uid > 0) {
String ssoUrl = CloudCenter.getInstance().acquireUrlByKind("designer.sso.api", "https://id.fanruan.com/api/app/?code={}&referrer={}");
try {
String code = generateLoginCode();
MessageFormatter.FormattingTuple tuple = MessageFormatter.arrayFormat(ssoUrl, new String[]{code, url});
BrowseUtils.browser(tuple.getMessage());
} catch (Exception e) {
BrowseUtils.browser(url);
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
} else {
boolean loginRemindBeforeJumpBBS = manager.isLoginRemindBeforeJumpBBS();
if (loginRemindBeforeJumpBBS) {
Map<String, String> params = new HashMap<>();
params.put("bbsJumpUrl", url);
DesignerLoginHelper.showLoginDialog(DesignerLoginSource.BBS_JUMP, params);
manager.setLoginRemindBeforeJumpBBS(false);
} else {
BrowseUtils.browser(url);
}
}
}
private String generateLoginCode() throws Exception {
DesignerEnvManager manager = DesignerEnvManager.getEnvManager();
JSONObject jo = JSONObject.create();
jo.put("uid", manager.getDesignerLoginUid());
jo.put("username", manager.getDesignerLoginUsername());
jo.put("source", PRODUCT_FINEREPORT);
byte[] iv = randomIv();
return new String(Hex.encode(iv)) + encrypt(jo.toString(), KEY.getBytes(), iv);
}
private static byte[] randomIv() {
byte[] salt = new byte[16];
SecureRandom secureRandom = new SecureRandom();
secureRandom.setSeed(System.currentTimeMillis());
secureRandom.nextBytes(salt);
return salt;
}
public static String encrypt(String content, byte[] key, byte[] iv) throws Exception {
SecretKeySpec secretKeySpec = new SecretKeySpec(key, "AES");
Cipher cipher = Cipher.getInstance("AES/CTR/PKCS5Padding");
IvParameterSpec ivParameterSpec = new IvParameterSpec(iv);
cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec);
byte[] resultBytes = cipher.doFinal(content.getBytes());
return new String(Hex.encode(resultBytes));
}
public abstract String getJumpUrl();
}

280
designer-base/src/main/java/com/fr/design/login/DesignerLoginBridge.java

@ -0,0 +1,280 @@
package com.fr.design.login;
import com.fr.design.bridge.exec.JSBridge;
import com.fr.design.bridge.exec.JSCallback;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ilable.ActionLabel;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.locale.impl.BbsResetMark;
import com.fr.design.login.executor.DesignerLoginBrowserExecutor;
import com.fr.design.login.executor.DesignerLoginExecutor;
import com.fr.design.login.executor.DesignerSendCaptchaExecutor;
import com.fr.design.login.executor.DesignerSmsLoginExecutor;
import com.fr.design.login.executor.DesignerSmsRegisterExecutor;
import com.fr.design.login.task.DesignerLoginTaskWorker;
import com.fr.design.mainframe.toast.DesignerToastMsgUtil;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
import com.fr.general.locale.LocaleCenter;
import com.fr.general.locale.LocaleMark;
import com.fr.log.FineLoggerFactory;
import com.teamdev.jxbrowser.chromium.Browser;
import com.teamdev.jxbrowser.chromium.JSFunction;
import com.teamdev.jxbrowser.chromium.JSObject;
import java.awt.Desktop;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.net.URI;
import java.util.Map;
import java.util.Set;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
public class DesignerLoginBridge {
private Map<String, String> params;
public static DesignerLoginBridge getBridge(Browser browser, Map<String, String> params) {
return new DesignerLoginBridge(browser, params);
}
private JSObject window;
private DesignerLoginBridge(Browser browser, Map<String, String> params) {
this.params = params;
this.window = browser.executeJavaScriptAndReturnValue("window").asObject();
Set<Map.Entry<String, String>> entries = params.entrySet();
for (Map.Entry<String, String> entry : entries) {
this.window.setProperty(entry.getKey(), entry.getValue());
}
}
@JSBridge
public String i18nText(String key) {
return Toolkit.i18nText(key);
}
@JSBridge
public void closeWindow(boolean loginSuccess) {
DesignerLoginSource source = DesignerLoginSource.valueOf(Integer.parseInt(params.get("designerLoginSource")));
if (loginSuccess) {
if (source == DesignerLoginSource.GUIDE) {
DesignerToastMsgUtil.toastPrompt(
getHyperlinkPane(
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Guide_Login_Success_Title"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Guide_Login_Success_Hyperlink_Text"),
CloudCenter.getInstance().acquireUrlByKind("designer.premium.template", "https://market.fanruan.com/template")
)
);
} else if (source == DesignerLoginSource.BBS_JUMP) {
String bbsJumpUrl = params.get("bbsJumpUrl");
BrowseUtils.browser(bbsJumpUrl);
}
DesignerLoginHelper.closeWindow();
return;
}
if (source == DesignerLoginSource.SWITCH_ACCOUNT) {
DesignerLoginHelper.closeWindow();
return;
}
if (source == DesignerLoginSource.BBS_JUMP) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
String bbsJumpUrl = params.get("bbsJumpUrl");
String[] options = new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_BBS_Go_Directly"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Login_Return_Login")
};
int rv = FineJOptionPane.showConfirmDialog(
DesignerLoginHelper.getDialog(),
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_BBS_Quit_Tip"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.OK_CANCEL_OPTION,
JOptionPane.WARNING_MESSAGE,
null,
options,
options[1]
);
if (rv == JOptionPane.YES_OPTION) {
BrowseUtils.browser(bbsJumpUrl);
DesignerLoginHelper.closeWindow();
}
}
});
} else {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
String[] options = new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Login_Quit"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Login_Return_Login")
};
int rv = FineJOptionPane.showConfirmDialog(
DesignerLoginHelper.getDialog(),
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Login_Quit_Tip"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.OK_CANCEL_OPTION,
JOptionPane.WARNING_MESSAGE,
null,
options,
options[1]
);
if (rv == JOptionPane.OK_OPTION) {
DesignerLoginHelper.closeWindow();
}
}
});
}
}
/**
* 服务条款
*/
@JSBridge
public void serviceHref() {
try {
String url = CloudCenter.getInstance().acquireUrlByKind("designer.bbs.service.terms", "https://bbs.fanruan.com/thread-102821-1-1.html");
Desktop.getDesktop().browse(new URI(url));
} catch (Exception e) {
FineLoggerFactory.getLogger().info(e.getMessage());
}
}
/**
* 忘记密码
*/
@JSBridge
public void forgetHref() {
try {
LocaleMark<String> resetMark = LocaleCenter.getMark(BbsResetMark.class);
Desktop.getDesktop().browse(new URI(resetMark.getValue()));
} catch (Exception e) {
FineLoggerFactory.getLogger().info(e.getMessage());
}
}
/**
* 设计器端的用户登录
*
* @param username 用户名
* @param password 密码
* @param callback 回调函数
*/
@JSBridge
public void normalLogin(String username, String password, final JSFunction callback) {
DesignerLoginTaskWorker<Void> worker = new DesignerLoginTaskWorker<>(
new JSCallback(DesignerLoginBrowserExecutor.create(window, callback)),
new DesignerLoginExecutor(username, password));
worker.execute();
}
/**
* 发送短信验证码
*
* @param regionCode 区号
* @param phone 手机
* @param callback 回调函数
*/
@JSBridge
public void sendCaptcha(String regionCode, String phone, final JSFunction callback) {
DesignerLoginTaskWorker<Void> worker = new DesignerLoginTaskWorker<>(
new JSCallback(DesignerLoginBrowserExecutor.create(window, callback)),
new DesignerSendCaptchaExecutor(regionCode, phone));
worker.execute();
}
/**
* 设计器端的短信登录
*
* @param regionCode 区号
* @param phone 手机
* @param code 验证码
* @param callback 回调函数
*/
@JSBridge
public void smsLogin(String regionCode, String phone, String code, final JSFunction callback) {
DesignerLoginTaskWorker<Void> worker = new DesignerLoginTaskWorker<>(
new JSCallback(DesignerLoginBrowserExecutor.create(window, callback)),
new DesignerSmsLoginExecutor(regionCode, phone, code));
worker.execute();
}
/**
* 设计器端的用户注册
*
* @param regionCode 区号
* @param phone 手机
* @param password 密码
* @param regToken 注册令牌
* @param callback 回调函数
*/
@JSBridge
public void smsRegister(String regionCode, String phone, String password, String regToken, final JSFunction callback) {
DesignerLoginTaskWorker<Void> worker = new DesignerLoginTaskWorker<>(
new JSCallback(DesignerLoginBrowserExecutor.create(window, callback)),
new DesignerSmsRegisterExecutor(regionCode, phone, password, regToken));
worker.execute();
}
/**
* 使用系统浏览器打开网页
*
* @param url 要打开的网页
*/
@JSBridge
public void openShopUrlAtWebBrowser(String url) {
if (Desktop.isDesktopSupported()) {
try {
//创建一个URI实例,注意不是URL
URI uri = URI.create(url);
//获取当前系统桌面扩展
Desktop desktop = Desktop.getDesktop();
//判断系统桌面是否支持要执行的功能
if (desktop.isSupported(Desktop.Action.BROWSE)) {
//获取系统默认浏览器打开链接
desktop.browse(uri);
}
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
}
}
/**
* 调整面板大小
*
* @param width
* @param height
*/
@JSBridge
public void resize(int width, int height) {
DesignerLoginHelper.getDialog().setSize(width, height);
}
private JPanel getHyperlinkPane(String title, String hyperlinkText, String hyperlink) {
ActionLabel actionLabel = new ActionLabel(hyperlinkText);
actionLabel.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
try {
Desktop.getDesktop().browse(new URI(hyperlink));
} catch (Exception ignore) {
}
}
});
JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
panel.add(new UILabel(title));
panel.add(actionLabel);
return panel;
}
}

104
designer-base/src/main/java/com/fr/design/login/DesignerLoginHelper.java

@ -0,0 +1,104 @@
package com.fr.design.login;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.UIDialog;
import com.fr.design.extra.WebViewDlgHelper;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.os.impl.SupportOSImpl;
import com.fr.design.update.ui.dialog.UpdateMainDialog;
import com.fr.general.GeneralContext;
import java.awt.Dialog;
import java.awt.Frame;
import java.awt.Window;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import javax.swing.JOptionPane;
import javax.swing.WindowConstants;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
public class DesignerLoginHelper {
private static final String MAIN_RESOURCE_PATH = "/com/fr/design/login/login.html";
private static final String JXBROWSER = "com.teamdev.jxbrowser.chromium.Browser";
private static UIDialog dialog = null;
public static String getMainResourcePath() {
return MAIN_RESOURCE_PATH;
}
public static UIDialog getDialog() {
return dialog;
}
public static void showLoginDialog(DesignerLoginSource source) {
showLoginDialog(source, new HashMap<>());
}
public static void showLoginDialog(DesignerLoginSource source, Map<String, String> params) {
showLoginDialog(source, params, DesignerContext.getDesignerFrame());
}
public static void showLoginDialog(DesignerLoginSource source, Map<String, String> params, Window window) {
if (!SupportOSImpl.DESIGNER_LOGIN.support()) {
WebViewDlgHelper.createLoginDialog(window);
return;
}
boolean hasJxBrowser = true;
try {
Class.forName(JXBROWSER);
} catch (ClassNotFoundException e) {
hasJxBrowser = false;
}
if (hasJxBrowser) {
showLoginPane(source, params, window);
} else {
showUpdatePane();
}
}
private static void showLoginPane(DesignerLoginSource source, Map<String, String> params, Window window) {
DesignerLoginPane designerLoginPane = new DesignerLoginPane(source, params);
if (dialog == null) {
if (window instanceof Dialog) {
dialog = new DesignerLoginShowDialog((Dialog) window, designerLoginPane);
} else if (window instanceof Frame) {
dialog = new DesignerLoginShowDialog((Frame) window, designerLoginPane);
} else {
return;
}
}
dialog.setVisible(true);
}
private static void showUpdatePane() {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Update_Info_Login_Message"));
if (!GeneralContext.getLocale().equals(Locale.JAPANESE) && !GeneralContext.getLocale().equals(Locale.JAPAN)
&& !Locale.getDefault().equals(Locale.JAPAN) && !Locale.getDefault().equals(Locale.JAPANESE)) {
UpdateMainDialog dialog = new UpdateMainDialog(DesignerContext.getDesignerFrame());
dialog.setAutoUpdateAfterInit();
dialog.showDialog();
}
}
public static void closeWindow() {
if (dialog != null) {
dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
dialog.setVisible(false);
dialog = null;
}
}
public static void main(String[] args) {
DesignerEnvManager.getEnvManager().setOpenDebug(true);
showLoginDialog(DesignerLoginSource.NORMAL);
}
}

42
designer-base/src/main/java/com/fr/design/login/DesignerLoginPane.java

@ -0,0 +1,42 @@
package com.fr.design.login;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.BasicPane;
import com.fr.design.login.utils.DesignerLoginUtils;
import com.fr.design.ui.ModernUIPane;
import com.teamdev.jxbrowser.chromium.JSValue;
import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
import java.awt.BorderLayout;
import java.util.Map;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
public class DesignerLoginPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return "DESIGNER_LOGIN";
}
public DesignerLoginPane(DesignerLoginSource source, Map<String, String> params) {
params.put("designerLoginSource", String.valueOf(source.getSource()));
params.put("lastLoginType", String.valueOf(DesignerEnvManager.getEnvManager().getLastLoginType().getType()));
params.put("lastLoginAccount", DesignerEnvManager.getEnvManager().getLastLoginAccount());
setLayout(new BorderLayout());
ModernUIPane<Object> modernUIPane = new ModernUIPane.Builder<>()
.prepare(new ScriptContextAdapter() {
@Override
public void onScriptContextCreated(ScriptContextEvent event) {
JSValue window = event.getBrowser().executeJavaScriptAndReturnValue("window");
window.asObject().setProperty("DesignerLoginHelper", DesignerLoginBridge.getBridge(event.getBrowser(), params));
}
})
.withEMB(DesignerLoginHelper.getMainResourcePath(), DesignerLoginUtils.renderMap())
.build();
add(modernUIPane, BorderLayout.CENTER);
}
}

45
designer-base/src/main/java/com/fr/design/login/DesignerLoginShowDialog.java

@ -0,0 +1,45 @@
package com.fr.design.login;
import com.fr.design.dialog.UIDialog;
import com.fr.design.utils.gui.GUICoreUtils;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dialog;
import java.awt.Dimension;
import java.awt.Frame;
import javax.swing.JPanel;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
public class DesignerLoginShowDialog extends UIDialog {
private static final Dimension DEFAULT = new Dimension(422, 478);
public DesignerLoginShowDialog(Frame frame, Component pane) {
super(frame);
init(pane);
}
public DesignerLoginShowDialog(Dialog dialog, Component pane) {
super(dialog);
init(pane);
}
private void init(Component pane) {
setUndecorated(true);
JPanel panel = (JPanel) getContentPane();
panel.setLayout(new BorderLayout());
add(pane, BorderLayout.CENTER);
setSize(DEFAULT);
GUICoreUtils.centerWindow(this);
setResizable(false);
}
@Override
public void checkValid() throws Exception {
}
}

29
designer-base/src/main/java/com/fr/design/login/DesignerLoginSource.java

@ -0,0 +1,29 @@
package com.fr.design.login;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/6/7
*/
public enum DesignerLoginSource {
NORMAL(0), GUIDE(1), SWITCH_ACCOUNT(2), BBS_JUMP(3), UNKNOWN(-1);
private int source;
DesignerLoginSource(int source) {
this.source = source;
}
public int getSource() {
return source;
}
public static DesignerLoginSource valueOf(int source) {
for(DesignerLoginSource value : DesignerLoginSource.values()) {
if(value.getSource() == source) {
return value;
}
}
return UNKNOWN;
}
}

29
designer-base/src/main/java/com/fr/design/login/DesignerLoginType.java

@ -0,0 +1,29 @@
package com.fr.design.login;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/6/4
*/
public enum DesignerLoginType {
NORMAL_LOGIN(0), SMS_LOGIN(1), UNKNOWN(-1);
private int type;
DesignerLoginType(int type) {
this.type = type;
}
public int getType() {
return type;
}
public static DesignerLoginType valueOf(int type) {
for(DesignerLoginType value : DesignerLoginType.values()) {
if(value.getType() == type) {
return value;
}
}
return UNKNOWN;
}
}

49
designer-base/src/main/java/com/fr/design/login/bean/BBSAccountLogin.java

@ -0,0 +1,49 @@
package com.fr.design.login.bean;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/6/3
*/
public class BBSAccountLogin {
private int uid;
private String username;
private String appId;
private String refreshToken;
public int getUid() {
return uid;
}
public void setUid(int uid) {
this.uid = uid;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getRefreshToken() {
return refreshToken;
}
public void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
}
}

226
designer-base/src/main/java/com/fr/design/login/config/DesignerLoginConfigManager.java

@ -0,0 +1,226 @@
package com.fr.design.login.config;
import com.fr.design.login.DesignerLoginType;
import com.fr.stable.StringUtils;
import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLReadable;
import com.fr.stable.xml.XMLWriter;
import com.fr.stable.xml.XMLableReader;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/6/2
*/
public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
public static final String XML_TAG = "DesignerLoginConfigManager";
private static DesignerLoginConfigManager singleton;
/**
* bbs uid
*/
private int uid = -1;
/**
* bbs 用户名
*/
private String username = StringUtils.EMPTY;
/**
* bbs 应用Id
*/
private String appId = StringUtils.EMPTY;
/**
* bbs refreshToken
*/
private String refreshToken = StringUtils.EMPTY;
/**
* 登录引导页一个月内不再提醒
*/
private boolean doNotRemind = false;
/**
* 登录引导页一个月内不再提醒
*/
private long doNotRemindSelectedTime = -1L;
/**
* 设计器激活时间
*/
private long designerActivatedTime = -1L;
/**
* bbs 上次登录时间
*/
private long lastLoginTime = -1L;
/**
* bbs 上次登录方式
*/
private DesignerLoginType lastLoginType = DesignerLoginType.UNKNOWN;
/**
* bbs 上次登录账号
*/
private String lastLoginAccount = StringUtils.EMPTY;
/**
* 当前版本第一次启动
*/
private boolean currentVersionFirstLaunch = true;
/**
* bbs跳转前的登录提醒
*/
private boolean loginRemindBeforeJumpBBS = true;
/**
* 插件管理第一次启动时的提醒
*/
private boolean pluginRemindOnFirstLaunch = true;
private DesignerLoginConfigManager() {
}
public static DesignerLoginConfigManager getInstance() {
if (singleton == null) {
singleton = new DesignerLoginConfigManager();
}
return singleton;
}
@Override
public void readXML(XMLableReader reader) {
if (reader.isAttr()) {
this.setUid(reader.getAttrAsInt("uid", -1));
this.setUsername(reader.getAttrAsString("username", StringUtils.EMPTY));
this.setAppId(reader.getAttrAsString("appId", StringUtils.EMPTY));
this.setRefreshToken(reader.getAttrAsString("refreshToken", StringUtils.EMPTY));
this.setDoNotRemind(reader.getAttrAsBoolean("doNotRemind", false));
this.setDoNotRemindSelectedTime(reader.getAttrAsLong("doNotRemindSelectedTime", -1L));
this.setDesignerActivatedTime(reader.getAttrAsLong("designerActivatedTime", -1L));
this.setLastLoginTime(reader.getAttrAsLong("lastLoginTime", -1L));
this.setCurrentVersionFirstLaunch(reader.getAttrAsBoolean("currentVersionFirstLaunch", true));
this.setLastLoginType(DesignerLoginType.valueOf(reader.getAttrAsInt("lastLoginType", -1)));
this.setLastLoginAccount(reader.getAttrAsString("lastLoginAccount", StringUtils.EMPTY));
this.setLoginRemindBeforeJumpBBS(reader.getAttrAsBoolean("loginRemindBeforeJumpBBS", true));
this.setPluginRemindOnFirstLaunch(reader.getAttrAsBoolean("pluginRemindOnFirstLaunch", true));
}
}
@Override
public void writeXML(XMLPrintWriter writer) {
writer.startTAG(XML_TAG);
writer.attr("uid", uid);
writer.attr("username", username);
writer.attr("appId", appId);
writer.attr("refreshToken", refreshToken);
writer.attr("doNotRemind", doNotRemind);
writer.attr("doNotRemindSelectedTime", doNotRemindSelectedTime);
writer.attr("designerActivatedTime", designerActivatedTime);
writer.attr("lastLoginTime", lastLoginTime);
writer.attr("currentVersionFirstLaunch", currentVersionFirstLaunch);
writer.attr("lastLoginType", lastLoginType.getType());
writer.attr("lastLoginAccount", lastLoginAccount);
writer.attr("loginRemindBeforeJumpBBS", loginRemindBeforeJumpBBS);
writer.attr("pluginRemindOnFirstLaunch", pluginRemindOnFirstLaunch);
writer.end();
}
public int getUid() {
return uid;
}
public void setUid(int uid) {
this.uid = uid;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getRefreshToken() {
return refreshToken;
}
public void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
}
public long getDoNotRemindSelectedTime() {
return doNotRemindSelectedTime;
}
public void setDoNotRemindSelectedTime(long doNotRemindSelectedTime) {
this.doNotRemindSelectedTime = doNotRemindSelectedTime;
}
public boolean isDoNotRemind() {
return doNotRemind;
}
public void setDoNotRemind(boolean doNotRemind) {
this.doNotRemind = doNotRemind;
}
public long getDesignerActivatedTime() {
return designerActivatedTime;
}
public void setDesignerActivatedTime(long designerActivatedTime) {
this.designerActivatedTime = designerActivatedTime;
}
public long getLastLoginTime() {
return lastLoginTime;
}
public void setLastLoginTime(long lastLoginTime) {
this.lastLoginTime = lastLoginTime;
}
public boolean isCurrentVersionFirstLaunch() {
return currentVersionFirstLaunch;
}
public void setCurrentVersionFirstLaunch(boolean currentVersionFirstLaunch) {
this.currentVersionFirstLaunch = currentVersionFirstLaunch;
}
public DesignerLoginType getLastLoginType() {
return lastLoginType;
}
public void setLastLoginType(DesignerLoginType lastLoginType) {
this.lastLoginType = lastLoginType;
}
public String getLastLoginAccount() {
return lastLoginAccount;
}
public void setLastLoginAccount(String lastLoginAccount) {
this.lastLoginAccount = lastLoginAccount;
}
public boolean isLoginRemindBeforeJumpBBS() {
return loginRemindBeforeJumpBBS;
}
public void setLoginRemindBeforeJumpBBS(boolean loginRemindBeforeJumpBBS) {
this.loginRemindBeforeJumpBBS = loginRemindBeforeJumpBBS;
}
public boolean isPluginRemindOnFirstLaunch() {
return pluginRemindOnFirstLaunch;
}
public void setPluginRemindOnFirstLaunch(boolean pluginRemindOnFirstLaunch) {
this.pluginRemindOnFirstLaunch = pluginRemindOnFirstLaunch;
}
}

30
designer-base/src/main/java/com/fr/design/login/executor/DesignerLoginBrowserExecutor.java

@ -0,0 +1,30 @@
package com.fr.design.login.executor;
import com.fr.design.bridge.exec.JSExecutor;
import com.teamdev.jxbrowser.chromium.JSFunction;
import com.teamdev.jxbrowser.chromium.JSObject;
/**
* @author richie
* @version 10.0
* Created by richie on 2019-04-18
*/
public class DesignerLoginBrowserExecutor implements JSExecutor {
public static DesignerLoginBrowserExecutor create(JSObject window, JSFunction callback) {
return new DesignerLoginBrowserExecutor(window, callback);
}
private JSObject window;
private JSFunction callback;
private DesignerLoginBrowserExecutor(JSObject window, JSFunction callback) {
this.window = window;
this.callback = callback;
}
@Override
public void executor(String newValue) {
callback.invoke(window, newValue);
}
}

45
designer-base/src/main/java/com/fr/design/login/executor/DesignerLoginExecutor.java

@ -0,0 +1,45 @@
package com.fr.design.login.executor;
import com.fr.design.extra.Process;
import com.fr.design.extra.exe.Command;
import com.fr.design.extra.exe.Executor;
import com.fr.design.login.service.DesignerPassportManager;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/28
*/
public class DesignerLoginExecutor implements Executor {
private String result = "[]";
private String username;
private String password;
public DesignerLoginExecutor(String username, String password) {
this.username = username;
this.password = password;
}
@Override
public String getTaskFinishMessage() {
return result;
}
@Override
public Command[] getCommands() {
return new Command[]{
new Command() {
@Override
public String getExecuteMessage() {
return null;
}
@Override
public void run(Process<String> process) {
result = String.valueOf(DesignerPassportManager.getInstance().login(username, password));
}
}
};
}
}

45
designer-base/src/main/java/com/fr/design/login/executor/DesignerSendCaptchaExecutor.java

@ -0,0 +1,45 @@
package com.fr.design.login.executor;
import com.fr.design.extra.Process;
import com.fr.design.extra.exe.Command;
import com.fr.design.extra.exe.Executor;
import com.fr.design.login.service.DesignerPassportManager;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/28
*/
public class DesignerSendCaptchaExecutor implements Executor {
private String result = "[]";
private String regionCode;
private String phone;
public DesignerSendCaptchaExecutor(String regionCode, String phone) {
this.regionCode = regionCode;
this.phone = phone;
}
@Override
public String getTaskFinishMessage() {
return result;
}
@Override
public Command[] getCommands() {
return new Command[]{
new Command() {
@Override
public String getExecuteMessage() {
return null;
}
@Override
public void run(Process<String> process) {
result = String.valueOf(DesignerPassportManager.getInstance().sendCaptcha(regionCode, phone));
}
}
};
}
}

47
designer-base/src/main/java/com/fr/design/login/executor/DesignerSmsLoginExecutor.java

@ -0,0 +1,47 @@
package com.fr.design.login.executor;
import com.fr.design.extra.Process;
import com.fr.design.extra.exe.Command;
import com.fr.design.extra.exe.Executor;
import com.fr.design.login.service.DesignerPassportManager;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/28
*/
public class DesignerSmsLoginExecutor implements Executor {
private String result = "[]";
private String regionCode;
private String phone;
private String code;
public DesignerSmsLoginExecutor(String regionCode, String phone, String code) {
this.regionCode = regionCode;
this.phone = phone;
this.code = code;
}
@Override
public String getTaskFinishMessage() {
return result;
}
@Override
public Command[] getCommands() {
return new Command[]{
new Command() {
@Override
public String getExecuteMessage() {
return null;
}
@Override
public void run(Process<String> process) {
result = DesignerPassportManager.getInstance().smsLogin(regionCode, phone, code);
}
}
};
}
}

49
designer-base/src/main/java/com/fr/design/login/executor/DesignerSmsRegisterExecutor.java

@ -0,0 +1,49 @@
package com.fr.design.login.executor;
import com.fr.design.extra.Process;
import com.fr.design.extra.exe.Command;
import com.fr.design.extra.exe.Executor;
import com.fr.design.login.service.DesignerPassportManager;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/28
*/
public class DesignerSmsRegisterExecutor implements Executor {
private String result = "[]";
private String regionCode;
private String phone;
private String password;
private String regToken;
public DesignerSmsRegisterExecutor(String regionCode, String phone, String password, String regToken) {
this.regionCode = regionCode;
this.phone = phone;
this.password = password;
this.regToken = regToken;
}
@Override
public String getTaskFinishMessage() {
return result;
}
@Override
public Command[] getCommands() {
return new Command[]{
new Command() {
@Override
public String getExecuteMessage() {
return null;
}
@Override
public void run(Process<String> process) {
result = String.valueOf(DesignerPassportManager.getInstance().smsRegister(regionCode, phone, password, regToken));
}
}
};
}
}

83
designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideBridge.java

@ -0,0 +1,83 @@
package com.fr.design.login.guide;
import com.fr.design.DesignerEnvManager;
import com.fr.design.bridge.exec.JSBridge;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.i18n.Toolkit;
import com.fr.design.login.DesignerLoginHelper;
import com.fr.design.login.DesignerLoginSource;
import com.teamdev.jxbrowser.chromium.Browser;
import com.teamdev.jxbrowser.chromium.JSObject;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
public class DesignerGuideBridge {
public static DesignerGuideBridge getBridge(Browser browser) {
return new DesignerGuideBridge(browser);
}
private JSObject window;
private DesignerGuideBridge(Browser browser) {
this.window = browser.executeJavaScriptAndReturnValue("window").asObject();
}
@JSBridge
public String i18nText(String key) {
return Toolkit.i18nText(key);
}
@JSBridge
public void closeWindow(boolean doNotRemind, boolean login) {
if (login) {
DesignerGuideHelper.closeWindow();
DesignerLoginHelper.showLoginDialog(DesignerLoginSource.GUIDE);
checkDoNotRemind(doNotRemind);
} else {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
String[] options = new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Login_Quit"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Login_Return_Login")
};
int rv = FineJOptionPane.showConfirmDialog(
DesignerGuideHelper.getDialog(),
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Login_Quit_Tip"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.YES_NO_OPTION,
JOptionPane.WARNING_MESSAGE,
null,
options,
options[1]
);
if (rv == JOptionPane.YES_OPTION) {
DesignerGuideHelper.closeWindow();
checkDoNotRemind(doNotRemind);
} else if (rv == JOptionPane.NO_OPTION) {
DesignerLoginHelper.showLoginDialog(DesignerLoginSource.GUIDE);
DesignerGuideHelper.closeWindow();
checkDoNotRemind(doNotRemind);
}
}
});
}
}
/**
* 用户勾选了一个月内不再提醒
*/
private void checkDoNotRemind(boolean doNotRemind) {
DesignerEnvManager manager = DesignerEnvManager.getEnvManager();
manager.setDesignerLoginDoNotRemind(doNotRemind);
if (doNotRemind) {
manager.setDesignerLoginDoNotRemindSelectedTime(System.currentTimeMillis());
}
}
}

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

@ -0,0 +1,114 @@
package com.fr.design.login.guide;
import com.fr.design.DesignerEnvManager;
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 javax.swing.WindowConstants;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
public class DesignerGuideHelper {
private static final String MAIN_RESOURCE_PATH = "/com/fr/design/login/guide.html";
private static final String JXBROWSER = "com.teamdev.jxbrowser.chromium.Browser";
private static final long ONE_WEEK = 7 * 24 * 3600 * 1000L;
private static final long ONE_MONTH = 30 * 24 * 3600 * 1000L;
private static final long SIX_MONTH = 6 * ONE_MONTH;
private static UIDialog dialog = null;
public static String getMainResourcePath() {
return MAIN_RESOURCE_PATH;
}
public static UIDialog getDialog() {
return dialog;
}
public static void prepareShowGuideDialog() {
if (!SupportOSImpl.DESIGNER_LOGIN.support()) {
return;
}
if (isActivatedForOneWeek()) {
if (isLogin() && !isLoginForSixMonths()) {
return;
}
if (selectedDoNotRemindInOneMonth()) {
return;
}
DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() {
@Override
public void designerOpened() {
showGuideDialog();
}
});
}
}
/**
* 激活满一周
*/
private static boolean isActivatedForOneWeek() {
return (System.currentTimeMillis() - DesignerEnvManager.getEnvManager().getDesignerActivatedTime()) > ONE_WEEK;
}
/**
* 已经登录
*/
private static boolean isLogin() {
return DesignerEnvManager.getEnvManager().getDesignerLoginUid() > 0;
}
/**
* 已经登录满六个月
*/
private static boolean isLoginForSixMonths() {
return isLogin() && (System.currentTimeMillis() - DesignerEnvManager.getEnvManager().getDesignerLastLoginTime()) > SIX_MONTH;
}
/**
* 一个月内不再提醒
*/
private static boolean selectedDoNotRemindInOneMonth() {
return DesignerEnvManager.getEnvManager().isDesignerLoginDoNotRemind()
&& (System.currentTimeMillis() - DesignerEnvManager.getEnvManager().getDesignerLoginDoNotRemindSelectedTime()) <= ONE_MONTH;
}
private static void showGuideDialog() {
boolean hasJxBrowser = true;
try {
Class.forName(JXBROWSER);
} catch (ClassNotFoundException e) {
hasJxBrowser = false;
}
if (hasJxBrowser) {
showGuidePane();
}
}
private static void showGuidePane() {
DesignerGuidePane designerGuidePane = new DesignerGuidePane();
if (dialog == null) {
dialog = new DesignerGuideShowDialog(DesignerContext.getDesignerFrame(), designerGuidePane);
}
dialog.setVisible(true);
}
public static void closeWindow() {
if (dialog != null) {
dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
dialog.setVisible(false);
dialog = null;
}
}
public static void main(String[] args) {
DesignerEnvManager.getEnvManager().setOpenDebug(true);
showGuideDialog();
}
}

37
designer-base/src/main/java/com/fr/design/login/guide/DesignerGuidePane.java

@ -0,0 +1,37 @@
package com.fr.design.login.guide;
import com.fr.design.dialog.BasicPane;
import com.fr.design.login.guide.utils.DesignerGuideUtils;
import com.fr.design.ui.ModernUIPane;
import com.teamdev.jxbrowser.chromium.JSValue;
import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
import java.awt.BorderLayout;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
public class DesignerGuidePane extends BasicPane {
@Override
protected String title4PopupWindow() {
return "DESIGNER_GUIDE";
}
public DesignerGuidePane() {
setLayout(new BorderLayout());
ModernUIPane<Object> modernUIPane = new ModernUIPane.Builder<>()
.prepare(new ScriptContextAdapter() {
@Override
public void onScriptContextCreated(ScriptContextEvent event) {
JSValue window = event.getBrowser().executeJavaScriptAndReturnValue("window");
window.asObject().setProperty("DesignerGuideHelper", DesignerGuideBridge.getBridge(event.getBrowser()));
}
})
.withEMB(DesignerGuideHelper.getMainResourcePath(), DesignerGuideUtils.renderMap())
.build();
add(modernUIPane, BorderLayout.CENTER);
}
}

35
designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideShowDialog.java

@ -0,0 +1,35 @@
package com.fr.design.login.guide;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.UIDialog;
import com.fr.design.utils.gui.GUICoreUtils;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Frame;
import javax.swing.JPanel;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
public class DesignerGuideShowDialog extends UIDialog {
private static final Dimension DEFAULT = new Dimension(700, 577);
public DesignerGuideShowDialog(Frame frame, BasicPane pane) {
super(frame);
setUndecorated(true);
JPanel panel = (JPanel) getContentPane();
panel.setLayout(new BorderLayout());
add(pane, BorderLayout.CENTER);
setSize(DEFAULT);
GUICoreUtils.centerWindow(this);
setResizable(false);
}
@Override
public void checkValid() throws Exception {
}
}

19
designer-base/src/main/java/com/fr/design/login/guide/utils/DesignerGuideUtils.java

@ -0,0 +1,19 @@
package com.fr.design.login.guide.utils;
import com.fr.general.GeneralContext;
import java.util.HashMap;
import java.util.Map;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
public class DesignerGuideUtils {
public static Map<String, String> renderMap() {
Map<String, String> map4Tpl = new HashMap<>();
map4Tpl.put("language", GeneralContext.getLocale().toString());
return map4Tpl;
}
}

167
designer-base/src/main/java/com/fr/design/login/service/DesignerLoginClient.java

@ -0,0 +1,167 @@
package com.fr.design.login.service;
import com.fr.general.CloudCenter;
import com.fr.general.http.HttpToolbox;
import com.fr.general.log.MessageFormatter;
import com.fr.json.JSON;
import com.fr.json.JSONFactory;
import com.fr.json.JSONObject;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils;
import com.fr.third.org.apache.commons.lang3.RandomStringUtils;
import java.util.HashMap;
import java.util.UUID;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/28
*/
public class DesignerLoginClient {
private static final String LOGIN_API = CloudCenter.getInstance().acquireUrlByKind("designer.login.api", "http://api.shequ.fanruan.com/v1/user/login/");
private static final String SEND_CAPTCHA_API = CloudCenter.getInstance().acquireUrlByKind("designer.send.captcha.api", "http://api.shequ.fanruan.com/v1/code/getsmscaptcha/?location={}&phone={}&smstype={}");
private static final String SMS_LOGIN_API = CloudCenter.getInstance().acquireUrlByKind("designer.sms.login.api", "http://api.shequ.fanruan.com/v1/user/smslogin/");
private static final String SMS_REGISTER_API = CloudCenter.getInstance().acquireUrlByKind("designer.sms.register.api", "http://api.shequ.fanruan.com/v1/user/register/");
private static final String USERNAME = "username";
private static final String PASSWORD = "password";
private static final String SMS_TYPE_LOGIN_AND_REGISTER = "1";
private static final String LOCATION = "location";
private static final String PHONE = "phone";
private static final String CODE = "code";
private static final String STATUS = "status";
private static final String DATA = "data";
private static final String CLIENT = "client";
private static final String UID = "uid";
private static final String APP_ID = "appid";
private static final String REFRESH_TOKEN = "refresh_token";
private static final String REGISTER = "register";
private static final String REG_TOKEN = "regtoken";
private static final String REG_PHONE = "regphone";
private static final String DEVICE = "device";
private static final String REG_FROM = "reg_from";
private static final String PRODUCT_FINEREPORT = "product-finereport";
/**
* 服务器内部错误
*/
private static final int INTERNAL_ERROR = 0;
/**
* 未知错误
*/
private static final int UNKNOWN_ERROR = -3;
/**
* 网络连接失败
*/
private static final int NETWORK_CONNECTED_FAILED = -4;
public DesignerLoginResult login(String username, String password) {
try {
HashMap<String, Object> params = new HashMap<>();
params.put(USERNAME, username);
params.put(PASSWORD, password);
String result = HttpToolbox.post(LOGIN_API, params);
JSONObject response = JSONFactory.createJSON(JSON.OBJECT, result);
int status = response.optInt(STATUS);
if (status < 0) {
return DesignerLoginResult.create(status, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, false, StringUtils.EMPTY);
}
JSONObject data = response.optJSONObject(DATA);
if (data != null) {
JSONObject client = data.optJSONObject(CLIENT);
if (client != null) {
int uid = client.optInt(UID);
if (uid > 0) {
return DesignerLoginResult.create(uid, client.optString(USERNAME), client.optString(APP_ID), data.optString(REFRESH_TOKEN), false, StringUtils.EMPTY);
}
}
}
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
return DesignerLoginResult.create(NETWORK_CONNECTED_FAILED, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, false, StringUtils.EMPTY);
}
return DesignerLoginResult.create(UNKNOWN_ERROR, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, false, StringUtils.EMPTY);
}
public int sendCaptcha(String regionCode, String phone) {
try {
String url = MessageFormatter.arrayFormat(SEND_CAPTCHA_API, new String[]{regionCode, phone, SMS_TYPE_LOGIN_AND_REGISTER}).getMessage();
String result = HttpToolbox.get(url);
JSONObject response = JSONFactory.createJSON(JSON.OBJECT, result);
return response.optInt(STATUS);
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
return INTERNAL_ERROR;
}
public DesignerLoginResult smsLogin(String regionCode, String phone, String code) {
try {
HashMap<String, Object> params = new HashMap<>();
params.put(LOCATION, regionCode);
params.put(PHONE, phone);
params.put(CODE, code);
String result = HttpToolbox.post(SMS_LOGIN_API, params);
JSONObject response = JSONFactory.createJSON(JSON.OBJECT, result);
int status = response.optInt(STATUS);
if (status < 0) {
return DesignerLoginResult.create(status, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, false, StringUtils.EMPTY);
}
JSONObject data = response.optJSONObject(DATA);
if (data != null) {
boolean register = data.optBoolean(REGISTER);
if (register) {
String regToken = data.optString(REG_TOKEN);
if (regToken != null) {
return DesignerLoginResult.create(status, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, true, regToken);
}
} else {
JSONObject client = data.optJSONObject(CLIENT);
if (client != null) {
int uid = client.optInt(UID);
if (uid > 0) {
return DesignerLoginResult.create(uid, client.optString(USERNAME), client.optString(APP_ID), data.optString(REFRESH_TOKEN), false, StringUtils.EMPTY);
}
}
}
}
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
return DesignerLoginResult.create(INTERNAL_ERROR, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, false, StringUtils.EMPTY);
}
public DesignerLoginResult smsRegister(String regionCode, String phone, String password, String regToken) {
try {
HashMap<String, Object> params = new HashMap<>();
params.put(USERNAME, RandomStringUtils.randomAlphabetic(8));
params.put(PASSWORD, password);
params.put(REG_TOKEN, regToken);
params.put(LOCATION, regionCode);
params.put(REG_PHONE, phone);
params.put(DEVICE, PRODUCT_FINEREPORT);
params.put(REG_FROM, PRODUCT_FINEREPORT);
String result = HttpToolbox.post(SMS_REGISTER_API, params);
JSONObject response = JSONFactory.createJSON(JSON.OBJECT, result);
int status = response.optInt(STATUS);
if (status < 0) {
return DesignerLoginResult.create(status, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, false, StringUtils.EMPTY);
}
JSONObject data = response.optJSONObject(DATA);
if (data != null) {
JSONObject client = data.optJSONObject(CLIENT);
if (client != null) {
int uid = client.optInt(UID);
if (uid > 0) {
return DesignerLoginResult.create(uid, client.optString(USERNAME), client.optString(APP_ID), data.optString(REFRESH_TOKEN), false, StringUtils.EMPTY);
}
}
}
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
return DesignerLoginResult.create(INTERNAL_ERROR, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, false, StringUtils.EMPTY);
}
}

82
designer-base/src/main/java/com/fr/design/login/service/DesignerLoginResult.java

@ -0,0 +1,82 @@
package com.fr.design.login.service;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/28
*/
public class DesignerLoginResult {
private int uid;
private String username;
private String appId;
private String refreshToken;
private boolean register;
private String regToken;
private DesignerLoginResult(int uid, String username, String appId, String refreshToken, boolean register, String regToken) {
this.uid = uid;
this.username = username;
this.appId = appId;
this.refreshToken = refreshToken;
this.regToken = regToken;
this.register = register;
}
public static DesignerLoginResult create(int uid, String username, String appId, String refreshToken, boolean register, String regToken) {
return new DesignerLoginResult(uid, username, appId, refreshToken, register, regToken);
}
public int getUid() {
return uid;
}
public void setUid(int uid) {
this.uid = uid;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getRefreshToken() {
return refreshToken;
}
public void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
}
public boolean isRegister() {
return register;
}
public void setRegister(boolean register) {
this.register = register;
}
public String getRegToken() {
return regToken;
}
public void setRegToken(String regToken) {
this.regToken = regToken;
}
}

114
designer-base/src/main/java/com/fr/design/login/service/DesignerPassportManager.java

@ -0,0 +1,114 @@
package com.fr.design.login.service;
import com.fr.design.DesignerEnvManager;
import com.fr.design.login.DesignerLoginType;
import com.fr.design.upm.event.CertificateEvent;
import com.fr.event.EventDispatcher;
import com.fr.json.JSONObject;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/28
*/
public class DesignerPassportManager {
private static final String STATUS = "status";
private static final String REGISTER = "register";
private static final String REG_TOKEN = "regtoken";
private static volatile DesignerPassportManager instance = null;
public static DesignerPassportManager getInstance() {
if (instance == null) {
synchronized (DesignerPassportManager.class) {
if (instance == null) {
instance = new DesignerPassportManager();
}
}
}
return instance;
}
/**
* 账号密码登录帆软通行证
*
* @param username 论坛账号
* @param password 密码
*/
public int login(String username, String password) {
DesignerLoginClient client = new DesignerLoginClient();
DesignerLoginResult result = client.login(username, password);
int uid = result.getUid();
if (uid > 0) {
saveUserInfo(uid, result.getUsername(), result.getAppId(), result.getRefreshToken(), DesignerLoginType.NORMAL_LOGIN, username);
}
return uid;
}
/**
* 发送短信验证码
*
* @param regionCode 区号
* @param phone 手机
*/
public int sendCaptcha(String regionCode, String phone) {
DesignerLoginClient client = new DesignerLoginClient();
return client.sendCaptcha(regionCode, phone);
}
/**
* 短信登录帆软通行证
*
* @param regionCode 区号
* @param phone 手机
* @param code 验证码
*/
public String smsLogin(String regionCode, String phone, String code) {
DesignerLoginClient client = new DesignerLoginClient();
DesignerLoginResult result = client.smsLogin(regionCode, phone, code);
int uid = result.getUid();
if (uid > 0) {
saveUserInfo(uid, result.getUsername(), result.getAppId(), result.getRefreshToken(), DesignerLoginType.SMS_LOGIN, regionCode + "-" + phone);
}
JSONObject jo = new JSONObject();
jo.put(STATUS, result.getUid());
jo.put(REGISTER, result.isRegister());
jo.put(REG_TOKEN, result.getRegToken());
return jo.toString();
}
/**
* 注册帆软通行证
*
* @param regionCode 区号
* @param phone 手机
* @param password 密码
* @param regToken 注册令牌
*/
public int smsRegister(String regionCode, String phone, String password, String regToken) {
DesignerLoginClient client = new DesignerLoginClient();
DesignerLoginResult result = client.smsRegister(regionCode, phone, password, regToken);
int uid = result.getUid();
if (uid > 0) {
saveUserInfo(uid, result.getUsername(), result.getAppId(), result.getRefreshToken(), DesignerLoginType.SMS_LOGIN, regionCode + "-" + phone);
}
return uid;
}
/**
* 保存登录信息
*/
private void saveUserInfo(int uid, String username, String appId, String refreshToken, DesignerLoginType type, String account) {
DesignerEnvManager manager = DesignerEnvManager.getEnvManager();
manager.setDesignerLoginUid(uid);
manager.setDesignerLoginUsername(username);
manager.setDesignerLoginAppId(appId);
manager.setDesignerLoginRefreshToken(refreshToken);
manager.setDesignerLastLoginTime(System.currentTimeMillis());
manager.setLastLoginType(type);
manager.setLastLoginAccount(account);
DesignerEnvManager.getEnvManager().saveXMLFile();
EventDispatcher.fire(CertificateEvent.LOGIN, username);
}
}

87
designer-base/src/main/java/com/fr/design/login/socketio/LoginAuthServer.java

@ -0,0 +1,87 @@
package com.fr.design.login.socketio;
import com.fr.design.DesignerEnvManager;
import com.fr.design.login.DesignerLoginType;
import com.fr.design.login.bean.BBSAccountLogin;
import com.fr.design.upm.event.CertificateEvent;
import com.fr.event.EventDispatcher;
import com.fr.log.FineLoggerFactory;
import com.fr.third.socketio.AckRequest;
import com.fr.third.socketio.Configuration;
import com.fr.third.socketio.SocketIOClient;
import com.fr.third.socketio.SocketIOServer;
import com.fr.third.socketio.listener.DataListener;
import java.net.URLDecoder;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/6/3
*/
public class LoginAuthServer {
private SocketIOServer server;
private static final String HOSTNAME = "localhost";
private static final int PORT = 41925;
private static volatile LoginAuthServer instance = null;
public static LoginAuthServer getInstance() {
if (instance == null) {
synchronized (LoginAuthServer.class) {
if (instance == null) {
instance = new LoginAuthServer();
}
}
}
return instance;
}
private LoginAuthServer() {
Configuration config = new Configuration();
config.setHostname(HOSTNAME);
config.setPort(PORT);
server = new SocketIOServer(config);
initEventListener();
}
public void start() {
try {
server.start();
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
}
public void stop() {
try {
server.stop();
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
}
private void initEventListener() {
server.addEventListener("bbsAccountLogin", BBSAccountLogin.class, new DataListener<BBSAccountLogin>() {
@Override
public void onData(SocketIOClient client, BBSAccountLogin data, AckRequest ackRequest) throws Exception {
// 保存登录信息到.FineReport100配置中
int uid = data.getUid();
if (uid > 0) {
String username = URLDecoder.decode(data.getUsername(), "UTF-8");
DesignerEnvManager manager = DesignerEnvManager.getEnvManager();
manager.setDesignerLoginUid(data.getUid());
manager.setDesignerLoginUsername(username);
manager.setDesignerLoginAppId(data.getAppId());
manager.setDesignerLoginRefreshToken(data.getRefreshToken());
manager.setDesignerLastLoginTime(System.currentTimeMillis());
manager.setLastLoginType(DesignerLoginType.NORMAL_LOGIN);
manager.setLastLoginAccount(username);
DesignerEnvManager.getEnvManager().saveXMLFile();
EventDispatcher.fire(CertificateEvent.LOGIN, username);
}
}
});
}
}

51
designer-base/src/main/java/com/fr/design/login/task/DesignerLoginTaskWorker.java

@ -0,0 +1,51 @@
package com.fr.design.login.task;
import com.fr.design.bridge.exec.JSCallback;
import com.fr.design.bridge.exec.JSUtils;
import com.fr.design.extra.Process;
import com.fr.design.extra.exe.Command;
import com.fr.design.extra.exe.Executor;
import com.fr.stable.StringUtils;
import javax.swing.SwingWorker;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/27
*/
public class DesignerLoginTaskWorker<V> extends SwingWorker<V, String> {
private Executor executor;
private JSCallback callback;
public DesignerLoginTaskWorker(final JSCallback callback, final Executor executor) {
this.executor = executor;
this.callback = callback;
}
@Override
protected V doInBackground() throws Exception {
Command[] commands = executor.getCommands();
for (Command command : commands) {
String message = command.getExecuteMessage();
if (StringUtils.isNotBlank(message)) {
publish(message);
}
command.run(new Process<String>() {
@Override
public void process(String s) {
if (StringUtils.isNotBlank(s)) {
publish(JSUtils.trimText(s));
}
}
});
}
return null;
}
@Override
protected void done() {
String result = executor.getTaskFinishMessage();
callback.execute(result);
}
}

35
designer-base/src/main/java/com/fr/design/login/utils/DesignerLoginUtils.java

@ -0,0 +1,35 @@
package com.fr.design.login.utils;
import com.fr.design.DesignerEnvManager;
import com.fr.design.mainframe.toast.DesignerToastMsgUtil;
import com.fr.general.GeneralContext;
import java.util.HashMap;
import java.util.Map;
/**
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
public class DesignerLoginUtils {
public static Map<String, String> renderMap() {
Map<String, String> map4Tpl = new HashMap<>();
map4Tpl.put("language", GeneralContext.getLocale().toString());
return map4Tpl;
}
public static void showPluginRemindOnFirstLaunch() {
DesignerEnvManager manager = DesignerEnvManager.getEnvManager();
int uid = manager.getDesignerLoginUid();
if (uid > 0) {
boolean pluginRemindOnFirstLaunch = manager.isPluginRemindOnFirstLaunch();
if (pluginRemindOnFirstLaunch) {
DesignerToastMsgUtil.toastWarning(
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Plugin_Tip")
);
manager.setPluginRemindOnFirstLaunch(false);
}
}
}
}

5
designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfo.java

@ -5,7 +5,6 @@ import com.fr.chartx.attr.ChartProvider;
import com.fr.chartx.config.info.AbstractConfig;
import com.fr.chartx.config.info.ChartConfigInfo;
import com.fr.chartx.config.info.constant.ConfigType;
import com.fr.config.MarketConfig;
import com.fr.design.DesignModelAdapter;
import com.fr.design.DesignerEnvManager;
import com.fr.design.file.HistoryTemplateListCache;
@ -132,8 +131,8 @@ public class ChartInfo extends AbstractPointInfo implements Comparable<ChartInfo
public static ChartInfo newInstance(ChartProvider chartProvider, String createTime, boolean isNew, boolean isReuse, boolean isAutoChart) {
HashMap<String, String> chartConsumingMap = new HashMap<>();
String username = MarketConfig.getInstance().getBbsUsername();
String userId = String.valueOf(MarketConfig.getInstance().getBbsUid());
String username = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
String userId = String.valueOf(DesignerEnvManager.getEnvManager().getDesignerLoginUid());
String uuid = DesignerEnvManager.getEnvManager().getUUID();
String activityKey = DesignerEnvManager.getEnvManager().getActivationKey();
String chartId = chartProvider.getChartUuid();

10
designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java

@ -140,6 +140,16 @@ public enum SupportOSImpl implements SupportOS {
public boolean support() {
return JdkVersion.GE_9.support() && OperatingSystem.isMacos() && getMacOsVersion() >= BIG_SUR_VERSION_NUMBER;
}
},
DESIGNER_LOGIN {
@Override
public boolean support() {
if (OperatingSystem.isLinux()) {
return false;
}
return !OperatingSystem.isMacos() || getMacOsVersion() < BIG_SUR_VERSION_NUMBER;
}
};
private static final int BIG_SUR_VERSION_NUMBER = 16;

5
designer-base/src/main/java/com/fr/design/ui/EmbProtocolHandler.java

@ -80,6 +80,11 @@ public class EmbProtocolHandler implements ProtocolHandler {
path = path.substring(4);
}
inputStream = IOUtils.readResource(path);
if (path.endsWith(".html")) {
String text = IOUtils.inputStream2String(inputStream, EncodeConstants.ENCODING_UTF_8);
text = TemplateUtils.renderParameter4Tpl(text, map);
return Assistant.inputStream2Response(new ByteArrayInputStream(text.getBytes(StandardCharsets.UTF_8)), path);
}
return Assistant.inputStream2Response(inputStream, path);
}
} catch (Exception e) {

10
designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java

@ -174,6 +174,16 @@ public class ModernUIPane<T> extends BasicPane {
return this;
}
/**
* 加载jar包中的资源
* @param path 资源路径
*/
public Builder<T> withEMB(final String path, Map<String, String> map) {
Assistant.setEmbProtocolHandler(pane.browser, new EmbProtocolHandler(map));
pane.browser.loadURL("emb:" + path);
return this;
}
/**
* 加载url指向的资源
* @param url 文件的地址

16
designer-base/src/main/java/com/fr/design/upm/UpmBridge.java

@ -1,9 +1,8 @@
package com.fr.design.upm;
import com.fr.base.passport.FinePassportManager;
import com.fr.config.MarketConfig;
import com.fr.config.ServerPreferenceConfig;
import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoader;
import com.fr.design.DesignerEnvManager;
import com.fr.design.bridge.exec.JSBridge;
import com.fr.design.bridge.exec.JSCallback;
import com.fr.design.extra.PluginOperateUtils;
@ -19,12 +18,10 @@ import com.fr.design.i18n.Toolkit;
import com.fr.design.locale.impl.BbsRegisterMark;
import com.fr.design.locale.impl.BbsResetMark;
import com.fr.design.locale.impl.BbsSpaceMark;
import com.fr.design.upm.event.CertificateEvent;
import com.fr.design.upm.event.DownloadEvent;
import com.fr.design.upm.exec.UpmBrowserExecutor;
import com.fr.design.upm.task.UpmTaskWorker;
import com.fr.event.EventDispatcher;
import com.fr.general.CloudCenter;
import com.fr.general.GeneralUtils;
import com.fr.general.locale.LocaleCenter;
import com.fr.general.locale.LocaleMark;
@ -379,7 +376,7 @@ public class UpmBridge {
@JSBridge
public String getLoginInfo(final JSFunction callback) {
registerLoginInfo(callback);
return MarketConfig.getInstance().getBbsUsername();
return DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
}
/**
@ -390,13 +387,11 @@ public class UpmBridge {
@JSBridge
public void registerLoginInfo(final JSFunction callback) {
JSCallback jsCallback = new JSCallback(UpmBrowserExecutor.create(window, callback));
String username = MarketConfig.getInstance().getBbsUsername();
String username = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
if (StringUtils.isEmpty(username)) {
jsCallback.execute(StringUtils.EMPTY);
EventDispatcher.fire(CertificateEvent.LOGOUT, StringUtils.EMPTY);
} else {
jsCallback.execute(username);
EventDispatcher.fire(CertificateEvent.LOGIN, username);
}
}
@ -417,10 +412,9 @@ public class UpmBridge {
/**
* 清除用户信息
*/
@JSBridge
public void clearUserInfo() {
MarketConfig.getInstance().setInShowBBsName(StringUtils.EMPTY);
FinePassportManager.getInstance().logout();
EventDispatcher.fire(CertificateEvent.LOGOUT, StringUtils.EMPTY);
}
/**

2
designer-base/src/main/java/com/fr/design/upm/UpmFinder.java

@ -5,6 +5,7 @@ import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoa
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.dialog.UIDialog;
import com.fr.design.i18n.Toolkit;
import com.fr.design.login.utils.DesignerLoginUtils;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.plugin.DesignerPluginContext;
import com.fr.design.update.ui.dialog.UpdateMainDialog;
@ -97,6 +98,7 @@ public class UpmFinder {
dialog = new UpmShowDialog(DesignerContext.getDesignerFrame(), upmPane);
}
dialog.setVisible(true);
DesignerLoginUtils.showPluginRemindOnFirstLaunch();
}
}

4
designer-base/src/main/java/com/fr/design/upm/event/CertificateEvent.java

@ -7,6 +7,6 @@ import com.fr.event.Event;
* @version 10.0
* Created by richie on 2019-04-18
*/
public enum CertificateEvent implements Event<String> {
LOGIN,LOGOUT
public enum CertificateEvent implements Event<String> {
LOGIN, LOGOUT
}

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

@ -0,0 +1,2 @@
VERSION=1.0
ENV_VERSION=10.0

52
designer-base/src/main/resources/com/fr/design/login/guide.css

@ -0,0 +1,52 @@
.background-login-close {
color: white !important;
font-weight: bold;
font-size: 14px;
}
.background-guide-close {
color: black !important;
font-weight: bold;
font-size: 16px;
}
.background-login-loading {
background: url(./img/login_loading.gif) no-repeat center center;
}
.background-plugin-need-update {
background: url(./img/icon_new.png) no-repeat center center;
}
.background-plugin-cant-use {
background: url(./img/icon_cantuse.png) no-repeat center center;
}
.background-plugin-is-disable {
background: url(./img/icon_disable.png) no-repeat center center;
}
.background-plugin-is-disable-new {
background: url(./img/icon_disable-new.png) no-repeat center center;
}
.background-plugin-selected {
background: url(./img/icon_marked.png) no-repeat center center;
}
.background-shop-title-close {
background: url(./img/icon_close40x40_normal.svg) no-repeat center center;
}
.background-dialog-confirm {
background: url(./img/warning.png) no-repeat center center;
background-size: contain;
}
.background-close-button {
background: url(./img/icon_close9x9_normal.png) no-repeat center center;
}
.background-close-button:hover {
background: url(./img/icon_close9x9_hover.png) no-repeat center center;
}
.designer-login-guide {
background: url(./img/login_guide.png) no-repeat center center;
background-size: cover;
}
.designer-guide-login-button {
font-size: 14px;
color: white;
border-radius: 4px;
background-color: #3685F2;
}

25
designer-base/src/main/resources/com/fr/design/login/guide.html

@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>title</title>
<style>
@font-face {
font-family: "fineui";
src: url('../lib/font/iconfont.eot');
src: url('../lib/font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../lib/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('../lib/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('../lib/font/iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */
}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="lib/bundle.css"/>
<script type="text/javascript" charset="UTF-8" src="lib/locale/login_zh_CN.js?_=compatible"></script>
<script type="text/javascript" charset="UTF-8" src="lib/locale/login_${language}.js"></script><script type="text/javascript" charset="UTF-8" src="lib/fineui.min.js"></script><script type="text/javascript"></script>
<style>
body {
overflow-y: auto;
}
</style>
<link href="guide.css" rel="stylesheet"></head>
</html>
<script type="text/javascript" src="guide.js"></script>

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

File diff suppressed because one or more lines are too long

BIN
designer-base/src/main/resources/com/fr/design/login/img/icon_cantuse.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

23
designer-base/src/main/resources/com/fr/design/login/img/icon_close40x40_normal.svg

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
<g>
<g>
<defs>
<rect id="SVGID_1_" width="40" height="40"/>
</defs>
<use xlink:href="#SVGID_1_" overflow="visible" fill="#417BE2"/>
<clipPath id="SVGID_2_">
<use xlink:href="#SVGID_1_" overflow="visible"/>
</clipPath>
<rect clip-path="url(#SVGID_2_)" fill="#417BE2" width="40" height="40"/>
</g>
</g>
<path fill="#FFFFFF" d="M21.414,20l3.793-3.793c0.195-0.195,0.293-0.451,0.293-0.707s-0.098-0.512-0.293-0.707
c-0.391-0.391-1.023-0.391-1.414,0L20,18.586l-3.793-3.793c-0.391-0.391-1.023-0.391-1.414,0C14.598,14.988,14.5,15.244,14.5,15.5
s0.098,0.512,0.293,0.707L18.586,20l-3.793,3.793C14.598,23.988,14.5,24.244,14.5,24.5s0.098,0.512,0.293,0.707
S15.244,25.5,15.5,25.5s0.512-0.098,0.707-0.293L20,21.414l3.793,3.793c0.195,0.195,0.451,0.293,0.707,0.293
s0.512-0.098,0.707-0.293S25.5,24.756,25.5,24.5s-0.098-0.512-0.293-0.707L21.414,20z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/img/icon_close9x9_hover.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/img/icon_close9x9_normal.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 B

BIN
designer-base/src/main/resources/com/fr/design/login/img/icon_close_normal.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/img/icon_disable-new.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/img/icon_disable.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/img/icon_marked.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/img/icon_new.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/img/login_guide.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 473 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/img/login_loading.gif

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/img/product-01.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/img/warning.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

5619
designer-base/src/main/resources/com/fr/design/login/lib/bluebird.js

File diff suppressed because it is too large Load Diff

6540
designer-base/src/main/resources/com/fr/design/login/lib/bundle.css

File diff suppressed because it is too large Load Diff

53
designer-base/src/main/resources/com/fr/design/login/lib/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

54
designer-base/src/main/resources/com/fr/design/login/lib/fineui.min.js vendored

File diff suppressed because one or more lines are too long

BIN
designer-base/src/main/resources/com/fr/design/login/lib/font/iconfont.eot

Binary file not shown.

1703
designer-base/src/main/resources/com/fr/design/login/lib/font/iconfont.svg

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 357 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/lib/font/iconfont.ttf

Binary file not shown.

BIN
designer-base/src/main/resources/com/fr/design/login/lib/font/iconfont.woff

Binary file not shown.

BIN
designer-base/src/main/resources/com/fr/design/login/lib/font/iconfont.woff2

Binary file not shown.

5
designer-base/src/main/resources/com/fr/design/login/lib/locale/login_en_US.js

@ -0,0 +1,5 @@
var Store = {
i18n : {
}}
window.Store = Store;

5
designer-base/src/main/resources/com/fr/design/login/lib/locale/login_ja_JP.js

@ -0,0 +1,5 @@
var Store = {
i18n : {
}}
window.Store = Store;

5
designer-base/src/main/resources/com/fr/design/login/lib/locale/login_ko_KR.js

@ -0,0 +1,5 @@
var Store = {
i18n : {
}}
window.Store = Store;

59
designer-base/src/main/resources/com/fr/design/login/lib/locale/login_zh_CN.js

@ -0,0 +1,59 @@
var Store = {
i18n : {
'Designer-Login_User_Name': '用户名/邮箱/手机号',
'Designer-Login_User_Name_Hint': '请输入用户名/邮箱/手机号',
'Designer-Login_Password': '密码',
'Designer-Login_Password_Hint': '请输入密码',
'Designer-Login': '登录',
'Designer-Login_Title': '帆软通行证登录',
'Designer-Login_I_Have_Read': '我已阅读',
'Designer-Login_Service_Terms': '服务条款',
'Designer-Login_Forget_Password': '忘记密码?',
'Designer-Login_Sms': '验证码登录',
'Designer-Login_Normal': '密码登录',
'Designer-Login_Phone': '手机号码',
'Designer-Login_Phone_Hint': '请输入手机号码',
'Designer-Login_Code': '验证码',
'Designer-Login_Code_Hint': '请输入验证码',
'Designer-Login_Code_Request': '获取验证码',
'Designer-Login_Code_Request_Again': '重新获取',
'Designer-Login_Register_Or_Login': '注册/登录',
'Designer-Basic_Chinese_Mainland': '中国大陆',
'Designer-Basic_Chinese_Hong_Kong': '中国香港',
'Designer-Basic_Chinese_Macao': '中国澳门',
'Designer-Basic_Chinese_Taiwan': '中国台湾',
'Designer-Basic_Turkey': '土耳其',
'Designer-Basic_South_Korea': '韩国',
'Designer-Basic_Japan': '日本',
'Designer-Basic_Singapore': '新加坡',
'Designer-Basic_Malaysia': '马来西亚',
'Designer-Login_Username_Not_Null': '用户名不能为空',
'Designer-Login_Password_Not_Null': '密码不能为空',
'Designer-Login_Username_Or_Password_Incorrect': '用户名或者密码错误,请检查',
'Designer-Login_Phone_Not_Null': '手机号码格式非法',
'Designer-Login_Code_Not_Null': '验证码不能为空',
'Designer-Login_Code_Incorrect': '验证码已过期,请重新获取',
'Designer-Login_Password_Setting_Hint': '输入登录密码(可输入6-16位密码)',
'Designer-Login_Store_User_Not_Exist': '用户名不存在',
'Designer-Login_Store_User_Password_Error': '用户名或密码错误',
'Designer-Login_Token_Request_Failed': '注册令牌获取失败',
'Designer-Login_Unexpected_Error': '未知错误',
'Designer-Login_Internal_Error': '服务器内部错误',
'Designer-Guide_Do_Not_Remind': '一个月内不再提醒',
'Designer-Guide_Login': '立即登录',
'Designer-BBS_Register_Timeout': '注册超时,请重新发送验证码',
'Designer-BBS_Phone_Is_Register': '该手机号码已注册',
'Designer-BBS_Captcha_Send_Exceed_Limit': '验证码每60s只能发送一次',
'Designer-BBS_Phone_Format_Error': '发送失败,手机号格式错误',
'Designer-BBS_Captcha_Out_Of_Date': '验证码已过期,请重新获取',
'Designer-BBS_Captcha_Try_Exceed_Limit': '验证码尝试次数已达上限,请重新获取',
'Designer-BBS_Captcha_Error': '验证码错误',
'Designer-BBS_Username_Format_Error': '昵称只支持中英文和数字',
'Designer-BBS_Username_Too_Short': '昵称长度太短',
'Designer-BBS_Username_Too_Long': '这个昵称长度已经达到了上限',
'Designer-BBS_Username_Is_Register': '该用户已被注册',
'Designer-BBS_Please_Enter_Correct_Phone': '请输入正确的手机号',
'Designer-Login_Network_Connected_Failed': '网络连接失败',
}}
window.Store = Store;

5
designer-base/src/main/resources/com/fr/design/login/lib/locale/login_zh_TW.js

@ -0,0 +1,5 @@
var Store = {
i18n : {
}}
window.Store = Store;

40
designer-base/src/main/resources/com/fr/design/login/lib/locale/transform-i18n.js

@ -0,0 +1,40 @@
/* eslint-disable @typescript-eslint/no-var-requires */
const fs = require('fs');
const { resolve } = require('path');
const propertiesReader = require('properties-reader');
function compileSinglePropertiesFile2JS(filename) {
if (!/\.properties/g.test(filename)) {
return;
}
const filePrefix = filename.split('.')[0].replace('show_', '');
let content = '';
const properties = propertiesReader(resolve(__dirname, `../../../i18n/${filename}`));
properties.each((key, value) => {
content += ` '${key}': '${value}',\n`;
});
content = `var Store = {
i18n : {
${content}
}}
window.Store = Store;`
fs.writeFileSync(
resolve(
__dirname,
`${filePrefix}.js`
),
content
);
}
function compilePropertiesFiles2JS() {
fs.readdirSync(resolve(__dirname, '../../../i18n'))
.forEach(file => compileSinglePropertiesFile2JS(file));
}
compilePropertiesFiles2JS();

3
designer-base/src/main/resources/com/fr/design/login/lib/polyfill.min.js vendored

File diff suppressed because one or more lines are too long

230
designer-base/src/main/resources/com/fr/design/login/login.css

@ -0,0 +1,230 @@
.background-login-close {
color: white !important;
font-weight: bold;
font-size: 14px;
}
.background-guide-close {
color: black !important;
font-weight: bold;
font-size: 16px;
}
.background-login-loading {
background: url(./img/login_loading.gif) no-repeat center center;
}
.background-plugin-need-update {
background: url(./img/icon_new.png) no-repeat center center;
}
.background-plugin-cant-use {
background: url(./img/icon_cantuse.png) no-repeat center center;
}
.background-plugin-is-disable {
background: url(./img/icon_disable.png) no-repeat center center;
}
.background-plugin-is-disable-new {
background: url(./img/icon_disable-new.png) no-repeat center center;
}
.background-plugin-selected {
background: url(./img/icon_marked.png) no-repeat center center;
}
.background-shop-title-close {
background: url(./img/icon_close40x40_normal.svg) no-repeat center center;
}
.background-dialog-confirm {
background: url(./img/warning.png) no-repeat center center;
background-size: contain;
}
.background-close-button {
background: url(./img/icon_close9x9_normal.png) no-repeat center center;
}
.background-close-button:hover {
background: url(./img/icon_close9x9_hover.png) no-repeat center center;
}
.designer-login-login-title {
font-size: 20px;
color: #FFFFFF;
}
.background-login-close {
color: white !important;
font-weight: bold;
font-size: 14px;
}
.background-guide-close {
color: black !important;
font-weight: bold;
font-size: 16px;
}
.background-login-loading {
background: url(./img/login_loading.gif) no-repeat center center;
}
.background-plugin-need-update {
background: url(./img/icon_new.png) no-repeat center center;
}
.background-plugin-cant-use {
background: url(./img/icon_cantuse.png) no-repeat center center;
}
.background-plugin-is-disable {
background: url(./img/icon_disable.png) no-repeat center center;
}
.background-plugin-is-disable-new {
background: url(./img/icon_disable-new.png) no-repeat center center;
}
.background-plugin-selected {
background: url(./img/icon_marked.png) no-repeat center center;
}
.background-shop-title-close {
background: url(./img/icon_close40x40_normal.svg) no-repeat center center;
}
.background-dialog-confirm {
background: url(./img/warning.png) no-repeat center center;
background-size: contain;
}
.background-close-button {
background: url(./img/icon_close9x9_normal.png) no-repeat center center;
}
.background-close-button:hover {
background: url(./img/icon_close9x9_hover.png) no-repeat center center;
}
.designer-login-login-body .login-login-button {
font-size: 16px;
border-radius: 20px;
background-color: #3685F2;
}
.designer-login-body {
border-radius: 8px;
background-color: #FFFFFF;
}
.designer-login-body .designer-login-change-mode {
font-size: 14px;
border-bottom-width: 2px;
}
.designer-login-body .designer-login-change-mode.hover {
color: #0082FC;
}
.designer-login-body .designer-login-change-mode.active {
border-bottom-color: #0082FC;
}
.designer-login-text {
color: #647185;
font-size: 14px;
}
.designer-login-editor-username {
color: #C4C9D1;
font-size: 14px;
margin-bottom: 15px;
}
.designer-login-editor-password {
color: #C4C9D1;
font-size: 14px;
margin-bottom: 15px;
}
.designer-login-error-message {
color: #FF2F3F;
font-size: 14px;
}
.designer-login-code-text {
color: #3685F2;
font-size: 14px;
}
.designer-login-border-bottom {
border-bottom: 1px solid #e8eaed;
}
.background-login-close {
color: white !important;
font-weight: bold;
font-size: 14px;
}
.background-guide-close {
color: black !important;
font-weight: bold;
font-size: 16px;
}
.background-login-loading {
background: url(./img/login_loading.gif) no-repeat center center;
}
.background-plugin-need-update {
background: url(./img/icon_new.png) no-repeat center center;
}
.background-plugin-cant-use {
background: url(./img/icon_cantuse.png) no-repeat center center;
}
.background-plugin-is-disable {
background: url(./img/icon_disable.png) no-repeat center center;
}
.background-plugin-is-disable-new {
background: url(./img/icon_disable-new.png) no-repeat center center;
}
.background-plugin-selected {
background: url(./img/icon_marked.png) no-repeat center center;
}
.background-shop-title-close {
background: url(./img/icon_close40x40_normal.svg) no-repeat center center;
}
.background-dialog-confirm {
background: url(./img/warning.png) no-repeat center center;
background-size: contain;
}
.background-close-button {
background: url(./img/icon_close9x9_normal.png) no-repeat center center;
}
.background-close-button:hover {
background: url(./img/icon_close9x9_hover.png) no-repeat center center;
}
.designer-login-login-foot .login-foot-text {
font-size: 14px;
color: #647185;
}
.designer-login-login-foot .login-link {
font-size: 14px;
color: #3685F2;
}
.background-login-close {
color: white !important;
font-weight: bold;
font-size: 14px;
}
.background-guide-close {
color: black !important;
font-weight: bold;
font-size: 16px;
}
.background-login-loading {
background: url(./img/login_loading.gif) no-repeat center center;
}
.background-plugin-need-update {
background: url(./img/icon_new.png) no-repeat center center;
}
.background-plugin-cant-use {
background: url(./img/icon_cantuse.png) no-repeat center center;
}
.background-plugin-is-disable {
background: url(./img/icon_disable.png) no-repeat center center;
}
.background-plugin-is-disable-new {
background: url(./img/icon_disable-new.png) no-repeat center center;
}
.background-plugin-selected {
background: url(./img/icon_marked.png) no-repeat center center;
}
.background-shop-title-close {
background: url(./img/icon_close40x40_normal.svg) no-repeat center center;
}
.background-dialog-confirm {
background: url(./img/warning.png) no-repeat center center;
background-size: contain;
}
.background-close-button {
background: url(./img/icon_close9x9_normal.png) no-repeat center center;
}
.background-close-button:hover {
background: url(./img/icon_close9x9_hover.png) no-repeat center center;
}
.designer-login-login {
border: solid 1px #009DE3;
}
.designer-login {
background-color: #3685F2;
}

25
designer-base/src/main/resources/com/fr/design/login/login.html

@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>title</title>
<style>
@font-face {
font-family: "fineui";
src: url('../lib/font/iconfont.eot');
src: url('../lib/font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../lib/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('../lib/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('../lib/font/iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */
}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="lib/bundle.css"/>
<script type="text/javascript" charset="UTF-8" src="lib/locale/login_zh_CN.js?_=compatible"></script>
<script type="text/javascript" charset="UTF-8" src="lib/locale/login_${language}.js"></script><script type="text/javascript" charset="UTF-8" src="lib/fineui.min.js"></script><script type="text/javascript"></script>
<style>
body {
overflow-y: auto;
}
</style>
<link href="login.css" rel="stylesheet"></head>
</html>
<script type="text/javascript" src="login.js"></script>

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

File diff suppressed because one or more lines are too long

9
designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/OnlineWidgetBlock.java

@ -1,14 +1,15 @@
package com.fr.design.mainframe.share.ui.block;
import com.fr.base.iofile.attr.SharableAttrMark;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.designer.creator.XCreator;
import com.fr.design.extra.WebViewDlgHelper;
import com.fr.design.form.util.XCreatorConstants;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.login.DesignerLoginHelper;
import com.fr.design.login.DesignerLoginSource;
import com.fr.design.mainframe.WidgetToolBarPane;
import com.fr.design.mainframe.share.collect.ComponentCollector;
import com.fr.form.share.group.DefaultShareGroup;
@ -156,9 +157,9 @@ public class OnlineWidgetBlock extends AbstractOnlineWidgetBlock {
final WidgetDownloadProcess process = new WidgetDownloadProcess();
downloading = true;
process.process(0.0D);
String userName = MarketConfig.getInstance().getBbsUsername();
String userName = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
if (StringUtils.isEmpty(userName)) {
WebViewDlgHelper.createLoginDialog();
DesignerLoginHelper.showLoginDialog(DesignerLoginSource.NORMAL);
downloading = false;
return;
}

3
designer-realize/src/main/java/com/fr/design/mainframe/ActiveKeyGenerator.java

@ -1,5 +1,4 @@
package com.fr.design.mainframe;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.general.CloudCenter;
import com.fr.general.http.HttpClient;
@ -101,7 +100,7 @@ public class ActiveKeyGenerator {
HashMap<String, String> para = new HashMap<String, String>();
para.put("uuid", envManager.getUUID());
para.put("key", key);
para.put("username", MarketConfig.getInstance().getBbsUsername());
para.put("username", DesignerEnvManager.getEnvManager().getDesignerLoginUsername());
HttpClient hc = new HttpClient(CloudCenter.getInstance().acquireUrlByKind("verify.code"), para);
if (timeout != -1) {
hc.setTimeout(timeout);

3
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@ -1,7 +1,6 @@
package com.fr.design.mainframe.alphafine.component;
import com.bulenkov.iconloader.IconLoader;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
import com.fr.design.dialog.UIDialog;
@ -952,7 +951,7 @@ public class AlphaFineDialog extends UIDialog {
*/
private void sendDataToServer(String searchKey, AlphaCellModel cellModel) {
if (cellModel.isNeedToSendToServer()) {
String username = MarketConfig.getInstance().getBbsUsername();
String username = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
String uuid = DesignerEnvManager.getEnvManager().getUUID();
String activityKey = DesignerEnvManager.getEnvManager().getActivationKey();
String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(Calendar.getInstance().getTime());

44
designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java

@ -3,19 +3,17 @@
*/
package com.fr.design.mainframe.bbs;
import com.fr.base.FRContext;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.bbs.BBSLoginUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.extra.LoginContextListener;
import com.fr.design.extra.LoginWebBridge;
import com.fr.design.extra.PluginWebBridge;
import com.fr.design.extra.UserLoginContext;
import com.fr.design.extra.WebViewDlgHelper;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.gui.imenu.UIPopupMenu;
import com.fr.design.locale.impl.BbsSpaceMark;
import com.fr.design.login.DesignerLoginHelper;
import com.fr.design.login.DesignerLoginSource;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.os.impl.SupportOSImpl;
import com.fr.design.upm.event.CertificateEvent;
@ -32,8 +30,8 @@ import com.fr.general.locale.LocaleCenter;
import com.fr.general.locale.LocaleMark;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.EncodeConstants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import java.awt.Color;
import javax.swing.SwingConstants;
import java.awt.Cursor;
import java.awt.Desktop;
@ -82,11 +80,17 @@ public class UserInfoLabel extends UILabel {
@Override
public void mouseEntered(MouseEvent e) {
UserInfoLabel.this.setCursor(new Cursor(Cursor.HAND_CURSOR));
UserInfoLabel.this.setBackground(UIConstants.DESIGNER_LOGIN_BACKGROUND_ONCLICK);
}
@Override
public void mouseExited(MouseEvent e) {
UserInfoLabel.this.setBackground(UIConstants.DESIGNER_LOGIN_BACKGROUND);
}
@Override
public void mouseClicked(MouseEvent e) {
userName = MarketConfig.getInstance().getBbsUsername();
userName = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
if (StringUtils.isNotEmpty(userName)) {
UIPopupMenu menu = new UIPopupMenu();
menu.setOnlyText(true);
@ -113,15 +117,14 @@ public class UserInfoLabel extends UILabel {
closeOther.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
BBSLoginUtils.bbsLogout();
UserLoginContext.fireLoginContextListener();
UserLoginContext.fireLoginContextListener(DesignerLoginSource.SWITCH_ACCOUNT);
}
});
menu.add(priviteMessage);
menu.add(closeOther);
GUICoreUtils.showPopupMenu(menu, UserInfoLabel.this, 0, MENU_HEIGHT);
} else {
UserLoginContext.fireLoginContextListener();
UserLoginContext.fireLoginContextListener(DesignerLoginSource.NORMAL);
}
}
};
@ -202,17 +205,10 @@ public class UserInfoLabel extends UILabel {
this.addMouseListener(userInfoAdapter);
this.setHorizontalAlignment(SwingConstants.CENTER);
if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
}
UserLoginContext.addLoginContextListener(new LoginContextListener() {
@Override
public void showLoginContext() {
WebViewDlgHelper.createLoginDialog();
clearLoginInformation();
updateInfoPane();
public void showLoginContext(DesignerLoginSource source) {
DesignerLoginHelper.showLoginDialog(source);
}
});
EventDispatcher.listen(CertificateEvent.LOGIN, new Listener<String>() {
@ -221,22 +217,12 @@ public class UserInfoLabel extends UILabel {
setText(text);
}
});
EventDispatcher.listen(CertificateEvent.LOGOUT, new Listener<String>() {
@Override
public void on(Event event, String text) {
setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn"));
}
});
}
private void clearLoginInformation() {
BBSLoginUtils.bbsLogout();
}
private void updateInfoPane() {
userInfoPane.markUnSignIn();
}
private void sleep(long millis) {
try {
Thread.sleep(millis);

11
designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoPane.java

@ -5,7 +5,6 @@ package com.fr.design.mainframe.bbs;
import com.fr.base.FRContext;
import com.fr.concurrent.NamedThreadFactory;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicPane;
@ -34,7 +33,7 @@ public class UserInfoPane extends BasicPane {
/**
* 默认未登录颜色
*/
private static final Color UN_LOGIN_BACKGROUND = UIConstants.TEMPLATE_TAB_PANE_BACKGROUND;
private static final Color UN_LOGIN_BACKGROUND = UIConstants.DESIGNER_LOGIN_BACKGROUND;
private static final Color LOGIN_BACKGROUND = new Color(184, 220, 242);
private static final int WIDTH = 104;
private static final int HEIGHT = 24;
@ -91,7 +90,8 @@ public class UserInfoPane extends BasicPane {
* 标志未登录状态, 面板设置为灰色
*/
public void markUnSignIn() {
this.userInfoLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn"));
this.userInfoLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Login_Onclick"));
this.userInfoLabel.setForeground(Color.WHITE);
this.userInfoLabel.setOpaque(true);
this.userInfoLabel.setBackground(UN_LOGIN_BACKGROUND);
this.userInfoLabel.resetUserName();
@ -104,6 +104,7 @@ public class UserInfoPane extends BasicPane {
*/
public void markSignIn(String userName) {
this.userInfoLabel.setText(userName);
this.userInfoLabel.setForeground(Color.BLACK);
this.userInfoLabel.setUserName(userName);
this.userInfoLabel.setOpaque(true);
this.userInfoLabel.setBackground(LOGIN_BACKGROUND);
@ -115,7 +116,7 @@ public class UserInfoPane extends BasicPane {
}
public void updateBBSUserInfo() {
String username = MarketConfig.getInstance().getBbsUsername();
String username = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
if (StringUtils.isEmpty(username)) {
markUnSignIn();
} else {
@ -173,7 +174,7 @@ public class UserInfoPane extends BasicPane {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
String userName = MarketConfig.getInstance().getBbsUsername();
String userName = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
if (StringUtils.isNotEmpty(userName)) {
return;
}

3
designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java

@ -2,7 +2,6 @@ package com.fr.design.mainframe.errorinfo;
import com.fr.base.io.IOFile;
import com.fr.base.io.XMLReadHelper;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.i18n.Toolkit;
import com.fr.web.session.SessionLocalManager;
@ -43,7 +42,7 @@ public class ErrorInfoLogAppender extends AppenderSkeleton {
this.layout = new com.fr.third.apache.log4j.PatternLayout("%d{HH:mm:ss} %t %p [%c] %m%n");
DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
this.username = MarketConfig.getInstance().getBbsUsername();
this.username = envManager.getDesignerLoginUsername();
this.uuid = envManager.getUUID();
this.activekey = envManager.getActivationKey();
}

3
designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/entity/FileEntityBuilder.java

@ -1,6 +1,5 @@
package com.fr.design.mainframe.messagecollect.entity;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.general.CloudClient;
import com.fr.general.IOUtils;
@ -103,7 +102,7 @@ public class FileEntityBuilder {
CloudClient client = CloudClient.getInstance();
String today = new JDateTime().toString("YYYY-MM-DD");
String filePath = FOCUS_POINT_FILE_ROOT_PATH + CoreConstants.SEPARATOR + today + CoreConstants.SEPARATOR + keyFileName;
String bbsUserName = MarketConfig.getInstance().getBbsUsername();
String bbsUserName = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
String uuid = DesignerEnvManager.getEnvManager().getUUID();
String name = StringUtils.isEmpty(bbsUserName) ? uuid : bbsUserName;

4
designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareLoginLabel.java

@ -1,6 +1,6 @@
package com.fr.design.share.ui.generate;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.mainframe.bbs.UserInfoPane;
import com.fr.stable.StringUtils;
@ -35,7 +35,7 @@ public class ShareLoginLabel extends UILabel {
private void tryGetLogin() {
String bbsUsername = MarketConfig.getInstance().getBbsUsername();
String bbsUsername = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
if (StringUtils.isNotEmpty(bbsUsername)) {
vendorPane.remove(unLoginLabel);
loginLabel.setText(bbsUsername);

10
designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java

@ -1,12 +1,11 @@
package com.fr.design.share.ui.generate;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.extra.LoginWebBridge;
import com.fr.design.extra.WebViewDlgHelper;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icombobox.UIComboBox;
@ -18,6 +17,8 @@ import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.login.DesignerLoginHelper;
import com.fr.design.login.DesignerLoginSource;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.share.constants.ComponentType;
import com.fr.design.mainframe.share.constants.ComponentTypes;
@ -43,6 +44,7 @@ import com.fr.stable.ProductConstants;
import com.fr.stable.StringUtils;
import com.fr.stable.collections.combination.Pair;
import com.fr.stable.pinyin.PinyinHelper;
import java.util.HashMap;
import org.jetbrains.annotations.NotNull;
import javax.swing.BorderFactory;
@ -419,7 +421,7 @@ public class ShareMainPane extends JPanel {
final JPanel vendorPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
String bbsUsername = MarketConfig.getInstance().getBbsUsername();
String bbsUsername = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
if (StringUtils.isEmpty(bbsUsername)) {
UILabel unLoginLabel = ShareUIUtils.createHyperlinkLabel(Toolkit.i18nText("Fine-Design_Share_Click_Login"));
@ -431,7 +433,7 @@ public class ShareMainPane extends JPanel {
LoginWebBridge.getHelper().setUILabel(hidden);
Dialog shareDialog = ShareDialogUtils.getInstance().getShareDialog();
//必须这样创建,不然窗口优先级不对
WebViewDlgHelper.createLoginDialog(shareDialog);
DesignerLoginHelper.showLoginDialog(DesignerLoginSource.NORMAL, new HashMap<>(), shareDialog);
}
});
vendorPane.add(unLoginLabel);

1
designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java

@ -52,6 +52,7 @@ public class CollectUserInformationDialog extends UIDialog {
FineJOptionPane.showMessageDialog(CollectUserInformationDialog.this, message);
DesignerEnvManager.getEnvManager().setActivationKey(keyValue);
DesignerEnvManager.getEnvManager().saveXMLFile();
DesignerEnvManager.getEnvManager().setDesignerActivatedTime(System.currentTimeMillis());
doOK();
} else {
message = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Activate_Activation_Code_Invalid");

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save