Merge branch 'master' into dev

src/main/java/com/uas/platform/b2b/controller/SecurityController.java

@@ -54,10 +54,14 @@ public class SecurityController {
 	@RequestMapping(value = "/logout", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseStatus(value = HttpStatus.OK)
 	@ResponseBody
-	public ModelMap logout(HttpServletRequest request, HttpServletResponse response, HttpSession session) throws IOException {
+	public ModelMap logout(HttpServletRequest request, HttpServletResponse response) throws IOException {
 		response.setContentType("text/html;charset=UTF-8");
-		session.invalidate();
-		// 清除当前域的cookie
+		request.getSession().removeAttribute("user");
+        request.getSession().invalidate();
+        logger.info("request.getSession().getAttribute(user): " +
+				(request.getSession().getAttribute("user") == null ?
+				"null" : ((User) request.getSession().getAttribute("user")).getUserName()));
+        // 清除当前域的cookie
 		SSOHelper.clearLogin(request, response);
 		CookieHelper.clearCookieByName(request, response, "token",
 				SSOHelper.getSSOService().getConfig().getCookieDomain(),

src/main/java/com/uas/platform/b2b/controller/SnapshotController.java

@@ -82,7 +82,6 @@ public class SnapshotController {
 			}
             threadsSignal.countDown();
 		});
-		logger.info("cost -> " + (System.currentTimeMillis() - start));
 		return modelMap;
 	}
 
@@ -239,7 +238,6 @@ public class SnapshotController {
 		});
         threadsSignal.await();
 		modelMap.addAllAttributes(hashMap);
-        logger.info("getUnreadCount：cost -> " + (System.currentTimeMillis() - start));
 		return modelMap;
 	}
 

src/main/java/com/uas/platform/b2b/filter/B2bAbstractSSOInterceptor.java

@@ -26,7 +26,6 @@ public abstract class B2bAbstractSSOInterceptor extends HandlerInterceptorAdapte
     protected void sendRedirect(HttpServletRequest request, HttpServletResponse response) throws IOException {
         boolean cross = SSOHelper.isCrossDomain(request);
         if (cross) {
-            logger.info("request.getRequestURL(): " + request.getRequestURL());
             request.getSession().setAttribute("SSOReferer", request.getRequestURL());
             response.sendRedirect(SSOHelper.getSSOService().getConfig().getCrossProxyUri());
         } else {