From 9c40315bbb16fd10dfede4a17b5c57c9cbad6f68 Mon Sep 17 00:00:00 2001
From: ju <ju@finereport.com>
Date: Thu, 7 Jun 2018 14:17:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CORE-76=20Activator=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=86=85=E7=BD=AE=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E3=80=81=E5=88=87=E6=8D=A2=E7=8E=AF=E5=A2=83=E7=9A=84=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=20=20=E5=AE=8C=E5=96=84core=E4=B8=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E5=85=B3=E9=97=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/start/module/DesignerStartup.java            | 2 +-
 .../src/com/fr/start/module/EnvBasedModule.java             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer-realize/src/com/fr/start/module/DesignerStartup.java b/designer-realize/src/com/fr/start/module/DesignerStartup.java
index c57a9b807a..eb1cc85d72 100644
--- a/designer-realize/src/com/fr/start/module/DesignerStartup.java
+++ b/designer-realize/src/com/fr/start/module/DesignerStartup.java
@@ -24,7 +24,7 @@ public class DesignerStartup extends Activator {
         Designer designer = new Designer(args);
         //启动env
         startSub(DesignerEnvProvider.class);
-        getSub(EnvBasedModule.class).start();
+        startSub(EnvBasedModule.class);
         getRoot().getSingleton(EnvSwitcher.class).switch2LastEnv();
         registerEnvListener();
         //启动设计器界面
diff --git a/designer-realize/src/com/fr/start/module/EnvBasedModule.java b/designer-realize/src/com/fr/start/module/EnvBasedModule.java
index bc32128ab0..f9538e25d3 100644
--- a/designer-realize/src/com/fr/start/module/EnvBasedModule.java
+++ b/designer-realize/src/com/fr/start/module/EnvBasedModule.java
@@ -13,7 +13,7 @@ public class EnvBasedModule extends Activator {
     @Override
     public void start() {
         //core和设计器启动
-        getSub(CoreActivator.class).start();
+        startSub(CoreActivator.class);
         getSub("designer").start();
         //这里不启动tomcat，由客户手动触发
     }
@@ -21,9 +21,9 @@ public class EnvBasedModule extends Activator {
     @Override
     public void stop() {
         //先关闭tomcat(如果已经启动了的话)
-        getSub(FineEmbedServerActivator.class).stop();
+        stopSub(FineEmbedServerActivator.class);
         //倒叙关闭其他模块
         getSub("designer").stop();
-        getSub(CoreActivator.class).stop();
+        stopSub(CoreActivator.class);
     }
 }

From 4aa3641c1dce2ac1e4382ac70a9b0a4ffd05e3ed Mon Sep 17 00:00:00 2001
From: ju <ju@finereport.com>
Date: Thu, 7 Jun 2018 14:27:18 +0800
Subject: [PATCH 2/2] fix

---
 designer-realize/src/com/fr/start/module/EnvBasedModule.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer-realize/src/com/fr/start/module/EnvBasedModule.java b/designer-realize/src/com/fr/start/module/EnvBasedModule.java
index f9538e25d3..286fbe663f 100644
--- a/designer-realize/src/com/fr/start/module/EnvBasedModule.java
+++ b/designer-realize/src/com/fr/start/module/EnvBasedModule.java
@@ -2,7 +2,7 @@ package com.fr.start.module;
 
 import com.fr.module.Activator;
 import com.fr.stable.CoreActivator;
-import com.fr.start.server.FineEmbedServerActivator;
+import com.fr.start.server.FineEmbedServer;
 
 /**
  * Created by juhaoyu on 2018/6/6.
@@ -21,7 +21,7 @@ public class EnvBasedModule extends Activator {
     @Override
     public void stop() {
         //先关闭tomcat(如果已经启动了的话)
-        stopSub(FineEmbedServerActivator.class);
+        FineEmbedServer.stop();
         //倒叙关闭其他模块
         getSub("designer").stop();
         stopSub(CoreActivator.class);