合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/config/SecurityConfig.java

@@ -3,6 +3,7 @@ package com.zjty.tynotes.pas.config;
 import com.zjty.tynotes.pas.config.handler.MyAccessHandler;
 import com.zjty.tynotes.pas.config.handler.MyFailHandler;
 import com.zjty.tynotes.pas.config.handler.MyLogoutHandler;
+import com.zjty.tynotes.pas.config.handler.MySuccessHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -46,6 +47,10 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     @Autowired
     private MyFailHandler failHandler;
 
+    @Autowired
+    private MySuccessHandler successHandler;
+
+
     @Override
     public void configure(HttpSecurity httpSecurity) throws Exception {
         httpSecurity
@@ -90,6 +95,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     @Bean
     public MyFilter myFilter() throws Exception {
         MyFilter filter = new MyFilter();
+        filter.setAuthenticationSuccessHandler(successHandler);
         filter.setAuthenticationFailureHandler(failHandler);
         filter.setFilterProcessesUrl("/userLogin");
         filter.setAuthenticationManager(this.authenticationManager());

notes-pas/src/main/java/com/zjty/tynotes/pas/config/handler/MySuccessHandler.java

@@ -3,10 +3,17 @@ package com.zjty.tynotes.pas.config.handler;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zjty.tynotes.pas.entity.Authority;
 import com.zjty.tynotes.pas.entity.Role;
+import com.zjty.tynotes.pas.dao.AuthorityDao;
+import com.zjty.tynotes.pas.dao.RoleAuthorityDao;
+import com.zjty.tynotes.pas.dao.RoleDao;
+import com.zjty.tynotes.pas.dao.UserRoleDao;
+import com.zjty.tynotes.pas.entity.*;
+
 import com.zjty.tynotes.pas.entity.User;
 import com.zjty.tynotes.pas.service.IAuthorityService;
 import com.zjty.tynotes.pas.service.IRoleService;
 import com.zjty.tynotes.pas.service.IUserService;
+import com.zjty.tynotes.pas.task.Init;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -27,7 +34,9 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author mcj
@@ -49,6 +58,18 @@ public class MySuccessHandler implements AuthenticationSuccessHandler {
     @Autowired
     IUserService iUserService;
 
+    RoleDao roleDao;
+    @Autowired
+    private UserRoleDao userRoleDao;
+    @Autowired
+    private RoleAuthorityDao roleAuthorityDao;
+    @Autowired
+    private AuthorityDao authorityDao;
+    @Autowired
+    private Init init;
+
+
+
     @Autowired
     RedisTemplate redisTemplate;
 
@@ -74,13 +95,33 @@ public class MySuccessHandler implements AuthenticationSuccessHandler {
             }
         }
 
-        redisTemplate.opsForValue().set(user.getUsername(),0);
+        //        redisTemplate.opsForValue().set(user.getUsername(),0);
+        if(("root").equals(user.getUsername())){
+            user = init.root;
+        }else{
+            List<UserRole> userRoles = userRoleDao.findAllByUserId(user.getId());
+            List<Role> roles = new ArrayList<>();
+            for (UserRole userRole : userRoles) {
+                String roleId = userRole.getRoleId();
+                Optional<Role> op = roleDao.findById(userRole.getRoleId());
+                if(op.isPresent()){
+                    Role role = op.get();
+                    List<RoleAuthority> roleAuthorities = roleAuthorityDao.findAllByRoleId(roleId);
+                    List<String> authorityIds = new ArrayList<>();
+                    for (RoleAuthority roleAuthority : roleAuthorities) {
+                        authorityIds.add(roleAuthority.getAuthorityId());
+                    }
+                    List<Authority> authorities = authorityDao.findAllByIdIn(authorityIds);
+                    role.setAuthorities(authorities);
+                    roles.add(role);
+                }
+            }
+            user.setRoles(roles);
+        }
 
         sessionRegistry.registerNewSession(value, authentication.getPrincipal());
         httpServletResponse.setStatus(200);
         httpServletResponse.setContentType("application/json; charset=utf-8");
-        httpServletResponse.getWriter().println(new ObjectMapper().writeValueAsString("登陆成功"));
-
-
+        httpServletResponse.getWriter().println(new ObjectMapper().writeValueAsString(user));
     }
 }