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

@@ -4,14 +4,11 @@
 import java.util.Arrays;
 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.lang3.builder.ToStringBuilder;
-import org.eclipse.jetty.util.log.Log;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;