From 293d1e96755afcd5066acc63ba852dda1cad442e Mon Sep 17 00:00:00 2001
From: rinoux <rinoux@foxmail.com>
Date: Thu, 9 Jan 2020 17:12:11 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-25986=20=E8=AE=BE=E7=BD=AE=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B=E8=B5=84=E6=BA=90=E6=A0=B9=E7=9B=AE=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E5=90=A6=E5=88=99=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87ServletCo?=
 =?UTF-8?q?ntext.getResource=E8=AF=BB=E5=88=B0=E5=B7=A5=E7=A8=8B=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/start/server/FineEmbedServerActivator.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
index 12aebd231..a67b7e55a 100644
--- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
+++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
@@ -1,6 +1,5 @@
 package com.fr.start.server;
 
-import com.fr.base.FRContext;
 import com.fr.design.DesignerEnvManager;
 import com.fr.log.FineLoggerFactory;
 import com.fr.module.Activator;
@@ -15,6 +14,7 @@ import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.webresources.StandardRoot;
 
 import java.io.File;
 import java.util.HashSet;
@@ -63,10 +63,11 @@ public class FineEmbedServerActivator extends Activator {
         // 设置解码uri使用的字符编码
         tomcat.getConnector().setURIEncoding(EncodeConstants.ENCODING_UTF_8);
         String docBase = new File(WorkContext.getCurrent().getPath()).getParent();
-        //内置的上下文是自己定的，这里把WEB_APP_NAME一并设置了，否则下面appName是/null
-        ProductConstants.setWebAppName(ProductConstants.getAppFolderName());
-        String appName = "/" + FRContext.getCommonOperator().getAppName();
-        Context context = tomcat.addContext(appName, docBase);
+
+        //内置的上下文使用工程目录比如webroot
+        String contextPath = "/" + ProductConstants.getAppFolderName();
+        final Context context = tomcat.addContext(contextPath, docBase);
+        context.setResources(new StandardRoot(context));
         Tomcat.initWebappDefaults(context);
         //覆盖tomcat的WebAppClassLoader
         context.setLoader(new FRTomcatLoader());