diff --git a/build.gradle b/build.gradle index 26952fb..8bb3005 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:1.0.21" + implementation "com.kri.common:starter:beta.1.0.25" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/intranet/extension/auth/IntranetExtensionApiKeyProvider.java b/src/main/java/com/kri/intranet/extension/auth/IntranetExtensionApiKeyProvider.java index fabe65d..d8b1196 100644 --- a/src/main/java/com/kri/intranet/extension/auth/IntranetExtensionApiKeyProvider.java +++ b/src/main/java/com/kri/intranet/extension/auth/IntranetExtensionApiKeyProvider.java @@ -18,6 +18,7 @@ public class IntranetExtensionApiKeyProvider implements ApiKeyUserClaimsProvider case "4B726963-436F6E74616374-53657276696365-402531213230" -> Optional.of( JwtUserClaimsDto.builder() .userId("ContactServer") + .userCmpn("KRI") .userTeam("KRI-IT-TEAM") .userName("ContactServer") .userRole(1000) diff --git a/src/main/java/com/kri/intranet/extension/dto/user/response/GetUserWithIdPwResponseDto.java b/src/main/java/com/kri/intranet/extension/dto/user/response/GetUserWithIdPwResponseDto.java index ad7a73c..fb1e585 100644 --- a/src/main/java/com/kri/intranet/extension/dto/user/response/GetUserWithIdPwResponseDto.java +++ b/src/main/java/com/kri/intranet/extension/dto/user/response/GetUserWithIdPwResponseDto.java @@ -9,9 +9,13 @@ import lombok.Getter; @Builder @Schema(description = "사용자 ID/PW 검색 응답 DTO") public class GetUserWithIdPwResponseDto { - @Schema(description = "사용자 ID (p_user_mail)") + @Schema(description = "사용자 ID") private final String userId; + @Builder.Default + @Schema(description = "사용자 소속 회사") + private final String userCmpn = "KRI"; + @Schema(description = "사용자 이름 (p_name)") private final String userNm; diff --git a/src/main/resources/mybatis/mapper/UserMapper.xml b/src/main/resources/mybatis/mapper/UserMapper.xml index 61f873c..eefd8bf 100644 --- a/src/main/resources/mybatis/mapper/UserMapper.xml +++ b/src/main/resources/mybatis/mapper/UserMapper.xml @@ -15,7 +15,7 @@ FROM project2.dbo.person WHERE krc_in_date IS NOT NULL and krc_out_date = '' AND (p_user_mail = #{userId} or p_user_mail = #{userId} + '@kric.com') - AND p_pass_new = #{userPw} + AND p_pass_new COLLATE Latin1_General_CS_AS = #{userPw} ORDER BY p_no