diff --git a/mens-api/src/main/java/kr/xit/biz/chuncheon/mapper/IBizChuncheonMapper.java b/mens-api/src/main/java/kr/xit/biz/ccn/mapper/IBizChuncheonMapper.java similarity index 94% rename from mens-api/src/main/java/kr/xit/biz/chuncheon/mapper/IBizChuncheonMapper.java rename to mens-api/src/main/java/kr/xit/biz/ccn/mapper/IBizChuncheonMapper.java index fce1b9e..e1b1273 100644 --- a/mens-api/src/main/java/kr/xit/biz/chuncheon/mapper/IBizChuncheonMapper.java +++ b/mens-api/src/main/java/kr/xit/biz/ccn/mapper/IBizChuncheonMapper.java @@ -1,4 +1,4 @@ -package kr.xit.biz.chuncheon.mapper; +package kr.xit.biz.ccn.mapper; import java.util.List; import java.util.Optional; @@ -6,7 +6,7 @@ import java.util.Optional; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; import org.springframework.context.annotation.Conditional; -import kr.xit.biz.chuncheon.model.ChuncheonSndngResultDTO; +import kr.xit.biz.ccn.model.ChuncheonSndngResultDTO; import kr.xit.biz.ens.model.cmm.CmmEnsFileInfDTO; import kr.xit.biz.ens.model.cmm.TmplatManage; import kr.xit.biz.ens.model.cntc.CntcDTO; diff --git a/mens-api/src/main/java/kr/xit/biz/chuncheon/model/ChuncheonSndngResultDTO.java b/mens-api/src/main/java/kr/xit/biz/ccn/model/ChuncheonSndngResultDTO.java similarity index 99% rename from mens-api/src/main/java/kr/xit/biz/chuncheon/model/ChuncheonSndngResultDTO.java rename to mens-api/src/main/java/kr/xit/biz/ccn/model/ChuncheonSndngResultDTO.java index 07c0ac0..c00446a 100644 --- a/mens-api/src/main/java/kr/xit/biz/chuncheon/model/ChuncheonSndngResultDTO.java +++ b/mens-api/src/main/java/kr/xit/biz/ccn/model/ChuncheonSndngResultDTO.java @@ -1,4 +1,4 @@ -package kr.xit.biz.chuncheon.model; +package kr.xit.biz.ccn.model; import javax.validation.constraints.Size; diff --git a/mens-api/src/main/java/kr/xit/biz/chuncheon/service/BizChuncheonService.java b/mens-api/src/main/java/kr/xit/biz/ccn/service/BizChuncheonService.java similarity index 99% rename from mens-api/src/main/java/kr/xit/biz/chuncheon/service/BizChuncheonService.java rename to mens-api/src/main/java/kr/xit/biz/ccn/service/BizChuncheonService.java index da2bf1d..b763e5a 100644 --- a/mens-api/src/main/java/kr/xit/biz/chuncheon/service/BizChuncheonService.java +++ b/mens-api/src/main/java/kr/xit/biz/ccn/service/BizChuncheonService.java @@ -1,4 +1,4 @@ -package kr.xit.biz.chuncheon.service; +package kr.xit.biz.ccn.service; import static egovframework.com.cmm.util.EgovDateUtil.*; @@ -33,8 +33,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import kr.xit.biz.chuncheon.mapper.IBizChuncheonMapper; -import kr.xit.biz.chuncheon.model.ChuncheonSndngResultDTO; +import kr.xit.biz.ccn.mapper.IBizChuncheonMapper; +import kr.xit.biz.ccn.model.ChuncheonSndngResultDTO; import kr.xit.biz.common.ApiConstants; import kr.xit.biz.common.ApiConstants.NiceCiWrkDiv; import kr.xit.biz.ens.model.cmm.CmmEnsFileInfDTO.FmcExcelUpload; diff --git a/mens-api/src/main/java/kr/xit/biz/chuncheon/service/IBizChuncheonService.java b/mens-api/src/main/java/kr/xit/biz/ccn/service/IBizChuncheonService.java similarity index 90% rename from mens-api/src/main/java/kr/xit/biz/chuncheon/service/IBizChuncheonService.java rename to mens-api/src/main/java/kr/xit/biz/ccn/service/IBizChuncheonService.java index 5c7ce56..6268de8 100644 --- a/mens-api/src/main/java/kr/xit/biz/chuncheon/service/IBizChuncheonService.java +++ b/mens-api/src/main/java/kr/xit/biz/ccn/service/IBizChuncheonService.java @@ -1,8 +1,8 @@ -package kr.xit.biz.chuncheon.service; +package kr.xit.biz.ccn.service; import java.util.List; -import kr.xit.biz.chuncheon.model.ChuncheonSndngResultDTO; +import kr.xit.biz.ccn.model.ChuncheonSndngResultDTO; import kr.xit.biz.ens.model.cmm.CmmEnsFileInfDTO.FmcExcelUpload; import kr.xit.biz.ens.model.cntc.CntcDTO; diff --git a/mens-api/src/main/java/kr/xit/biz/chuncheon/web/BizChuncheonController.java b/mens-api/src/main/java/kr/xit/biz/ccn/web/BizChuncheonController.java similarity index 96% rename from mens-api/src/main/java/kr/xit/biz/chuncheon/web/BizChuncheonController.java rename to mens-api/src/main/java/kr/xit/biz/ccn/web/BizChuncheonController.java index b53f290..fb56a1a 100644 --- a/mens-api/src/main/java/kr/xit/biz/chuncheon/web/BizChuncheonController.java +++ b/mens-api/src/main/java/kr/xit/biz/ccn/web/BizChuncheonController.java @@ -1,4 +1,4 @@ -package kr.xit.biz.chuncheon.web; +package kr.xit.biz.ccn.web; import org.springframework.context.annotation.Conditional; import org.springframework.http.MediaType; @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RestController; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import kr.xit.biz.chuncheon.model.ChuncheonSndngResultDTO; -import kr.xit.biz.chuncheon.service.IBizChuncheonService; +import kr.xit.biz.ccn.model.ChuncheonSndngResultDTO; +import kr.xit.biz.ccn.service.IBizChuncheonService; import kr.xit.biz.ens.model.cmm.CmmEnsFileInfDTO.FmcExcelUpload; import kr.xit.biz.ens.model.cntc.CntcDTO; import kr.xit.core.model.ApiResponseDTO; diff --git a/mens-api/src/main/resources/config/application-local-cheonan.yml b/mens-api/src/main/resources/config/application-local-can.yml similarity index 91% rename from mens-api/src/main/resources/config/application-local-cheonan.yml rename to mens-api/src/main/resources/config/application-local-can.yml index 7967838..fcd9ab1 100644 --- a/mens-api/src/main/resources/config/application-local-cheonan.yml +++ b/mens-api/src/main/resources/config/application-local-can.yml @@ -11,16 +11,7 @@ spring: jdbc-url: jdbc:oracle:thin:@211.119.124.118:1521:bustms username: iup password: iup!0202 - read-only: false pool-name: xit-oracle-pool - auto-commit: false - # 인프라의 적용된 connection time limit보다 작아야함 - max-lifetime: 1800000 - maximum-pool-size: 15 - minimum-idle: 5 - # transaction-isolation: TRANSACTION_READ_UNCOMMITTED - data-source-properties: - rewriteBatchedStatements: true devtools: restart: diff --git a/mens-api/src/main/resources/config/application-local-chuncheon.yml b/mens-api/src/main/resources/config/application-local-ccn.yml similarity index 90% rename from mens-api/src/main/resources/config/application-local-chuncheon.yml rename to mens-api/src/main/resources/config/application-local-ccn.yml index 25e3741..52c2390 100644 --- a/mens-api/src/main/resources/config/application-local-chuncheon.yml +++ b/mens-api/src/main/resources/config/application-local-ccn.yml @@ -11,17 +11,7 @@ spring: jdbc-url: jdbc:mariadb://211.119.124.117:53306/ens?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&autoReconnect=true username: ens password: xit5811807 - read-only: false pool-name: xit-maria-pool - auto-commit: false - # 인프라의 적용된 connection time limit보다 작아야함 - validation-timeout: 300000 - max-lifetime: 1800000 - maximum-pool-size: 15 - minimum-idle: 5 - #transaction-isolation: TRANSACTION_READ_UNCOMMITTED - data-source-properties: - rewriteBatchedStatements: true devtools: restart: diff --git a/mens-api/src/main/resources/config/application-local.yml b/mens-api/src/main/resources/config/application-local.yml index 807041c..136d8e5 100644 --- a/mens-api/src/main/resources/config/application-local.yml +++ b/mens-api/src/main/resources/config/application-local.yml @@ -11,17 +11,7 @@ spring: jdbc-url: jdbc:mariadb://211.119.124.117:53306/ens?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&autoReconnect=true username: ens password: xit5811807 - read-only: false pool-name: xit-maria-pool - auto-commit: false - # 인프라의 적용된 connection time limit보다 작아야함 - validation-timeout: 300000 - max-lifetime: 1800000 - maximum-pool-size: 15 - minimum-idle: 5 - #transaction-isolation: TRANSACTION_READ_UNCOMMITTED - data-source-properties: - rewriteBatchedStatements: true # multi-database secondary: database: oracle diff --git a/mens-api/src/main/resources/config/application.yml b/mens-api/src/main/resources/config/application.yml index 9e64ae0..1c98918 100644 --- a/mens-api/src/main/resources/config/application.yml +++ b/mens-api/src/main/resources/config/application.yml @@ -17,7 +17,7 @@ server: whitelabel: enabled: false app: - name: mens-api + name: mens-traffic-api # springdoc url 정보 desc: 모바일 전자고지 Rest API data: @@ -49,6 +49,21 @@ spring: - app - ens + datasource: + hikari: + # 9 server + primary: + read-only: false + auto-commit: false + # 인프라의 적용된 connection time limit보다 작아야함 + validation-timeout: 300000 + max-lifetime: 1800000 + maximum-pool-size: 15 + minimum-idle: 5 + #transaction-isolation: TRANSACTION_READ_UNCOMMITTED + data-source-properties: + rewriteBatchedStatements: true + batch: jdbc: initialize-schema: NEVER #NEVER|ALWAYS @@ -63,6 +78,10 @@ spring: #----------------------------------------------------------------- logging: + file: + # 로그파일 위치 + path: ${app.data.root.path}/mens/logs + name: ${app.name} level: root: error '[org.apache.tomcat.util.net]': warn diff --git a/mens-api/src/main/resources/egovframework/mapper/biz/ens-chuncheon-mysql-mapper.xml b/mens-api/src/main/resources/egovframework/mapper/biz/ens-chuncheon-mysql-mapper.xml index 0941205..7904669 100644 --- a/mens-api/src/main/resources/egovframework/mapper/biz/ens-chuncheon-mysql-mapper.xml +++ b/mens-api/src/main/resources/egovframework/mapper/biz/ens-chuncheon-mysql-mapper.xml @@ -1,7 +1,7 @@ - + + - /** ens-sysul-mysql-mapper|selectSndngResultDetails-발송결과정보 상세 조회|julim */ SELECT tesn.unity_sndng_mastr_id /* 통합발송마스터 ID - 파일유일키 */ , tcsnd.unity_sndng_detail_id /* 통합발송상세 ID - 우편물 일련번호 */ diff --git a/mens-api/src/main/resources/logback-spring.xml b/mens-api/src/main/resources/logback-spring.xml index 83e280c..651df5f 100644 --- a/mens-api/src/main/resources/logback-spring.xml +++ b/mens-api/src/main/resources/logback-spring.xml @@ -14,10 +14,10 @@ --> - + - + @@ -89,7 +89,6 @@ - \"juminId\"\s*:\s*\"(.*?)\" \"recveJuminno\"\s*:\s*\"(.*?)\" \"recevAddr\"\s*:\s*\"(.*?)\" \"recevDetailAddr\"\s*:\s*\"(.*?)\" @@ -107,7 +106,7 @@ - + @@ -115,7 +114,7 @@ - + @@ -158,7 +157,7 @@ - + @@ -170,11 +169,11 @@ - + - + diff --git a/mens-batch/src/main/resources/logback-spring.xml b/mens-batch/src/main/resources/logback-spring.xml index 1d2806f..bacfafe 100644 --- a/mens-batch/src/main/resources/logback-spring.xml +++ b/mens-batch/src/main/resources/logback-spring.xml @@ -14,10 +14,10 @@ --> - + - + @@ -106,7 +106,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -169,11 +169,11 @@ - + - + diff --git a/mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfCheonan.java b/mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfCheonan.java index 1e539f1..c55161b 100644 --- a/mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfCheonan.java +++ b/mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfCheonan.java @@ -11,7 +11,7 @@ public class ProfileConditionOfCheonan implements Condition { public boolean matches(ConditionContext context, @NonNull AnnotatedTypeMetadata metadata) { String[] activeProfiles = context.getEnvironment().getActiveProfiles(); for (String profile : activeProfiles) { - if (profile.matches(".*cheonan.*")) { + if (profile.matches(".*-can")) { return true; } } diff --git a/mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfChuncheon.java b/mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfChuncheon.java index 4588e68..e1babd7 100644 --- a/mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfChuncheon.java +++ b/mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfChuncheon.java @@ -11,7 +11,7 @@ public class ProfileConditionOfChuncheon implements Condition { public boolean matches(ConditionContext context, @NonNull AnnotatedTypeMetadata metadata) { String[] activeProfiles = context.getEnvironment().getActiveProfiles(); for (String profile : activeProfiles) { - if (profile.matches(".*chuncheon.*")) { + if (profile.matches(".*ccn")) { return true; } } diff --git a/mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfSisul.java b/mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfSisul.java deleted file mode 100644 index 9fa372f..0000000 --- a/mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfSisul.java +++ /dev/null @@ -1,20 +0,0 @@ -package kr.xit.core.spring.config.support; - -import org.springframework.context.annotation.Condition; -import org.springframework.context.annotation.ConditionContext; -import org.springframework.core.type.AnnotatedTypeMetadata; - -import lombok.NonNull; - -public class ProfileConditionOfSisul implements Condition { - @Override - public boolean matches(ConditionContext context, @NonNull AnnotatedTypeMetadata metadata) { - String[] activeProfiles = context.getEnvironment().getActiveProfiles(); - for (String profile : activeProfiles) { - if (profile.matches(".*sisul.*")) { - return true; - } - } - return false; - } -} diff --git a/pom.xml b/pom.xml index c4a5f2e..4cba4c3 100644 --- a/pom.xml +++ b/pom.xml @@ -234,9 +234,9 @@ - local-chuncheon + local-ccn - local-chuncheon + local-ccn false @@ -244,9 +244,9 @@ - local-cheonan + local-can - local-cheonan + local-can false