|
@@ -50,6 +50,9 @@ public class SysUserFacade extends SysUserServiceImpl {
|
|
@Autowired
|
|
@Autowired
|
|
private SysUserRoleFacade sysUserRoleFacade;
|
|
private SysUserRoleFacade sysUserRoleFacade;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private SysUserHospitalFacade sysUserHospitalFacade;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 获取jwt
|
|
* 获取jwt
|
|
*
|
|
*
|
|
@@ -294,19 +297,16 @@ public class SysUserFacade extends SysUserServiceImpl {
|
|
public JwtDTO createUserAndGetJwt(UserSaveVO userSaveVO) {
|
|
public JwtDTO createUserAndGetJwt(UserSaveVO userSaveVO) {
|
|
SysUser user = new SysUser();
|
|
SysUser user = new SysUser();
|
|
BeanUtil.copyProperties(userSaveVO, user);
|
|
BeanUtil.copyProperties(userSaveVO, user);
|
|
- user.setGmtCreate(new Date());
|
|
|
|
- user.setPassword("a123456");
|
|
|
|
-
|
|
|
|
QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
|
|
userQueryWrapper.eq("username", user.getUsername())
|
|
userQueryWrapper.eq("username", user.getUsername())
|
|
.eq("status", StatusEnum.Enable.getKey())
|
|
.eq("status", StatusEnum.Enable.getKey())
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
SysUser bean = this.getOne(userQueryWrapper, false);
|
|
SysUser bean = this.getOne(userQueryWrapper, false);
|
|
|
|
+ String password = "{bcrypt}$2a$10$qhV.bPLz1xsjQKQc35Ohz.oMU2y.lffnogvLEK69u3Z1rbLpQVFh2";
|
|
if (bean == null) {
|
|
if (bean == null) {
|
|
-
|
|
|
|
- PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
|
|
|
|
- String entryPassword = passwordEncoder.encode(user.getPassword());
|
|
|
|
- user.setPassword(entryPassword);
|
|
|
|
|
|
+ user.setGmtCreate(new Date());
|
|
|
|
+ user.setPassword(password);
|
|
|
|
+ user.setLinkman(user.getUsername());
|
|
// user.setPhone(userSaveVO.getUsername());
|
|
// user.setPhone(userSaveVO.getUsername());
|
|
this.save(user);
|
|
this.save(user);
|
|
|
|
|
|
@@ -314,11 +314,19 @@ public class SysUserFacade extends SysUserServiceImpl {
|
|
userRole.setUserId(user.getId());
|
|
userRole.setUserId(user.getId());
|
|
userRole.setRoleId(1L);
|
|
userRole.setRoleId(1L);
|
|
userRole.setGmtCreate(new Date());
|
|
userRole.setGmtCreate(new Date());
|
|
|
|
+ userRole.setGmtModified(new Date());
|
|
sysUserRoleFacade.save(userRole);
|
|
sysUserRoleFacade.save(userRole);
|
|
|
|
+
|
|
|
|
+ SysUserHospital userHospital = new SysUserHospital();
|
|
|
|
+ userHospital.setHospitalId(51L);
|
|
|
|
+ userHospital.setUserId(user.getId());
|
|
|
|
+ sysUserHospitalFacade.save(userHospital);
|
|
|
|
+ }else {
|
|
|
|
+ password = bean.getPassword();
|
|
}
|
|
}
|
|
JwtDTO data = new JwtDTO();
|
|
JwtDTO data = new JwtDTO();
|
|
JWT jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2",
|
|
JWT jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2",
|
|
- "password", user.getUsername(), user.getPassword());
|
|
|
|
|
|
+ "password", user.getUsername(), password);
|
|
if (null == jwt) {
|
|
if (null == jwt) {
|
|
throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
|
|
throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
|
|
}
|
|
}
|