|
@@ -20,8 +20,10 @@
|
|
package edp.davinci.core.inteceptor;
|
|
package edp.davinci.core.inteceptor;
|
|
|
|
|
|
import edp.davinci.dao.RelRoleUserMapper;
|
|
import edp.davinci.dao.RelRoleUserMapper;
|
|
|
|
+import edp.davinci.dao.RelUserOrganizationMapper;
|
|
import edp.davinci.dto.userDto.UserRegist;
|
|
import edp.davinci.dto.userDto.UserRegist;
|
|
import edp.davinci.model.RelRoleUser;
|
|
import edp.davinci.model.RelRoleUser;
|
|
|
|
+import edp.davinci.model.RelUserOrganization;
|
|
import edp.davinci.service.RoleService;
|
|
import edp.davinci.service.RoleService;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
@@ -65,6 +67,9 @@ public class AuthenticationInterceptor implements HandlerInterceptor
|
|
private RelRoleUserMapper relRoleUserMapper;
|
|
private RelRoleUserMapper relRoleUserMapper;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private RelUserOrganizationMapper relUserOrganizationMapper;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
private RestTemplate restTemplate;
|
|
private RestTemplate restTemplate;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -150,10 +155,19 @@ public class AuthenticationInterceptor implements HandlerInterceptor
|
|
userRegist.setEmail(userinfoObject.getString("email"));
|
|
userRegist.setEmail(userinfoObject.getString("email"));
|
|
userRegist.setPassword(userinfoObject.getString("password"));
|
|
userRegist.setPassword(userinfoObject.getString("password"));
|
|
User registUser = userService.regist(userRegist);
|
|
User registUser = userService.regist(userRegist);
|
|
|
|
+
|
|
|
|
+ // Role
|
|
RelRoleUser relRoleUser = new RelRoleUser();
|
|
RelRoleUser relRoleUser = new RelRoleUser();
|
|
relRoleUser.setRoleId(1L);
|
|
relRoleUser.setRoleId(1L);
|
|
relRoleUser.setUserId(registUser.getId());
|
|
relRoleUser.setUserId(registUser.getId());
|
|
relRoleUserMapper.insert(relRoleUser);
|
|
relRoleUserMapper.insert(relRoleUser);
|
|
|
|
+
|
|
|
|
+ // Organization
|
|
|
|
+ RelUserOrganization relUserOrganization = new RelUserOrganization();
|
|
|
|
+ relUserOrganization.setUserId(registUser.getId());
|
|
|
|
+ relUserOrganization.setOrgId(1L);
|
|
|
|
+ relUserOrganization.setRole(Short.parseShort("1"));
|
|
|
|
+ relUserOrganizationMapper.insert(relUserOrganization);
|
|
}
|
|
}
|
|
request.setAttribute(Constants.CURRENT_USER, user);
|
|
request.setAttribute(Constants.CURRENT_USER, user);
|
|
}
|
|
}
|