|  | @@ -12,9 +12,11 @@ import com.ruoyi.common.core.domain.AjaxResult;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.domain.entity.SysMenu;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.domain.entity.SysUser;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.domain.model.LoginBody;
 | 
	
		
			
				|  |  | +import com.ruoyi.common.core.domain.model.LoginUser;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.utils.SecurityUtils;
 | 
	
		
			
				|  |  |  import com.ruoyi.framework.web.service.SysLoginService;
 | 
	
		
			
				|  |  |  import com.ruoyi.framework.web.service.SysPermissionService;
 | 
	
		
			
				|  |  | +import com.ruoyi.framework.web.service.TokenService;
 | 
	
		
			
				|  |  |  import com.ruoyi.system.service.ISysMenuService;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  /**
 | 
	
	
		
			
				|  | @@ -34,6 +36,9 @@ public class SysLoginController
 | 
	
		
			
				|  |  |      @Autowired
 | 
	
		
			
				|  |  |      private SysPermissionService permissionService;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +    @Autowired
 | 
	
		
			
				|  |  | +    private TokenService tokenService;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      /**
 | 
	
		
			
				|  |  |       * 登录方法
 | 
	
		
			
				|  |  |       * 
 | 
	
	
		
			
				|  | @@ -59,11 +64,17 @@ public class SysLoginController
 | 
	
		
			
				|  |  |      @GetMapping("getInfo")
 | 
	
		
			
				|  |  |      public AjaxResult getInfo()
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  | -        SysUser user = SecurityUtils.getLoginUser().getUser();
 | 
	
		
			
				|  |  | +        LoginUser loginUser = SecurityUtils.getLoginUser();
 | 
	
		
			
				|  |  | +        SysUser user = loginUser.getUser();
 | 
	
		
			
				|  |  |          // 角色集合
 | 
	
		
			
				|  |  |          Set<String> roles = permissionService.getRolePermission(user);
 | 
	
		
			
				|  |  |          // 权限集合
 | 
	
		
			
				|  |  |          Set<String> permissions = permissionService.getMenuPermission(user);
 | 
	
		
			
				|  |  | +        if (!loginUser.getPermissions().equals(permissions))
 | 
	
		
			
				|  |  | +        {
 | 
	
		
			
				|  |  | +            loginUser.setPermissions(permissions);
 | 
	
		
			
				|  |  | +            tokenService.refreshToken(loginUser);
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          AjaxResult ajax = AjaxResult.success();
 | 
	
		
			
				|  |  |          ajax.put("user", user);
 | 
	
		
			
				|  |  |          ajax.put("roles", roles);
 |