Merge branch 'master' of chendi/esb into master

src/main/java/com/yihu/hos/common/CommonPageController.java

@@ -62,6 +62,10 @@ public class CommonPageController extends BaseController {
    @RequestMapping("loginPage")
    public String login(Model model, HttpServletRequest request, HttpServletResponse response) {
        HttpSession session = request.getSession();
        String urlType = (String) request.getSession().getAttribute("attachment");
        request.getSession().removeAttribute("attachment");
        //租户类型
        model.addAttribute("urlType", urlType);
        try {
            boolean auth = authenticateService.auth(session, saasAdmin);
            if (!auth) {

src/main/java/com/yihu/hos/filter/SessionOutTimeFilter.java

@@ -49,12 +49,13 @@ public class SessionOutTimeFilter extends OncePerRequestFilter {
                    || httpServletRequest.getSession().getAttribute("userInfo") == null) {
                // AJAX REQUEST PROCESS
                String attachment = LocalContext.getContext().getAttachment(ContextAttributes.TENANT_NAME);
                if ("XMLHttpRequest".equalsIgnoreCase(httpServletRequest.getHeader("X-Requested-With"))) {
                    httpServletResponse.setHeader("sessionStatus", "timeOut");
                    httpServletResponse.getWriter().print("{}");
                    httpServletResponse.sendRedirect(httpServletRequest.getContextPath() + "/logoutAction");
                    return;
                }
//                if ("XMLHttpRequest".equalsIgnoreCase(httpServletRequest.getHeader("X-Requested-With"))) {
//                    httpServletResponse.setHeader("sessionStatus", "timeOut");
//                    httpServletResponse.getWriter().print("{}");
//                    httpServletResponse.sendRedirect(httpServletRequest.getContextPath() + "/logoutAction");
//                    return;
//                }
                httpServletRequest.getSession().setAttribute("attachment",attachment);
                httpServletResponse.sendRedirect(httpServletRequest.getContextPath() + "/" + attachment + "/loginPage");
                return;
            }

src/main/webapp/WEB-INF/ehr/jsp/common/loginJs.jsp

@@ -47,7 +47,10 @@
    };
    $(function(){
        var urlType = "${urlType}";
        if(urlType != ''){
            location.href = "${contextRoot}/"+urlType+"/loginPage";
        }
        //session过期
        if(location.href.indexOf('loginPage')<0)
        {