Merge pull request #728 in DESIGN/design from ~XIAOXIA/design:10.0 to 10.0

* commit '0e214d0eb894d399656308e878bf6804a481c57b':
  rt
  REPORT-14020 可以重复打开设计器 调试的代码上次误传了

designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@@ -65,12 +65,12 @@ public class DesignUtils {
      * @return 启动了返回true
      */
     public static boolean isStarted() {
-//        try {
-//            new Socket("localhost", port);
-//            return true;
-//        } catch (Exception exp) {
-//
-//        }
+        try {
+            new Socket("localhost", port);
+            return true;
+        } catch (Exception exp) {
+
+        }
         return false;
     }
 

designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java

@@ -68,6 +68,7 @@ public class FineEmbedServerActivator extends Activator {
         //覆盖tomcat的WebAppClassLoader
         context.setLoader(new FRTomcatLoader());
 
+
         //直接指定initializer，tomcat就不用再扫描一遍了
         SpringServletContainerInitializer initializer = new SpringServletContainerInitializer();
         Set<Class<?>> classes = new HashSet<Class<?>>();