Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0

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

@@ -132,36 +132,7 @@ public class EnvChangeEntrance {
             if (template != null) {
                 template.refreshToolArea();
             }
-
+            showServiceDialog(selectedEnv);
-            //是否需要做服务校验
-            if(needCheckBranch(selectedEnv)) {
-                String localBranch;
-                String remoteBranch;
-                localBranch = GeneralUtils.readFullBuildNO();
-                try {
-                    remoteBranch = new FunctionalHttpRequest(connectionInfo).getServerBranch();
-                } catch (WorkspaceConnectionException e) {
-                    remoteBranch = Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Is_Old") + formatBranch(localBranch);
-                }
-                //通过是否包含#来避免当前版本为非安装版本（主要是内部开发版本）
-                if (localBranch.contains("#") && localBranch.equals(remoteBranch)) {
-                    //说明版本一致，仅做日志记录
-                    FineLoggerFactory.getLogger().info("Remote Designer version consistency");
-                } else {
-                    localBranch = formatBranch(localBranch);
-                    remoteBranch = formatBranch(remoteBranch);
-                    Set<Class> noExistServiceSet = getNoExistServiceSet(connectionInfo);
-                    StringBuilder textBuilder = new StringBuilder();
-                    for (Class clazz : noExistServiceSet) {
-                        WorkspaceAPI workspaceAPI = (WorkspaceAPI) clazz.getAnnotation(WorkspaceAPI.class);
-                        String descriptionOfCN = InterProviderFactory.getProvider().getLocText(workspaceAPI.description());
-                        textBuilder.append(descriptionOfCN).append("\n");
-                    }
-                    String areaText = textBuilder.toString();
-                    CheckServiceDialog dialog = new CheckServiceDialog(DesignerContext.getDesignerFrame(), areaText, localBranch, remoteBranch);
-                    dialog.setVisible(true);
-                }
-            }
         } catch (WorkspaceAuthException | RegistEditionException e) {
             // String title = Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed");
             // String title = Toolkit.i18nText("Fine-Design_Basic_Lic_Does_Not_Support_Remote");
@@ -238,6 +209,43 @@ public class EnvChangeEntrance {
         return true;
     }
 
+  	/**
+     * 对选择的环境做服务检测
+     * @param selectedEnv 选择的工作环境
+     */
+    public void showServiceDialog(DesignerWorkspaceInfo selectedEnv) throws Exception {
+        //是否需要做服务校验
+        if(needCheckBranch(selectedEnv)) {
+            String localBranch;
+            String remoteBranch;
+            WorkspaceConnectionInfo connectionInfo = selectedEnv.getConnection();
+            localBranch = GeneralUtils.readFullBuildNO();
+            try {
+                remoteBranch = new FunctionalHttpRequest(connectionInfo).getServerBranch();
+            } catch (WorkspaceConnectionException e) {
+                remoteBranch = Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Is_Old") + formatBranch(localBranch);
+            }
+            //通过是否包含#来避免当前版本为非安装版本（主要是内部开发版本）
+            if (localBranch.contains("#") && localBranch.equals(remoteBranch)) {
+                //说明版本一致，仅做日志记录
+                FineLoggerFactory.getLogger().info("Remote Designer version consistency");
+            } else {
+                localBranch = formatBranch(localBranch);
+                remoteBranch = formatBranch(remoteBranch);
+                Set<Class> noExistServiceSet = getNoExistServiceSet(connectionInfo);
+                StringBuilder textBuilder = new StringBuilder();
+                for (Class clazz : noExistServiceSet) {
+                    WorkspaceAPI workspaceAPI = (WorkspaceAPI) clazz.getAnnotation(WorkspaceAPI.class);
+                    String descriptionOfCN = InterProviderFactory.getProvider().getLocText(workspaceAPI.description());
+                    textBuilder.append(descriptionOfCN).append("\n");
+                }
+                String areaText = textBuilder.toString();
+                CheckServiceDialog dialog = new CheckServiceDialog(DesignerContext.getDesignerFrame(), areaText, localBranch, remoteBranch);
+                dialog.setVisible(true);
+            }
+        }
+    }
+
     /**
      * 判断是否需要做版本验证，判断依据为
      * 1、选择的环境为远程环境
@@ -249,6 +257,11 @@ public class EnvChangeEntrance {
         return selectedEnv.getType() == DesignerWorkspaceType.Remote;
     }
 
+    /**
+     * 获取不存在的服务列表
+     * @param info 环境连接信息
+     * @return 以Set形式返回不存在的服务
+     */
     public Set<Class> getNoExistServiceSet(WorkspaceConnectionInfo info){
         Set<Class> noExistServiceSet = new HashSet<Class>();
         Set<Class> remoteServiceSet = new HashSet<Class>();
@@ -295,6 +308,11 @@ public class EnvChangeEntrance {
         }
     }
 
+    /**
+     * 格式化分支版本号
+     * @param branch 初始的分支版本号
+     * @return 格式化后的版本号
+     */
     private String formatBranch(String branch){
         if(branch.contains("#")){
             return branch.substring(branch.lastIndexOf("#") + 1, branch.length() - 13);

designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java

@@ -6,6 +6,10 @@ import com.fr.design.constants.DesignerLaunchStatus;
 import com.fr.design.env.DesignerWorkspaceGenerator;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.LocalDesignerWorkspaceInfo;
+import com.fr.event.Event;
+import com.fr.event.EventDispatcher;
+import com.fr.event.Listener;
+import com.fr.event.Null;
 import com.fr.log.FineLoggerFactory;
 import com.fr.module.Activator;
 import com.fr.stable.StringUtils;
@@ -54,6 +58,18 @@ public class DesignerWorkspaceProvider extends Activator {
                     EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner();
                 } else {
                     WorkContext.switchTo(workspace);
+                    //在设计器完全启动完成后，对初始环境进行一次服务检测，对主要功能无影响，异常仅做日志提示即可
+                    final DesignerWorkspaceInfo selectEnv = workspaceInfo;
+                    EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
+                        @Override
+                        public void on(Event event, Null aNull) {
+                            try {
+                                EnvChangeEntrance.getInstance().showServiceDialog(selectEnv);
+                            } catch (Exception e) {
+                                FineLoggerFactory.getLogger().warn("Check Service Failed");
+                            }
+                        }
+                    });
                 }
             } catch (Throwable e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);