|
@@ -4,7 +4,9 @@ import javax.annotation.Resource;
|
|
|
|
|
|
import com.ozs.common.config.PurchaseConfig;
|
|
|
import com.ozs.common.core.domain.entity.SysDept;
|
|
|
+import com.ozs.common.core.domain.entity.SysRole;
|
|
|
import com.ozs.framework.manager.factory.AsyncFactory;
|
|
|
+import com.ozs.system.service.ISysRoleService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.authentication.AuthenticationManager;
|
|
@@ -32,6 +34,7 @@ import com.ozs.system.service.ISysConfigService;
|
|
|
import com.ozs.system.service.ISysUserService;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
|
|
|
|
+import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -60,6 +63,9 @@ public class SysLoginService {
|
|
|
@Autowired
|
|
|
private com.ozs.system.service.ISysDeptService sysDeptService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ISysRoleService iSysRoleService;
|
|
|
+
|
|
|
/**
|
|
|
* 登录验证
|
|
|
*
|
|
@@ -83,10 +89,13 @@ public class SysLoginService {
|
|
|
user.setDept(list.get(0));
|
|
|
user.setDeptId(list.get(0).getDeptId());
|
|
|
user.setDeptName(list.get(0).getDeptName());
|
|
|
+ SysRole sysRole = iSysRoleService.selectRoleById(1L);
|
|
|
+ user.setRoleId(sysRole.getRoleId());
|
|
|
+ user.setRoles(Arrays.asList(sysRole));
|
|
|
loginUser.setDeptId(list.get(0).getDeptId());
|
|
|
}
|
|
|
loginUser.setUser(user);
|
|
|
- loginUser.setUserId(-1L);
|
|
|
+ loginUser.setUserId(1L);
|
|
|
// 生成token
|
|
|
String token = tokenService.createToken(loginUser);
|
|
|
Constants.map.put(token, loginUser);
|