회원관리 수정중, 토큰 response 수정
This commit is contained in:
@@ -6,7 +6,6 @@ import com.kamco.cd.kamcoback.postgres.core.MembersCoreService;
|
||||
import java.util.UUID;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.mindrot.jbcrypt.BCrypt;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@@ -17,9 +16,6 @@ public class AdminService {
|
||||
|
||||
private final MembersCoreService membersCoreService;
|
||||
|
||||
@Value("${member.init_password}")
|
||||
private String password;
|
||||
|
||||
/**
|
||||
* 회원가입
|
||||
*
|
||||
@@ -29,14 +25,18 @@ public class AdminService {
|
||||
@Transactional
|
||||
public Long saveMember(MembersDto.AddReq addReq) {
|
||||
// salt 생성, 사번이 salt
|
||||
String salt = BCryptSaltGenerator.generateSaltWithEmployeeNo(addReq.getEmployeeNo().trim());
|
||||
String salt = BCryptSaltGenerator.generateSaltWithEmployeeNo(addReq.getUserId().trim());
|
||||
|
||||
// 패스워드 암호화, 초기 패스워드 고정
|
||||
String hashedPassword = BCrypt.hashpw(password, salt);
|
||||
addReq.setPassword(hashedPassword);
|
||||
String hashedPassword = BCrypt.hashpw(addReq.getTempPassword(), salt);
|
||||
addReq.setTempPassword(hashedPassword);
|
||||
return membersCoreService.saveMembers(addReq);
|
||||
}
|
||||
|
||||
public void updateMembers(UUID uuid, MembersDto.UpdateReq updateReq) {
|
||||
membersCoreService.updateMembers(uuid, updateReq);
|
||||
}
|
||||
|
||||
/**
|
||||
* 역할 추가
|
||||
*
|
||||
@@ -44,7 +44,7 @@ public class AdminService {
|
||||
*/
|
||||
@Transactional
|
||||
public void saveRoles(MembersDto.RolesDto rolesDto) {
|
||||
membersCoreService.saveRoles(rolesDto);
|
||||
// membersCoreService.saveRoles(rolesDto);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -53,7 +53,7 @@ public class AdminService {
|
||||
* @param rolesDto
|
||||
*/
|
||||
public void deleteRoles(MembersDto.RolesDto rolesDto) {
|
||||
membersCoreService.deleteRoles(rolesDto);
|
||||
// membersCoreService.deleteRoles(rolesDto);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -62,7 +62,7 @@ public class AdminService {
|
||||
* @param statusDto
|
||||
*/
|
||||
public void updateStatus(UUID uuid, MembersDto.StatusDto statusDto) {
|
||||
membersCoreService.updateStatus(uuid, statusDto);
|
||||
// membersCoreService.updateStatus(uuid, statusDto);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -71,7 +71,7 @@ public class AdminService {
|
||||
* @param uuid
|
||||
*/
|
||||
public void deleteAccount(UUID uuid) {
|
||||
membersCoreService.deleteAccount(uuid);
|
||||
// membersCoreService.deleteAccount(uuid);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -80,6 +80,6 @@ public class AdminService {
|
||||
* @param id
|
||||
*/
|
||||
public void resetPassword(Long id) {
|
||||
membersCoreService.resetPassword(id);
|
||||
// membersCoreService.resetPassword(id);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user