Browse Source

Pull request #15875: REPORT-138589 fix: 设计器启动内置的servletContext注册ws

Merge in DESIGN/design from ~ANNER/design:fbp/release to fbp/release

* commit '3530d684feb94ded1dd953cce4a4e75a4276afa4':
  REPORT-138589 fix: 设计器启动内置的servletContext注册ws
fbp/release
Anner-王敬松 2 months ago
parent
commit
ff0bb3878d
  1. 7
      designer-base/src/main/java/com/fr/start/server/DesignEmbedHelper.java

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

@ -7,6 +7,7 @@ import com.fr.design.DesignerEnvManager;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.EncodeConstants;
import com.fr.stable.StringUtils;
import com.fr.third.guava.collect.Sets;
import com.fr.third.springframework.web.SpringServletContainerInitializer;
import com.fr.third.springframework.web.context.support.AnnotationConfigWebApplicationContext;
import com.fr.workspace.WorkContext;
@ -16,7 +17,8 @@ import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.webresources.StandardRoot;
import org.apache.tomcat.websocket.server.WsSci;
;import java.io.File;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
@ -25,6 +27,8 @@ import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
;
/**
* 内置服务器工具类
*
@ -100,6 +104,7 @@ public class DesignEmbedHelper {
Set<Class<?>> classes = new HashSet<Class<?>>();
classes.add(EmbedWebApplicationInitializer.class);
context.addServletContainerInitializer(initializer, classes);
context.addServletContainerInitializer(new WsSci(), Sets.newHashSet(WebSocketEndpoint.class));
}
/**

Loading…
Cancel
Save