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
2022-05-13 18:26:00 +08:00
parent 0840bb590d
commit f5031e51ac
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.jeesite.modules.sys.utils.CorpUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -158,24 +159,18 @@ public class LoginController extends BaseController{
// 验证下用户权限，以便调用doGetAuthorizationInfo方法，保存单点登录登出句柄 // 验证下用户权限，以便调用doGetAuthorizationInfo方法，保存单点登录登出句柄
Subject subject = SecurityUtils.getSubject(); Subject subject = SecurityUtils.getSubject();
if (subject == null || !subject.isPermitted("user")){ if (!subject.isPermitted("user")){
if (subject != null){ subject.logout();
subject.logout();
}
String queryString = request.getQueryString(); String queryString = request.getQueryString();
queryString = queryString == null ? "" : "?" + queryString; queryString = queryString == null ? "" : "?" + queryString;
ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString); ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString);
return null; return null;
} }
//获取登录用户信息 // 获取登录用户信息，未加载shiro模块时会为空，直接访问则提示操作权限不足。
LoginInfo loginInfo = UserUtils.getLoginInfo(); LoginInfo loginInfo = UserUtils.getLoginInfo();
// 未加载shiro模块时会为空，直接访问则提示操作权限不足。
if(loginInfo == null){ if(loginInfo == null){
if (subject != null){ subject.logout();
subject.logout();
}
String queryString = request.getQueryString(); String queryString = request.getQueryString();
queryString = queryString == null ? "" : "?" + queryString; queryString = queryString == null ? "" : "?" + queryString;
ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString); ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString);
@@ -191,11 +186,15 @@ public class LoginController extends BaseController{
ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString); ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString);
return null; return null;
} }
// 获取当前会话对象，并返回一些数据
Session session = UserUtils.getSession();
model.addAttribute("user", user); // 设置当前用户信息 model.addAttribute("user", user); // 设置当前用户信息
model.addAttribute("demoMode", Global.isDemoMode()); model.addAttribute("demoMode", Global.isDemoMode());
model.addAttribute("useCorpModel", Global.isUseCorpModel());
//获取当前会话对象 model.addAttribute("currentCorpCode", CorpUtils.getCurrentCorpCode());
Session session = UserUtils.getSession(); model.addAttribute("currentCorpName", CorpUtils.getCurrentCorpName());
model.addAttribute("sysCode", session.getAttribute("sysCode"));
// 是否是登录操作 // 是否是登录操作
boolean isLogin = Global.TRUE.equals(session.getAttribute(BaseAuthorizingRealm.IS_LOGIN_OPER)); boolean isLogin = Global.TRUE.equals(session.getAttribute(BaseAuthorizingRealm.IS_LOGIN_OPER));