Browse Source

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

* commit '0e214d0eb894d399656308e878bf6804a481c57b':
  rt
  REPORT-14020 可以重复打开设计器 调试的代码上次误传了
10.0
Kara 6 years ago
parent
commit
1b2285c0f9
  1. 12
      designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
  2. 1
      designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java

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

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

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

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

Loading…
Cancel
Save