From 86fbf1db1baa2002e1cf184bc67247af87fb2cc5 Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Sat, 12 Jan 2019 15:45:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into wlf

# Conflicts:
#	src/core/process/Process.java
---
 src/servlet/basic_settings/S_Filter.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/servlet/basic_settings/S_Filter.java

diff --git a/src/servlet/basic_settings/S_Filter.java b/src/servlet/basic_settings/S_Filter.java
new file mode 100644
index 0000000..b8144e1
--- /dev/null
+++ b/src/servlet/basic_settings/S_Filter.java
@@ -0,0 +1,17 @@
+package servlet.basic_settings;
+
+import javax.servlet.*;
+import java.io.IOException;
+
+public class S_Filter implements Filter {
+
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+
+    }
+    public void destory(){
+
+    }
+}