From ef6716e83c9a2c82f9ea19b7c2c9fb18d2a7637b Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 1 Sep 2022 17:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=88=9D=E5=A7=8B=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E9=86=92=E5=92=8C=E5=BC=BA=E5=88=B6=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=AF=86=E7=A0=81=E6=B6=88=E6=81=AF=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E7=BB=99=E5=88=86=E7=A6=BB=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/web/LoginController.java | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) 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 b51117c4..2e1b04b7 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 @@ -4,13 +4,20 @@ */ package com.jeesite.modules.sys.web; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.fasterxml.jackson.annotation.JsonView; +import com.jeesite.common.config.Global; +import com.jeesite.common.lang.StringUtils; +import com.jeesite.common.shiro.filter.FormFilter; +import com.jeesite.common.shiro.realm.BaseAuthorizingRealm; +import com.jeesite.common.shiro.realm.LoginInfo; +import com.jeesite.common.web.BaseController; +import com.jeesite.common.web.CookieUtils; +import com.jeesite.common.web.http.ServletUtils; +import com.jeesite.modules.sys.entity.Menu; +import com.jeesite.modules.sys.entity.User; import com.jeesite.modules.sys.utils.CorpUtils; +import com.jeesite.modules.sys.utils.PwdUtils; +import com.jeesite.modules.sys.utils.UserUtils; import io.swagger.annotations.Api; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.AuthorizationInfo; @@ -25,19 +32,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.fasterxml.jackson.annotation.JsonView; -import com.jeesite.common.config.Global; -import com.jeesite.common.lang.StringUtils; -import com.jeesite.common.shiro.filter.FormFilter; -import com.jeesite.common.shiro.realm.BaseAuthorizingRealm; -import com.jeesite.common.shiro.realm.LoginInfo; -import com.jeesite.common.web.BaseController; -import com.jeesite.common.web.CookieUtils; -import com.jeesite.common.web.http.ServletUtils; -import com.jeesite.modules.sys.entity.Menu; -import com.jeesite.modules.sys.entity.User; -import com.jeesite.modules.sys.utils.PwdUtils; -import com.jeesite.modules.sys.utils.UserUtils; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; /** * 登录Controller @@ -237,6 +235,9 @@ public class LoginController extends BaseController{ successUrl = request.getContextPath() + successUrl; } model.addAttribute("__url", successUrl); // 告诉浏览器登录后跳转的页面 + // 初始密码策略和密码修改策略验证（0：关闭；1：提醒用户；2：强制修改初始或旧密码） + String modifyPasswordMsg = PwdUtils.getModifyPasswordMsg(user, model); + model.addAttribute("modifyPasswordMsg", modifyPasswordMsg); return ServletUtils.renderObject(response, model); } // 如果是登录操作，则跳转到登录成功页