Merge pull request #4854 in DESIGN/design from feature/10.0 to feature/big-screen

* commit 'adf8d7c56e303e16f13deb754b3e4bb98bf74856':
  REPORT-53762 插件登录和短信登录平台，使用的是http协议，需要修改
  REPORT-53614 远程环境检测及同步-同步jar时有问题

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

@@ -16,8 +16,8 @@ import java.util.Map;
 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", "http://id.fanruan.com/register/register.php?clueSource=activityfr");
-    private static final String BBS_REGISTER_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.register", "http://id.fanruan.com/register/register.php?clueSource=activityfr");
+    private static final String BBS_REGISTER_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.register", "https://id.fanruan.com/register/register.php?clueSource=activityfr");
+    private static final String BBS_REGISTER_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.register", "https://id.fanruan.com/register/register.php?clueSource=activityfr");
     private static final String BBS_REGISTER_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");
     private static final String BBS_REGISTER_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");
     private static final String BBS_REGISTER_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");

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

@@ -16,8 +16,8 @@ import java.util.Map;
 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", "http://id.fanruan.com/forget/forget.php?clue=activityfr");
-    private static final String BBS_RESET_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.reset", "http://id.fanruan.com/forget/forget.php?clue=activityfr");
+    private static final String BBS_RESET_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.reset", "https://id.fanruan.com/forget/forget.php?clue=activityfr");
+    private static final String BBS_RESET_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.reset", "https://id.fanruan.com/forget/forget.php?clue=activityfr");
     private static final String BBS_RESET_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");
     private static final String BBS_RESET_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");
     private static final String BBS_RESET_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");

designer-base/src/main/java/com/fr/env/CheckServiceDialog.java

@@ -167,8 +167,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         centerPanel.add(detailsPane, BorderLayout.CENTER);
         JPanel buttonPanel = FRGUIPaneFactory.createBorderLayout_M_Pane();
         buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
-        boolean Sync = false;
-        if (Sync && isOnline()) {
+        if (isOnline()) {
             ignoreButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Sync_Ignore"));
             ignoreButton.addActionListener(this);
             syncButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Sync_To_Local"));
@@ -184,6 +183,8 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
             buttonPanel.add(progressBar, BorderLayout.CENTER);
             buttonPanel.add(syncButton, BorderLayout.EAST);
         } else {
+            UILabel adviceLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Sync_Suggestion"));
+            centerPanel.add(adviceLabel, BorderLayout.SOUTH);
             UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Button_Confirm"));
             okButton.addActionListener(this);
             buttonPanel.add(okButton, BorderLayout.EAST);