Merge pull request #1507 in DESIGN/design from ~MAKSIM/design:release/10.0 to release/10.0

* commit 'a70c2e2c6f1fe1a6dbc7e4366e648e86c36d4aa6':
  忽略展示不想暴露的服务
  格式
  去掉测试连接时旧的版本提示

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -250,6 +250,9 @@ public class EnvChangeEntrance {
                         FineLoggerFactory.getLogger().info("workspace service {} get annotation failed", clazz);
                         continue;
                     }
+                    if(workspaceAPI.ignore()){
+                        continue;
+                    }
                     String descriptionOfCN = InterProviderFactory.getProvider().getLocText(workspaceAPI.description());
                     textBuilder.append(descriptionOfCN).append("\n");
                 }

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

@@ -49,7 +49,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         JLabel imageLabel = new JLabel();
         imageLabel.setIcon(icon);
         imagePanel.add(imageLabel);
-        imagePanel.setPreferredSize(new Dimension(110,80));
+        imagePanel.setPreferredSize(new Dimension(110,100));
 
         JPanel verticalPanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
         FRFont font = FRFont.getInstance();
@@ -68,7 +68,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         JTextPane tipsPane = new JTextPane();
         tipsPane.setEditable(false);
         tipsPane.setBackground(verticalPanel.getBackground());
-        tipsPane.setPreferredSize(new Dimension(500,30));
+        tipsPane.setPreferredSize(new Dimension(500,40));
         tipsPane.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Need_Update"));
 
         verticalPanel.add(label);
@@ -77,6 +77,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
 
         topPanel.add(imagePanel,BorderLayout.WEST);
         topPanel.add(verticalPanel,BorderLayout.CENTER);
+        topPanel.setBorder(BorderFactory.createEmptyBorder(10,10,0,10));
 
         //中间的文本域面板
         centerPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();

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

@@ -34,7 +34,7 @@ public enum TestConnectionResult {
     },
 
     /**
-     * 不完全成功，版本不匹配，但测试连接成功。
+     * 不完全成功，版本不匹配，但测试连接成功。该状态先保留
      */
     PARTLY_SUCCESS {
         @Override
@@ -89,16 +89,7 @@ public enum TestConnectionResult {
         if (!value) {
             return FULLY_FAILED;
         }
-        try {
+        //去掉测试连接时所做的检测
-            String serverVersion = new FunctionalHttpRequest(info).getServerVersion();
+        return FULLY_SUCCESS;
-            if (AssistUtils.equals(serverVersion, WorkContext.getVersion())) {
-                return FULLY_SUCCESS;
-            }
-            return PARTLY_SUCCESS;
-        } catch (Exception e) {
-            // 发生异常，说明没连接上。返回完全失败。
-            FineLoggerFactory.getLogger().error(e.getMessage());
-            return FULLY_FAILED;
-        }
     }
 }