Skip to content

Commit dd9260e

Browse files
committed
refactor(login): 重构登录相关代码
- 新增 setLoginUser 方法用于设置登录用户 - 修改 getLoginUser 方法,使用新的 loginUser 属性 - 更新 PermissionInterceptor 中的代码,使用新的登录用户设置方式 - 修改前端模板,使用新的 loginUser 对象
1 parent 3ecf994 commit dd9260e

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

xxl-mq-admin2/src/main/java/com/xxl/mq/admin/service/impl/LoginService.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,25 @@ public LoginUserDTO checkLogin(HttpServletRequest request, HttpServletResponse r
134134
return null;
135135
}
136136

137+
// ********************** for loginUser with request **********************
137138
/**
138-
* get login user (from request, copy from cookie)
139+
* set loginUser
140+
*
141+
* @param request
142+
* @param loginUser
143+
*/
144+
public static void setLoginUser(HttpServletRequest request, LoginUserDTO loginUser){
145+
request.setAttribute("loginUser", loginUser);
146+
}
147+
148+
/**
149+
* get loginUser
139150
*
140151
* @param request
141152
* @return
142153
*/
143-
public LoginUserDTO getLoginUser(HttpServletRequest request){
144-
LoginUserDTO loginUser = (LoginUserDTO) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
154+
public static LoginUserDTO getLoginUser(HttpServletRequest request){
155+
LoginUserDTO loginUser = (LoginUserDTO) request.getAttribute("loginUser"); // get loginUser, with request
145156
return loginUser;
146157
}
147158

xxl-mq-admin2/src/main/java/com/xxl/mq/admin/web/interceptor/PermissionInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
5858
response.setHeader("location", request.getContextPath() + "/toLogin");
5959
return false;
6060
}
61-
request.setAttribute(LoginService.LOGIN_IDENTITY_KEY, loginUser);
61+
LoginService.setLoginUser(request, loginUser);
6262

6363
// valid permission
6464
if (StringTool.isNotBlank(permission.value())) {

xxl-mq-admin2/src/main/resources/templates/common/common.macro.ftl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@
107107
<#-- login user -->
108108
<li class="dropdown">
109109
<a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
110-
${I18n.system_welcome}${Request["XXL_MQ_LOGIN_IDENTITY"].username}
111-
<#-- todo,改为 loginuser -->
110+
${I18n.system_welcome}${loginUser.username}
112111
<span class="caret"></span>
113112
</a>
114113
<ul class="dropdown-menu" role="menu">

0 commit comments

Comments
 (0)