Merge branch 'develop'

Author: netbuffer

.gitignore

@@ -6,4 +6,6 @@
 /.settings/
 /reports
 /.pmd
-/.springBeans
+/.springBeans
+/.idea/
+/ssmbootstrap_table.iml

src/main/java/cn/com/ttblog/ssmbootstrap_table/controller/JsonpController.java

@@ -2,16 +2,16 @@
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.eclipse.jetty.util.log.Log;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -251,7 +251,25 @@ public User t(@PathVariable Long id, HttpServletRequest request,
 		logger.debug("receive json obj:{}",user);
 		return user;
 	}
-	
+
+	//接收JSONObject
+	@RequestMapping("/receiveJSONObject")
+	public @ResponseBody
+	Map receivejsonobj(@RequestBody JSONObject user,HttpServletRequest request) {
+		logger.debug("receiveJSONObject:{}",user);
+		return user;
+
+	}
+
+	//接收Map
+	@RequestMapping("/receiveMap")
+	public @ResponseBody
+	Map receivejsonobj(@RequestBody Map user,HttpServletRequest request) {
+		logger.debug("receiveMap:{}",user);
+		return user;
+
+	}
+
 	/**
 	 * 获取session中name的值
 	 * 

src/main/java/cn/com/ttblog/ssmbootstrap_table/servlet/TestServlet.java

@@ -0,0 +1,27 @@
+package cn.com.ttblog.ssmbootstrap_table.servlet;
+
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "Servlet",urlPatterns = "/testservlet")
+public class TestServlet extends HttpServlet{
+
+    private static final Logger LOG= LoggerFactory.getLogger(TestServlet.class);
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        LOG.debug("doget");
+        response.getWriter().write("hello");
+    }
+}

src/main/resources/spring/._spring-mvc.xml4116380028147889742.tmp

@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:cache="http://www.springframework.org/schema/cache"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans    
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:p="http://www.springframework.org/schema/p"
+	   xmlns:cache="http://www.springframework.org/schema/cache"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans-3.2.xsd    
-                        http://www.springframework.org/schema/context    
-                        http://www.springframework.org/schema/context/spring-context-3.2.xsd    
-                        http://www.springframework.org/schema/cache  
-        				http://www.springframework.org/schema/cache/spring-cache-3.2.xsd
-                        ">
+                        http://www.springframework.org/schema/cache
+        				http://www.springframework.org/schema/cache/spring-cache-3.2.xsd">
 	<!-- http://blog.csdn.net/clj198606061111/article/details/41121437 -->
 	<cache:annotation-driven cache-manager="cacheManager" />
 	<!-- idea中需要设置p:shared="true"，eclipse不需要设置，否则出错,原因不明...-->
 	<bean id="cacheManagerFactory"
-		class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+		class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean" p:shared="true">
 		<property name="configLocation" value="classpath:ehcache.xml" />
 	</bean>
 

src/main/resources/spring/spring-ehcache.xml

@@ -122,6 +122,7 @@
 				/*/image/**
 				/*/jsonp/**
 				/*/cxf/**
+				/testservlet
 			</param-value>
 		</init-param>
 	</filter>