|
@@ -46,17 +46,14 @@ public class LoginController {
|
|
|
private SysUserLoginLogService userLoginLogService;
|
|
|
@Autowired
|
|
|
private SysRoleService sysRoleService;
|
|
|
- @Autowired
|
|
|
- SysMenuMapper menuMapper;
|
|
|
-
|
|
|
+
|
|
|
@WithoutUserLogin
|
|
|
@RequestMapping(value="/")
|
|
|
public String initHome(Model md,HttpServletRequest request) {
|
|
|
|
|
|
* 第一次从one portal跳转进来,
|
|
|
*/
|
|
|
-
|
|
|
- UserModel model = null;
|
|
|
+ UserModel model = SSOHelper.getUser(request);
|
|
|
if(model != null){
|
|
|
String loginId = model.getLoginName();
|
|
|
SysUser sysuser = sysUserService.findByEmployeeno(loginId);
|
|
@@ -171,46 +168,11 @@ public class LoginController {
|
|
|
|
|
|
UserModel userModel = new UserModel(sysUser.getEmployeeno(),sysUser.getPassword(),sysUser.getMobilenumber(),sysUser.getEmailaddress(),
|
|
|
false,"","",sysUser.getUsername(),"","");
|
|
|
-
|
|
|
-
|
|
|
+ SSOHelper.createCookie(response, userModel);
|
|
|
|
|
|
List<SysRole> roleList = sysRoleService.findUserRoleByUserId(sysUser.getUserid());
|
|
|
session.setAttribute(sysUser.getUserid().toString(), roleList);
|
|
|
|
|
|
-
|
|
|
- List<SysMenu> lstRoot = new ArrayList<SysMenu>();
|
|
|
- List<SysMenu> menus = new ArrayList<SysMenu>();
|
|
|
-
|
|
|
- menus = menuMapper.selectSysUserMenus(sysUser.getUserid());
|
|
|
-
|
|
|
-
|
|
|
- if(null != menus && menus.size() > 0){
|
|
|
- for (SysMenu sysMenuWithBLOBs : menus) {
|
|
|
-
|
|
|
- if(sysMenuWithBLOBs.getLevel() == 1){
|
|
|
- lstRoot.add(sysMenuWithBLOBs);
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- if(null != lstRoot && lstRoot.size() > 0){
|
|
|
-
|
|
|
- for (int i = 0; i < lstRoot.size(); i++) {
|
|
|
-
|
|
|
- PackageBeanUtils.packageChildSysmenus(lstRoot.get(i) , menus);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- * 用户的所有权限菜单
|
|
|
- */
|
|
|
- session.setAttribute("ValidateMenus",menus);
|
|
|
-
|
|
|
- * 主页面展示菜单
|
|
|
- * */
|
|
|
- session.setAttribute("menu",lstRoot);
|
|
|
-
|
|
|
-
|
|
|
sysUser.setLastlogindate(new Date());
|
|
|
sysUser.setLastloginip(request.getRemoteAddr());
|
|
|
int loginCount = sysUser.getLogincounts() != null ? (sysUser.getLogincounts() +1) : 1;
|
|
@@ -254,9 +216,7 @@ public class LoginController {
|
|
|
comments.append(os);
|
|
|
loginLog.setComments(comments.toString());
|
|
|
userLoginLogService.saveUserLoginLog(loginLog);
|
|
|
-
|
|
|
-
|
|
|
- return "homeIndex";
|
|
|
+ return "redirect:/home/homeIndex";
|
|
|
}
|
|
|
|
|
|
|