REPORT-47101 海外设计器通行证相关链接替换

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

@@ -6,8 +6,12 @@ import com.fr.config.MarketConfig;
 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.general.CloudCenter;
 import com.fr.general.http.HttpClient;
+import com.fr.general.locale.LocaleCenter;
+import com.fr.general.locale.LocaleMark;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import javafx.concurrent.Task;
@@ -118,7 +122,8 @@ public class LoginWebBridge {
      */
     public void registerHref() {
         try {
-            Desktop.getDesktop().browse(new URI(CloudCenter.getInstance().acquireUrlByKind("bbs.register")));
+            LocaleMark<String> registerMark = LocaleCenter.getMark(BbsRegisterMark.class);
+            Desktop.getDesktop().browse(new URI(registerMark.getValue()));
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
@@ -129,7 +134,8 @@ public class LoginWebBridge {
      */
     public void forgetHref() {
         try {
-            Desktop.getDesktop().browse(new URI(CloudCenter.getInstance().acquireUrlByKind("bbs.reset")));
+            LocaleMark<String> resetMark = LocaleCenter.getMark(BbsResetMark.class);
+            Desktop.getDesktop().browse(new URI(resetMark.getValue()));
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }

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

@@ -13,8 +13,13 @@ 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.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;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
@@ -434,8 +439,8 @@ public class PluginWebBridge {
      */
     public void getPriviteMessage() {
         try {
-            String loginUrl = CloudCenter.getInstance().acquireUrlByKind("bbs.default");
+            LocaleMark<String> spaceMark = LocaleCenter.getMark(BbsSpaceMark.class);
-            Desktop.getDesktop().browse(new URI(loginUrl));
+            Desktop.getDesktop().browse(new URI(spaceMark.getValue()));
         } catch (Exception exp) {
             FineLoggerFactory.getLogger().info(exp.getMessage());
         }
@@ -497,7 +502,8 @@ public class PluginWebBridge {
      */
     public void registerHref() {
         try {
-            Desktop.getDesktop().browse(new URI(CloudCenter.getInstance().acquireUrlByKind("bbs.register")));
+            LocaleMark<String> registerMark = LocaleCenter.getMark(BbsRegisterMark.class);
+            Desktop.getDesktop().browse(new URI(registerMark.getValue()));
         } catch (Exception e) {
             FineLoggerFactory.getLogger().info(e.getMessage());
         }
@@ -511,7 +517,8 @@ public class PluginWebBridge {
      */
     public void forgetHref() {
         try {
-            Desktop.getDesktop().browse(new URI(CloudCenter.getInstance().acquireUrlByKind("bbs.reset")));
+            LocaleMark<String> resetMark = LocaleCenter.getMark(BbsResetMark.class);
+            Desktop.getDesktop().browse(new URI(resetMark.getValue()));
         } catch (Exception e) {
             FineLoggerFactory.getLogger().info(e.getMessage());
         }

designer-base/src/main/java/com/fr/design/locale/impl/BbsRegisterMark.java

@@ -0,0 +1,38 @@
+package com.fr.design.locale.impl;
+
+import com.fr.general.CloudCenter;
+import com.fr.general.GeneralContext;
+import com.fr.general.locale.LocaleMark;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/1/29
+ */
+public class BbsRegisterMark implements LocaleMark<String> {
+
+    private final Map<Locale, String> map = new HashMap<>();
+    private static final String BBS_REGISTER_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.register");
+    private static final String BBS_REGISTER_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.register");
+    private static final String BBS_REGISTER_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US");
+    private static final String BBS_REGISTER_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US");
+    private static final String BBS_REGISTER_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US");
+
+    public BbsRegisterMark() {
+        map.put(Locale.CHINA, BBS_REGISTER_CN);
+        map.put(Locale.KOREA, BBS_REGISTER_KR);
+        map.put(Locale.JAPAN, BBS_REGISTER_JP);
+        map.put(Locale.US, BBS_REGISTER_EN);
+        map.put(Locale.TAIWAN, BBS_REGISTER_TW);
+    }
+
+    @Override
+    public String getValue() {
+        String result = map.get(GeneralContext.getLocale());
+        return result == null ? BBS_REGISTER_EN : result;
+    }
+}

designer-base/src/main/java/com/fr/design/locale/impl/BbsResetMark.java

@@ -0,0 +1,38 @@
+package com.fr.design.locale.impl;
+
+import com.fr.general.CloudCenter;
+import com.fr.general.GeneralContext;
+import com.fr.general.locale.LocaleMark;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/1/29
+ */
+public class BbsResetMark implements LocaleMark<String> {
+
+    private final Map<Locale, String> map = new HashMap<>();
+    private static final String BBS_RESET_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.reset");
+    private static final String BBS_RESET_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.reset");
+    private static final String BBS_RESET_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US");
+    private static final String BBS_RESET_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US");
+    private static final String BBS_RESET_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US");
+
+    public BbsResetMark() {
+        map.put(Locale.CHINA, BBS_RESET_CN);
+        map.put(Locale.KOREA, BBS_RESET_KR);
+        map.put(Locale.JAPAN, BBS_RESET_JP);
+        map.put(Locale.US, BBS_RESET_EN);
+        map.put(Locale.TAIWAN, BBS_RESET_TW);
+    }
+
+    @Override
+    public String getValue() {
+        String result = map.get(GeneralContext.getLocale());
+        return result == null ? BBS_RESET_EN : result;
+    }
+}

designer-base/src/main/java/com/fr/design/locale/impl/BbsSpaceMark.java

@@ -0,0 +1,39 @@
+package com.fr.design.locale.impl;
+
+import com.fr.general.CloudCenter;
+import com.fr.general.GeneralContext;
+import com.fr.general.locale.LocaleMark;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/1/29
+ */
+public class BbsSpaceMark implements LocaleMark<String> {
+
+    private final Map<Locale, String> map = new HashMap<>();
+    private static final String BBS_SPACE_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.default");
+    private static final String BBS_SPACE_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.default");
+    private static final String BBS_SPACE_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.default.en_US");
+    private static final String BBS_SPACE_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.default.en_US");
+    private static final String BBS_SPACE_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.default.en_US");
+
+    public BbsSpaceMark() {
+        map.put(Locale.CHINA, BBS_SPACE_CN);
+        map.put(Locale.KOREA, BBS_SPACE_KR);
+        map.put(Locale.JAPAN, BBS_SPACE_JP);
+        map.put(Locale.US, BBS_SPACE_EN);
+        map.put(Locale.TAIWAN, BBS_SPACE_TW);
+    }
+
+    @Override
+    public String getValue() {
+        String result = map.get(GeneralContext.getLocale());
+        return result == null ? BBS_SPACE_EN : result;
+    }
+
+}

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

@@ -16,6 +16,9 @@ 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.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;
@@ -23,6 +26,8 @@ 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;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
@@ -424,8 +429,8 @@ public class UpmBridge {
     @JSBridge
     public void getPriviteMessage() {
         try {
-            String loginUrl = CloudCenter.getInstance().acquireUrlByKind("bbs.default");
+            LocaleMark<String> spaceMark = LocaleCenter.getMark(BbsSpaceMark.class);
-            Desktop.getDesktop().browse(new URI(loginUrl));
+            Desktop.getDesktop().browse(new URI(spaceMark.getValue()));
         } catch (Exception exp) {
             FineLoggerFactory.getLogger().info(exp.getMessage());
         }
@@ -437,7 +442,8 @@ public class UpmBridge {
     @JSBridge
     public void forgetHref() {
         try {
-            Desktop.getDesktop().browse(new URI(CloudCenter.getInstance().acquireUrlByKind("bbs.reset")));
+            LocaleMark<String> resetMark = LocaleCenter.getMark(BbsResetMark.class);
+            Desktop.getDesktop().browse(new URI(resetMark.getValue()));
         } catch (Exception e) {
             FineLoggerFactory.getLogger().info(e.getMessage());
         }
@@ -449,7 +455,8 @@ public class UpmBridge {
     @JSBridge
     public void registerHref() {
         try {
-            Desktop.getDesktop().browse(new URI(CloudCenter.getInstance().acquireUrlByKind("bbs.register")));
+            LocaleMark<String> registerMark = LocaleCenter.getMark(BbsRegisterMark.class);
+            Desktop.getDesktop().browse(new URI(registerMark.getValue()));
         } catch (Exception e) {
             FineLoggerFactory.getLogger().info(e.getMessage());
         }

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

@@ -8,11 +8,15 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ipasswordfield.UIPassWordField;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.locale.impl.BbsRegisterMark;
+import com.fr.design.locale.impl.BbsResetMark;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.http.HttpClient;
+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.StringUtils;
@@ -65,6 +69,8 @@ public class BBSLoginDialog extends UIDialog {
     private UILabel tipLabel;
     private BoxCenterAligmentPane passwordReset;
     private BoxCenterAligmentPane registerLabel;
+    private LocaleMark<String> resetMark = LocaleCenter.getMark(BbsResetMark.class);
+    private LocaleMark<String> registerMark = LocaleCenter.getMark(BbsRegisterMark.class);
 
     private KeyListener keyListener = new KeyAdapter() {
         public void keyPressed(KeyEvent e) {
@@ -113,8 +119,8 @@ public class BBSLoginDialog extends UIDialog {
         nameField = new UITextField();
         passField = new UIPassWordField();
         loginButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Login"));
-        passwordReset = getURLActionLabel(CloudCenter.getInstance().acquireUrlByKind("bbs.reset"));
+        passwordReset = getURLActionLabel(resetMark.getValue());
-        registerLabel = getURLActionLabel(CloudCenter.getInstance().acquireUrlByKind("bbs.register"));
+        registerLabel = getURLActionLabel(registerMark.getValue());
         loginButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent arg0) {
@@ -311,7 +317,7 @@ public class BBSLoginDialog extends UIDialog {
 
     private BoxCenterAligmentPane getURLActionLabel(final String url) {
         ActionLabel actionLabel = new ActionLabel(url);
-        if (ComparatorUtils.equals(url, CloudCenter.getInstance().acquireUrlByKind("bbs.reset"))) {
+        if (ComparatorUtils.equals(url, resetMark.getValue())) {
             actionLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Forgot-Password"));
         } else {
             actionLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Register_Account"));

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

@@ -15,6 +15,7 @@ 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.mainframe.DesignerContext;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.upm.event.CertificateEvent;
@@ -27,6 +28,8 @@ import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.DateUtils;
 import com.fr.general.http.HttpClient;
+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;
@@ -96,8 +99,8 @@ public class UserInfoLabel extends UILabel {
                     public void mousePressed(MouseEvent e) {
                         if (StringUtils.isNotEmpty(userName)) {
                             try {
-                                String loginUrl = CloudCenter.getInstance().acquireUrlByKind("bbs.default");
+                                LocaleMark<String> spaceMark = LocaleCenter.getMark(BbsSpaceMark.class);
-                                Desktop.getDesktop().browse(new URI(loginUrl));
+                                Desktop.getDesktop().browse(new URI(spaceMark.getValue()));
                             } catch (Exception exp) {
                                 FineLoggerFactory.getLogger().info(exp.getMessage());
                             }