diff --git a/src/main/java/com/emr/controller/LoginController.java b/src/main/java/com/emr/controller/LoginController.java index 03318da..936e8df 100644 --- a/src/main/java/com/emr/controller/LoginController.java +++ b/src/main/java/com/emr/controller/LoginController.java @@ -76,7 +76,7 @@ public class LoginController { ObjectMapper mapper = new ObjectMapper(); Power_User powerUser = mapper.readValue(objects[0].toString(), Power_User.class); if (null == powerUser.getUserId()) { - return "redirect:/error.jsp"; + return "redirect:"+POWER_URLHEAD+"/login"; } UsernamePasswordToken userToken = new UsernamePasswordToken(userName, "123456"); Subject subject = SecurityUtils.getSubject(); diff --git a/src/main/java/com/emr/controller/UrlInterceptor.java b/src/main/java/com/emr/controller/UrlInterceptor.java index 9392402..07dc4c0 100644 --- a/src/main/java/com/emr/controller/UrlInterceptor.java +++ b/src/main/java/com/emr/controller/UrlInterceptor.java @@ -43,6 +43,7 @@ public class UrlInterceptor implements HandlerInterceptor { String code = JSONArray.toJSONString(JSON.parseObject(resultString).get("code")); if ("200".equals(code)) { response.sendRedirect(POWER_URLHEAD + "/login"); + return false; } //更新session Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); @@ -51,6 +52,7 @@ public class UrlInterceptor implements HandlerInterceptor { e.printStackTrace(); try { response.sendRedirect(POWER_URLHEAD + "/login"); + return false; }catch (Exception e1){ e1.printStackTrace(); } diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index e20dee1..7e64c33 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -19,9 +19,6 @@ text-overflow: ellipsis; white-space: nowrap; } - .logo{ - height: 59px!important; - } .indexSelected{ background-color: #1E2D3B; } @@ -39,6 +36,9 @@ #indexTreeMenu::-webkit-scrollbar{ display: none; } + .main-sidebar{ + padding-top: 40px!important; + } @@ -184,7 +184,7 @@ <%--ALT--%> -
病案归档系统
+ 病案归档系统