Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/ufo-platform into test6.8.5

@@ -24,6 +24,8 @@ import java.util.Map;
 @RequestMapping("/loginController")
 public class LoginController {
     private static final Logger logger = LoggerFactory.getLogger("erpService");
+    
+    private static final int SESSION_TIMEOUT_SECONDS = 60 * 60;
 
     @Resource
     private LoginService loginService;
@@ -57,7 +59,7 @@ public class LoginController {
 
         //存入session
         session.setAttribute(PlatformConstant.USER_MENU, menuResp.getData());
-
+        session.setMaxInactiveInterval(SESSION_TIMEOUT_SECONDS);
         //loginSessionUtil.setLoginSession(responseBO.getData(), request, Integer.parseInt(responseBO.getData().getPid()));
         return responseBO;
     }