1

src/main/java/com/chinaitop/depot/storage/utils/CustomFilter.java

@@ -1,15 +1,18 @@
 package com.chinaitop.depot.storage.utils;
 
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import com.chinaitop.depot.storage.utils.DataPolicyEngine;
-import com.chinaitop.depot.storage.utils.ParameterRequestWrapper;
+import java.io.IOException;
 
-import javax.servlet.*;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import java.io.IOException;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class CustomFilter implements Filter {
 
@@ -21,29 +24,46 @@ public class CustomFilter implements Filter {
 	@Override
 	public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2)
 			throws IOException, ServletException {
-		ParameterRequestWrapper requestWrapper = new ParameterRequestWrapper((HttpServletRequest) arg0);
-		HttpServletRequest request = (HttpServletRequest) arg0;
-		HttpSession session = request.getSession();
-		String orgId = "";
-		if (session != null){
-			orgId = ObjectUtils.toString(session.getAttribute("orgId"), "");
-		}
-		if (StringUtils.isNotBlank(orgId)) {
-			DataPolicyEngine.set(orgId);
-		}
-
-		if (StringUtils.isNotBlank(orgId)) {
-			// 将参数追加到request url 之后
-			requestWrapper.addParameter("orgId", orgId);
-			requestWrapper.addParameter("unitid", orgId);
-			requestWrapper.addParameter("unitId", orgId);
-			// 将参数追加到request 的body 中
-			requestWrapper.addParameterToBody("orgId", orgId);
-			requestWrapper.addParameterToBody("unitid", orgId);
-			requestWrapper.addParameterToBody("unitId", orgId);
-		}
-
-		arg2.doFilter(requestWrapper, arg1);
+
+		if (StringUtils.isBlank(arg0.getContentType()) || this.isJson(arg0)) {
+	    	ParameterRequestWrapper requestWrapper = new ParameterRequestWrapper((HttpServletRequest) arg0);
+	    	HttpServletRequest request = (HttpServletRequest) arg0;
+	    	HttpSession session = request.getSession();
+	    	String orgId = "";
+	    	if (session != null){
+	    		orgId = ObjectUtils.toString(session.getAttribute("orgId"), "");
+	    	}
+	    	if (StringUtils.isNotBlank(orgId)) {
+	    		DataPolicyEngine.set(orgId);
+	    	}
+	    	
+	    	if (StringUtils.isNotBlank(orgId)) {
+	    		// 将参数追加到request url 之后
+	    		requestWrapper.addParameter("orgId", orgId);
+	    		requestWrapper.addParameter("unitid", orgId);
+	    		requestWrapper.addParameter("unitId", orgId);
+	    		// 将参数追加到request 的body 中
+	    		requestWrapper.addParameterToBody("orgId", orgId);
+	    		requestWrapper.addParameterToBody("unitid", orgId);
+	    		requestWrapper.addParameterToBody("unitId", orgId);
+	    	}
+	    	
+	    	arg2.doFilter(requestWrapper, arg1);
+//	    } else if (isMultipart(arg0)) {
+	    } else {
+	    	HttpServletRequest request = (HttpServletRequest) arg0;
+	    	HttpSession session = request.getSession();
+	    	String orgId = "";
+	    	if (session != null){
+	    		orgId = ObjectUtils.toString(session.getAttribute("orgId"), "");
+	    	}
+	    	if (StringUtils.isNotBlank(orgId)) {
+	    		DataPolicyEngine.set(orgId);
+	    	}
+
+	    	arg2.doFilter(arg0, arg1);
+	    }
+
 		DataPolicyEngine.remove();
 	}
 	
@@ -52,4 +72,27 @@ public class CustomFilter implements Filter {
  
     }
 
+	private boolean isJson(ServletRequest request) {
+		boolean flag = request.getContentType().toLowerCase().startsWith("application/");
+        if (flag) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+	/**
+     * 判断本次请求的数据类型是否为上传文件
+     *
+     * @param request request
+     * @return boolean
+     */
+    private boolean isMultipart(ServletRequest request) {
+    	boolean flag = request.getContentType().toLowerCase().startsWith("multipart/");
+        if (request.getContentType() != null && flag) {
+            return true;
+        }
+
+        return false;
+   }
 }