zhaopeiqing 3 år sedan
förälder
incheckning
ea43f400e7

+ 4 - 44
Resume-DEMO/src/main/java/com/ssm/controller/LoginController.java

@@ -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 = SSOHelper.getUser(request);
-		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 {
 		//new UserModel(loginName, password, phone, emali, isAdmin, systemType, enterpriseName, realName, compnayId, SLD)
 		UserModel userModel = new UserModel(sysUser.getEmployeeno(),sysUser.getPassword(),sysUser.getMobilenumber(),sysUser.getEmailaddress(),
 				false,"","",sysUser.getUsername(),"","");
-//		SSOHelper.createCookie(response, userModel);
-		
+		SSOHelper.createCookie(response, userModel);
 		//绑定 用户的角色
 		List<SysRole> roleList = sysRoleService.findUserRoleByUserId(sysUser.getUserid());
 		session.setAttribute(sysUser.getUserid().toString(), roleList);
 
-		// start..
-		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);
-		// end..
-
 		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 "redirect:/home/homeIndex";
-		return "homeIndex";
+		return "redirect:/home/homeIndex";
 	}
 	
 	/**

+ 1 - 1
Resume-DEMO/src/main/resources/sso.properties

@@ -5,7 +5,7 @@ sso.timeout = 120
 # token name
 sso.token = SSO_COOKIE_TOKEN_NAME
 # 验证失败跳转地址
-sso.loginpage = http\://localhost:8080/oneportal/login
+sso.loginpage = http\://dgt.dgtis.com/oneportal/login
 # cookie domain
 sso.domain = dgtis.com
 # filter 放过内容,用,号分隔