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

update

Browse Source
This commit is contained in:
thinkgem
2023-05-10 10:19:38 +08:00
parent 17278b0896
commit a71368296f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java
View File

@@ -368,6 +368,9 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica
data.put("result", "login");
data.put("demoMode", Global.isDemoMode());
data.put("useCorpModel", Global.isUseCorpModel()
&& Global.getConfigToBoolean("user.loginCodeCorpUnique", "false"));
data.put("title", Global.getProperty("productName"));
return data;
}
@@ -420,6 +423,9 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica
data.put("result", Global.FALSE);
data.put("demoMode", Global.isDemoMode());
data.put("useCorpModel", Global.isUseCorpModel()
&& Global.getConfigToBoolean("user.loginCodeCorpUnique", "false"));
data.put("title", Global.getProperty("productName"));
return data;
}

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

@@ -78,9 +78,6 @@ public class LoginController extends BaseController{
// 获取登录数据
model.addAllAttributes(FormFilter.getLoginData(request, response));
model.addAttribute("useCorpModel", Global.isUseCorpModel()
&& Global.getConfigToBoolean("user.loginCodeCorpUnique", "false"));
model.addAttribute("title", Global.getProperty("productName"));
// 如果是Ajax请求，返回Json字符串。
if (ServletUtils.isAjaxRequest((HttpServletRequest)request)){