From 056f20130f91a0371fc06aa1195f13338af1f379 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 18 Dec 2025 13:41:29 +0900 Subject: [PATCH] =?UTF-8?q?251218=5F01=5FENH=20:=20API-KEY=20DB=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EB=B0=8F=20=EB=A1=9C=EC=BB=AC=20=EC=BA=90=EC=8B=B1?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application.yml | 13 ++++++++ build.gradle | 6 +++- .../IntranetExtensionApplication.java | 26 +++++++++++++++- .../auth/IntranetExtensionApiKeyProvider.java | 30 ------------------- .../extension/config/DataSourceConfig.java | 29 ++++++++++++++++++ 5 files changed, 72 insertions(+), 32 deletions(-) delete mode 100644 src/main/java/com/kri/intranet/extension/auth/IntranetExtensionApiKeyProvider.java create mode 100644 src/main/java/com/kri/intranet/extension/config/DataSourceConfig.java diff --git a/application.yml b/application.yml index 456d1d4..d285dc0 100644 --- a/application.yml +++ b/application.yml @@ -24,6 +24,19 @@ kri: apikey: enabled: true # API Key 인증 사용 여부 header-name: "X-API-Key" # API Key 헤더 + service-code: intranet-extension + preload-on-startup: true + # 내부 운영용(원하면) + admin-api-enabled: true + admin-allow-ips: + - 127.0.0.1/32 + - 0:0:0:0:0:0:0:1 + # apikey 보관 DB(MySQL) + db: + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/kri_common?characterEncoding=UTF-8 + username: kriit + password: it#51304 + driver-class-name: com.mysql.cj.jdbc.Driver security: enabled: true diff --git a/build.gradle b/build.gradle index 86624dc..c4a5e63 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.0.33" + implementation "com.kri.common:starter:beta.1.0.53" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' @@ -47,6 +47,10 @@ dependencies { implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.5' implementation 'com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre11' // 버전은 환경 맞춰 조정 + //API key 조회를 위한 mysql 컨넥터와 jpa + implementation "org.springframework.boot:spring-boot-starter-data-jpa" + runtimeOnly "com.mysql:mysql-connector-j" + compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/src/main/java/com/kri/intranet/extension/IntranetExtensionApplication.java b/src/main/java/com/kri/intranet/extension/IntranetExtensionApplication.java index 30df379..1f567e5 100644 --- a/src/main/java/com/kri/intranet/extension/IntranetExtensionApplication.java +++ b/src/main/java/com/kri/intranet/extension/IntranetExtensionApplication.java @@ -1,13 +1,37 @@ package com.kri.intranet.extension; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.ApplicationRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import lombok.extern.slf4j.Slf4j; -@SpringBootApplication +@Slf4j +@SpringBootApplication(exclude = { + org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration.class, + org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration.class +}) public class IntranetExtensionApplication { public static void main(String[] args) { SpringApplication.run(IntranetExtensionApplication.class, args); } + @Bean + ApplicationRunner dsCheck(ApplicationContext ctx) { + return args -> { + String[] names = ctx.getBeanNamesForType(javax.sql.DataSource.class); + log.info("DataSource beans = {}", java.util.Arrays.toString(names)); + for (String n : names) { + Object ds = ctx.getBean(n); + log.info(" - {} = {}", n, ds.getClass().getName()); + if (ds instanceof com.zaxxer.hikari.HikariDataSource hk) { + log.info(" jdbcUrl=" + hk.getJdbcUrl()); + log.info(" driver=" + hk.getDriverClassName()); + } + } + }; + } } diff --git a/src/main/java/com/kri/intranet/extension/auth/IntranetExtensionApiKeyProvider.java b/src/main/java/com/kri/intranet/extension/auth/IntranetExtensionApiKeyProvider.java deleted file mode 100644 index d8b1196..0000000 --- a/src/main/java/com/kri/intranet/extension/auth/IntranetExtensionApiKeyProvider.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.kri.intranet.extension.auth; - -import com.kri.common.auth.jwt.JwtUserClaimsDto; -import com.kri.common.auth.apikey.ApiKeyUserClaimsProvider; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.Optional; - -@Component -@RequiredArgsConstructor -public class IntranetExtensionApiKeyProvider implements ApiKeyUserClaimsProvider{ - - @Override - public Optional findUserByApiKey(String apiKey){ - //Todo: Redis 적용 할 것 - return switch (apiKey) { - case "4B726963-436F6E74616374-53657276696365-402531213230" -> Optional.of( - JwtUserClaimsDto.builder() - .userId("ContactServer") - .userCmpn("KRI") - .userTeam("KRI-IT-TEAM") - .userName("ContactServer") - .userRole(1000) - .build() - ); - default -> Optional.empty(); - }; - } -} diff --git a/src/main/java/com/kri/intranet/extension/config/DataSourceConfig.java b/src/main/java/com/kri/intranet/extension/config/DataSourceConfig.java new file mode 100644 index 0000000..35a2444 --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/config/DataSourceConfig.java @@ -0,0 +1,29 @@ +package com.kri.intranet.extension.config; + +import com.zaxxer.hikari.HikariDataSource; +import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +import javax.sql.DataSource; + +@Configuration +public class DataSourceConfig { + + @Bean + @Primary + @ConfigurationProperties(prefix = "spring.datasource") + public DataSourceProperties mainDataSourceProperties() { + return new DataSourceProperties(); + } + + @Bean(name = "mainDataSource") + @Primary + public DataSource mainDataSource(DataSourceProperties mainDataSourceProperties) { + return mainDataSourceProperties.initializeDataSourceBuilder() + .type(HikariDataSource.class) + .build(); + } +} \ No newline at end of file