manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

登录视图自定义优化，可以显示来源页面消息。

Browse Source
This commit is contained in:
thinkgem
2020-02-18 12:47:52 +08:00
parent 11d1b2ee09
commit 1f9c7e4a50
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
View File

@@ -105,11 +105,12 @@ public class LoginController extends BaseController{
// 返回指定用户类型的登录页视图 // 返回指定用户类型的登录页视图
String userType = (String)paramMap.get("userType"); String userType = (String)paramMap.get("userType");
if (StringUtils.isNotBlank(userType)){ if (StringUtils.isBlank(userType)){
String view = UserUtils.getUserTypeValue(userType, "loginView"); userType = User.USER_TYPE_EMPLOYEE;
if(StringUtils.isNotBlank(view)){ }
return view; String view = UserUtils.getUserTypeValue(userType, "loginView");
} if(StringUtils.isNotBlank(view)){
return view;
} }
return "modules/sys/sysLogin"; return "modules/sys/sysLogin";
@@ -177,11 +178,12 @@ public class LoginController extends BaseController{
// 返回指定用户类型的登录页视图 // 返回指定用户类型的登录页视图
String userType = (String)paramMap.get("userType"); String userType = (String)paramMap.get("userType");
if (StringUtils.isNotBlank(userType)){ if (StringUtils.isBlank(userType)){
String view = UserUtils.getUserTypeValue(userType, "loginView"); userType = User.USER_TYPE_EMPLOYEE;
if(StringUtils.isNotBlank(view)){ }
return view; String view = UserUtils.getUserTypeValue(userType, "loginView");
} if(StringUtils.isNotBlank(view)){
return view;
} }
return "modules/sys/sysLogin"; return "modules/sys/sysLogin";

2
modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
View File

@@ -10,7 +10,7 @@
</div> </div>
<div class="login-box-body"> <div class="login-box-body">
<#form:form id="loginForm" model="${user!}" action="${ctx}/login" method="post"> <#form:form id="loginForm" model="${user!}" action="${ctx}/login" method="post">
<h4 class="login-box-msg">${text('欢迎回来')}！</h4> <h4 class="login-box-msg">${isNotBlank(message!)?message:text('欢迎回来')+'！'}</h4>
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<span class="glyphicon glyphicon-user form-control-feedback" title="${text('登录账号')}"></span> <span class="glyphicon glyphicon-user form-control-feedback" title="${text('登录账号')}"></span>
<#form:input type="text" name="username" class="form-control required" <#form:input type="text" name="username" class="form-control required"