Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-core/src/main/java/com/java110/core/base/controller/BaseController.java

@@ -65,21 +65,22 @@ public class BaseController extends AppBase {
                 String[] value = (String[]) readOnlyMap.get(key);
 //                String[] value = (String[]) readOnlyMap.get(key);
                 if (value.length > 1) {
-                    headers.put(key, value[0]);
                     for (int j = 0; j < value.length; j++) {
                         queryString.append(key);
                         queryString.append("=");
                         queryString.append(value[j]);
                         queryString.append("&");
                     }
-
                 } else {
-                    headers.put(key, value[0]);
                     queryString.append(key);
                     queryString.append("=");
                     queryString.append(value[0]);
                     queryString.append("&");
                 }
+                if(!hasValidHeader(key.toLowerCase())){
+                    continue;
+                }
+                headers.put(key, value[0]);
             }
         }
 
@@ -92,6 +93,30 @@ public class BaseController extends AppBase {
 
     }
 
+    private boolean hasValidHeader(String key) {
+        if("app-id".equals(key) || "app_id".equals(key)){
+            return true;
+        }
+        if("transaction-id".equals(key) || "transaction_id".equals(key)){
+            return true;
+        }
+        if("req-time".equals(key) || "req_time".equals(key)){
+            return true;
+        }
+        if("sign".equals(key)){
+            return true;
+        }
+        if("user-id".equals(key) || "user_id".equals(key)){
+            return true;
+        }
+        if("java110-lang".equals(key)){
+            return true;
+        }
+
+        return false;
+    }
+
+
     public static Map<String, String> getParameterStringMap(HttpServletRequest request) {
         Map<String, String[]> properties = request.getParameterMap();//把请求参数封装到Map<String, String[]>中
         Map<String, String> returnMap = new HashMap<String, String>();