修改右上角操作

master
zengwh 6 years ago
parent f72c5f255d
commit bf477acd8b

@ -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();

@ -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();
}

@ -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;
}
</style>
</head>
@ -184,7 +184,7 @@
<!-- mini logo for sidebar mini 50x50 pixels -->
<%--<span class="logo-mini"><b>A</b>LT</span>--%>
<!-- logo for regular state and mobile devices -->
<p>病案归档系统</p>
<span>病案归档系统</span>
</div>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
@ -198,7 +198,7 @@
<li class="user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="noticeManage1(-1)">
<span class="label label-warning" id="noticeCount">0</span>
<i class="fa fa-envelope-o" style="font-size: 25px;"></i>
<i class="fa fa-envelope-o" style="font-size: 21px;"></i>
</a>
</li>
<li class="user user-menu">
@ -209,44 +209,33 @@
<c:when test="${CURRENT_USER.remark == '' || CURRENT_USER.remark == null || CURRENT_USER.remark == 'null'}">
<c:choose>
<c:when test="${CURRENT_USER.userPosition != null && CURRENT_USER.userPosition != '' && CURRENT_USER.userPosition != 'null'}">
<p class="hidden-xs" title="${CURRENT_USER.userPosition}">${CURRENT_USER.userPosition}</p>
<span class="hidden-xs" title="${CURRENT_USER.userPosition}">${CURRENT_USER.userPosition}</span>
</c:when>
<c:otherwise>
<p class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</p>
<span class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</span>
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${CURRENT_USER.userPosition != null && CURRENT_USER.userPosition != '' && CURRENT_USER.userPosition != 'null'}">
<p class="hidden-xs" title="${CURRENT_USER.userPosition}(${CURRENT_USER.remark})">${CURRENT_USER.userPosition}(${CURRENT_USER.remark})</p>
<span class="hidden-xs" title="${CURRENT_USER.userPosition}(${CURRENT_USER.remark})">${CURRENT_USER.userPosition}(${CURRENT_USER.remark})</span>
</c:when>
<c:otherwise>
<p class="hidden-xs" title="${CURRENT_USER.userName}(${CURRENT_USER.remark})">${CURRENT_USER.userName}(${CURRENT_USER.remark})</p>
<span class="hidden-xs" title="${CURRENT_USER.userName}(${CURRENT_USER.remark})">${CURRENT_USER.userName}(${CURRENT_USER.remark})</span>
</c:otherwise>
</c:choose>
</c:otherwise>
</c:choose>
</a>
</li>
<li>
<div class="margin">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
aria-expanded="false" style="height:34px">
操作
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu" role="menu">
<%--<li><a href="#">帮助</a></li>
<li><a href="#">联系我们</a></li>--%>
<li><a href="${POWER_URLHEAD}/gatewayPage">返回主页</a></li>
<li class="divider"></li>
<li><a href="${POWER_URLHEAD}/logout?token=${token}">退出登陆</a></li>
</ul>
</div>
</div>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-home" style="font-size: 21px"></i></a>
<ul class="dropdown-menu" role="menu">
<li><a href="${POWER_URLHEAD}/gatewayPage">返回主页</a></li>
<li class="divider"></li>
<li><a href="${POWER_URLHEAD}/logout?token=${token}">退出登陆</a></li>
</ul>
</li>
</ul>
</div>

Loading…
Cancel
Save