From a892da8369e526773fab78a38e8bba22f7ac8a43 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 18 Apr 2022 11:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E9=BB=98=E8=AE=A4=20Servlet=20=E6=98=A0=E5=B0=84?=
 =?UTF-8?q?=EF=BC=88=E5=90=AF=E7=94=A8=E5=90=8E=E5=8F=AF=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=20webapp=20=E4=B8=8B=E7=9A=84=E9=9D=99=E6=80=81=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E8=AE=BF=E9=97=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/web/DefaultServletConfig.java      | 26 +++++++++++++++++++
 web/src/main/resources/config/application.yml |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 modules/core/src/main/java/com/jeesite/modules/config/web/DefaultServletConfig.java

diff --git a/modules/core/src/main/java/com/jeesite/modules/config/web/DefaultServletConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/web/DefaultServletConfig.java
new file mode 100644
index 00000000..33bf9263
--- /dev/null
+++ b/modules/core/src/main/java/com/jeesite/modules/config/web/DefaultServletConfig.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
+package com.jeesite.modules.config.web;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 是否启用默认 Servlet 映射（启用后可访问 webapp 下的静态资源访问）
+ * @author ThinkGem
+ * @version 2022年4月18日
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnProperty(name="server.servlet.register-default-servlet", havingValue="true", matchIfMissing=false)
+public class DefaultServletConfig implements WebMvcConfigurer {
+
+	@Override
+	public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+		configurer.enable();
+	}
+
+}
\ No newline at end of file
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 2b8f3861..921f1725 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -23,6 +23,7 @@ server:
   port: 8980
   servlet:
     context-path: /js
+    register-default-servlet: false
   tomcat:
     uri-encoding: UTF-8
     # 表单请求数据的最大大小