From a71368296fe8ef99588046a53401cdeedbe2e3e7 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 10 May 2023 10:19:38 +0800 Subject: [PATCH] update --- .../java/com/jeesite/common/shiro/filter/FormFilter.java | 6 ++++++ .../java/com/jeesite/modules/sys/web/LoginController.java | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java index e8118010..3f04e1f7 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java @@ -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; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java index d9173ea4..470476e4 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java @@ -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)){