251218_01_ENH : Common의 변경으로 인한 수정 적용
This commit is contained in:
@@ -21,9 +21,8 @@ logging:
|
|||||||
kri:
|
kri:
|
||||||
auth:
|
auth:
|
||||||
apikey:
|
apikey:
|
||||||
enabled: true # API Key 인증 사용 여부
|
|
||||||
header-name: "X-API-Key" # API Key 헤더
|
|
||||||
key: "4B726963-436F6E74616374-53657276696365-402531213230"
|
key: "4B726963-436F6E74616374-53657276696365-402531213230"
|
||||||
|
header-name: "X-API-Key" # API Key 헤더
|
||||||
|
|
||||||
security:
|
security:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ configurations {
|
|||||||
|
|
||||||
def giteaUser = findProperty("giteaUser") ?: ""
|
def giteaUser = findProperty("giteaUser") ?: ""
|
||||||
def giteaToken = findProperty("giteaToken") ?: ""
|
def giteaToken = findProperty("giteaToken") ?: ""
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
|
||||||
@@ -37,7 +38,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
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-web'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-security'
|
implementation 'org.springframework.boot:spring-boot-starter-security'
|
||||||
|
|||||||
@@ -1,8 +1,13 @@
|
|||||||
package com.kri.contact.server;
|
package com.kri.contact.server;
|
||||||
|
|
||||||
|
import org.springframework.boot.ApplicationRunner;
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
import org.springframework.context.ApplicationContext;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
public class ContactServerApplication {
|
public class ContactServerApplication {
|
||||||
|
|
||||||
@@ -10,4 +15,19 @@ public class ContactServerApplication {
|
|||||||
SpringApplication.run(ContactServerApplication.class, args);
|
SpringApplication.run(ContactServerApplication.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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,9 +5,7 @@ import com.kri.contact.server.common.enums.ResultCodeType;
|
|||||||
import jakarta.persistence.Converter;
|
import jakarta.persistence.Converter;
|
||||||
|
|
||||||
@Converter(autoApply = false)
|
@Converter(autoApply = false)
|
||||||
public class ResultCodeTypeConverter
|
public class ResultCodeTypeConverter extends AbstractCodeEnumConverter<ResultCodeType, Short> {
|
||||||
extends AbstractCodeEnumConverter<ResultCodeType, Short> {
|
|
||||||
|
|
||||||
public ResultCodeTypeConverter() {
|
public ResultCodeTypeConverter() {
|
||||||
super(ResultCodeType.class);
|
super(ResultCodeType.class);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package com.kri.contact.server.controller;
|
package com.kri.contact.server.controller;
|
||||||
|
|
||||||
import com.kri.common.web.BusinessException;
|
|
||||||
import com.kri.common.webmvc.RequestUserContext;
|
import com.kri.common.webmvc.RequestUserContext;
|
||||||
import com.kri.contact.server.common.consts.AppConstant;
|
|
||||||
import com.kri.contact.server.service.AssignService;
|
import com.kri.contact.server.service.AssignService;
|
||||||
import com.kri.contact.server.service.SystemEventLogService;
|
import com.kri.contact.server.service.SystemEventLogService;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package com.kri.contact.server.controller;
|
package com.kri.contact.server.controller;
|
||||||
|
|
||||||
import com.kri.common.web.BusinessException;
|
|
||||||
import com.kri.common.webmvc.RequestUserContext;
|
import com.kri.common.webmvc.RequestUserContext;
|
||||||
import com.kri.contact.server.common.consts.AppConstant;
|
import com.kri.contact.server.common.consts.AppConstant;
|
||||||
import com.kri.contact.server.dto.DataVerificationDto;
|
import com.kri.contact.server.dto.DataVerificationDto;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.kri.contact.server.dto;
|
package com.kri.contact.server.dto;
|
||||||
|
|
||||||
import com.kri.common.auth.jwt.JwtUserClaimsDto;
|
|
||||||
|
import com.kri.common.auth.dto.JwtUserClaimsDto;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.kri.contact.server.service;
|
|||||||
import com.kri.common.datetime.DateTimeUtil;
|
import com.kri.common.datetime.DateTimeUtil;
|
||||||
import com.kri.contact.server.common.consts.AppConstant;
|
import com.kri.contact.server.common.consts.AppConstant;
|
||||||
import com.kri.contact.server.persistence.entity.TPrjctAssignEntity;
|
import com.kri.contact.server.persistence.entity.TPrjctAssignEntity;
|
||||||
import com.kri.contact.server.persistence.entity.TPrjctAssignEntityId;
|
|
||||||
import com.kri.contact.server.persistence.repository.ProjectAssignRepository;
|
import com.kri.contact.server.persistence.repository.ProjectAssignRepository;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.kri.contact.server.service;
|
package com.kri.contact.server.service;
|
||||||
|
|
||||||
import com.kri.common.auth.jwt.JwtService;
|
import com.kri.common.auth.jwt.JwtService;
|
||||||
import com.kri.common.auth.jwt.JwtUserClaimsDto;
|
import com.kri.common.auth.dto.JwtUserClaimsDto;
|
||||||
import com.kri.contact.server.dto.LoginRequestDto;
|
import com.kri.contact.server.dto.LoginRequestDto;
|
||||||
import com.kri.contact.server.dto.LoginResponseDto;
|
import com.kri.contact.server.dto.LoginResponseDto;
|
||||||
import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient;
|
import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient;
|
||||||
|
|||||||
Reference in New Issue
Block a user