xit-java
/
mens-traffic-parent
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: chuncheon, cheonan 패키지 적용

Browse Source
main
Jonguk. Lim 3 months ago
parent 5f699f331b
commit 531ee45ffc
16 changed files with 53 additions and 84 deletions
Show Stats Download Patch File Download Diff File

4
mens-api/src/main/java/kr/xit/biz/chuncheon/mapper/IBizChuncheonMapper.java → mens-api/src/main/java/kr/xit/biz/ccn/mapper/IBizChuncheonMapper.java
Unescape Escape View File

@ -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;

2
mens-api/src/main/java/kr/xit/biz/chuncheon/model/ChuncheonSndngResultDTO.java → mens-api/src/main/java/kr/xit/biz/ccn/model/ChuncheonSndngResultDTO.java
Unescape Escape View File

@ -1,4 +1,4 @@
package kr.xit.biz.chuncheon.model;
package kr.xit.biz.ccn.model;
import javax.validation.constraints.Size;

6
mens-api/src/main/java/kr/xit/biz/chuncheon/service/BizChuncheonService.java → mens-api/src/main/java/kr/xit/biz/ccn/service/BizChuncheonService.java
Unescape Escape View File

@ -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;

4
mens-api/src/main/java/kr/xit/biz/chuncheon/service/IBizChuncheonService.java → mens-api/src/main/java/kr/xit/biz/ccn/service/IBizChuncheonService.java
Unescape Escape View File

@ -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;

6
mens-api/src/main/java/kr/xit/biz/chuncheon/web/BizChuncheonController.java → mens-api/src/main/java/kr/xit/biz/ccn/web/BizChuncheonController.java
Unescape Escape View File

@ -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;

9
mens-api/src/main/resources/config/application-local-cheonan.yml → mens-api/src/main/resources/config/application-local-can.yml
Unescape Escape View File

@ -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:

10
mens-api/src/main/resources/config/application-local-chuncheon.yml → mens-api/src/main/resources/config/application-local-ccn.yml
Unescape Escape View File

@ -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:

10
mens-api/src/main/resources/config/application-local.yml
Unescape Escape View File

@ -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

21
mens-api/src/main/resources/config/application.yml
Unescape Escape View File

@ -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

6
mens-api/src/main/resources/egovframework/mapper/biz/ens-chuncheon-mysql-mapper.xml
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="kr.xit.biz.chuncheon.mapper.IBizChuncheonMapper">
<mapper namespace="kr.xit.biz.ccn.mapper.IBizChuncheonMapper">
<select id="selectDeptInfoByTmplId" resultType="kr.xit.biz.ens.model.cmm.TmplatManage">
/** ens-sysul-mysql-mapper|selectDeptInfoByTmplId-템플릿ID로 부서정보 조회|seojh */
@ -94,7 +94,7 @@
)
</insert>
<select id="selectSndngResultMaster" resultType="kr.xit.biz.chuncheon.model.ChuncheonSndngResultDTO$RsltChuncheonResMstData">
<select id="selectSndngResultMaster" resultType="kr.xit.biz.ccn.model.ChuncheonSndngResultDTO$RsltChuncheonResMstData">
/** ens-sysul-mysql-mapper|selectSndngResultMaster-발송결과정보 마스터 조회|julim */
SELECT tesn.unity_sndng_mastr_id /* 통합발송마스터 ID - 파일유일키 */
, tesn.sndng_se_code /* 발송구분코드 */
@ -106,7 +106,7 @@
WHERE tesn.unity_sndng_mastr_id = #{unitySndngMastrId}
</select>
<select id="selectSndngResultDetails" resultType="kr.xit.biz.chuncheon.model.ChuncheonSndngResultDTO$RsltChuncheonResDtlData">
<select id="selectSndngResultDetails" resultType="kr.xit.biz.ccn.model.ChuncheonSndngResultDTO$RsltChuncheonResDtlData">
/** ens-sysul-mysql-mapper|selectSndngResultDetails-발송결과정보 상세 조회|julim */
SELECT tesn.unity_sndng_mastr_id /* 통합발송마스터 ID - 파일유일키 */
, tcsnd.unity_sndng_detail_id /* 통합발송상세 ID - 우편물 일련번호 */

15
mens-api/src/main/resources/logback-spring.xml
Unescape Escape View File

@ -14,10 +14,10 @@
-->
<!-- async rolling appender 사용시 로그의 class, method, line number 출력 제어 : 성능저하 이슈 -->
<springProfile name="local, local-chuncheon, dev, dev-chuncheon">
<springProfile name="local, local-ccn, local-can, dev-ccn, dev-can">
<property name="isIncludeCallerData" value="true"/>
</springProfile>
<springProfile name="prod">
<springProfile name="prod-ccn, prod-can">
<property name="isIncludeCallerData" value="false"/>
</springProfile>
@ -89,7 +89,6 @@
<appender name="mask" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="kr.xit.core.support.logback.LogbackMaskingPatternLayout">
<maskPattern>\"juminId\"\s*:\s*\"(.*?)\"</maskPattern> <!-- SSN JSON pattern -->
<maskPattern>\"recveJuminno\"\s*:\s*\"(.*?)\"</maskPattern> <!-- SSN JSON pattern -->
<maskPattern>\"recevAddr\"\s*:\s*\"(.*?)\"</maskPattern> <!-- Address JSON pattern -->
<maskPattern>\"recevDetailAddr\"\s*:\s*\"(.*?)\"</maskPattern> <!-- Address JSON pattern -->
@ -107,7 +106,7 @@
<!-- log4jdbc 옵션 설정 -->
<logger name="jdbc" level="OFF"/>
<springProfile name="prod">
<springProfile name="prod-ccn, prod-can">
<!-- 운영 환경에서만 sql문 및 결과 출력하지 않음 -->
<!-- SQL문과 소요된 시간 -->
<logger name="jdbc.sqltiming" level="OFF"/>
@ -115,7 +114,7 @@
<logger name="jdbc.resultsettable" level="OFF"/>
</springProfile>
<springProfile name="local, local-chuncheon, dev, dev-chuncheon">
<springProfile name="local, local-ccn, local-can, dev-ccn, dev-can">
<!-- 로컬, 개발 환경에서는 sql문 및 결과 출력 -->
<!-- SQL문과 소요된 시간 -->
<logger name="jdbc.sqltiming" level="DEBUG" />
@ -158,7 +157,7 @@
<!-- ************************************************************************* -->
<!-- application log : root appender로 로그 전파 - additivity="true" -->
<!-- ************************************************************************* -->
<!-- <logger name="org.springframework.web.filter.MustRequestLoggingFilter" level="DEBUG" additivity="false"/>-->
<!-- <logger name="org.springframework.web.filter.MustRequestLoggingFilter" level="DEBUG" additivity="false"/>-->
<!--logger name="kr.xit.core.filter.CustomRequestLoggingFilter" level="DEBUG"/-->
<logger name="kr.xit" level="DEBUG"/>
<!-- ************************************************************************* -->
@ -170,11 +169,11 @@
<!-- root logging -->
<!-- ************************************************************************* -->
<root level="DEBUG">
<springProfile name="prod">
<springProfile name="prod-ccn, prod-can">
<appender-ref ref="ASYNC_ROLLING"/>
</springProfile>
<springProfile name="local, local-chuncheon, dev, dev-chuncheon">
<springProfile name="local, local-ccn, local-can, dev-ccn, dev-can">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="ASYNC_ROLLING"/>
</springProfile>

12
mens-batch/src/main/resources/logback-spring.xml
Unescape Escape View File

@ -14,10 +14,10 @@
-->
<!-- async rolling appender 사용시 로그의 class, method, line number 출력 제어 : 성능저하 이슈 -->
<springProfile name="local, dev">
<springProfile name="local, local-ccn, local-can, dev-ccn, dev-can">
<property name="isIncludeCallerData" value="true"/>
</springProfile>
<springProfile name="prod">
<springProfile name="prod-ccn, prod-can">
<property name="isIncludeCallerData" value="false"/>
</springProfile>
@ -106,7 +106,7 @@
<!-- log4jdbc 옵션 설정 -->
<logger name="jdbc" level="OFF"/>
<springProfile name="prod">
<springProfile name="prod-ccn, prod-can">
<!-- 운영 환경에서만 sql문 및 결과 출력하지 않음 -->
<!-- SQL문과 소요된 시간 -->
<logger name="jdbc.sqltiming" level="OFF"/>
@ -114,7 +114,7 @@
<logger name="jdbc.resultsettable" level="OFF"/>
</springProfile>
<springProfile name="local, dev">
<springProfile name="local, local-ccn, local-can, dev-ccn, dev-can">
<!-- 로컬, 개발 환경에서는 sql문 및 결과 출력 -->
<!-- SQL문과 소요된 시간 -->
<logger name="jdbc.sqltiming" level="DEBUG" />
@ -169,11 +169,11 @@
<!-- root logging -->
<!-- ************************************************************************* -->
<root level="DEBUG">
<springProfile name="prod">
<springProfile name="prod-ccn, prod-can">
<appender-ref ref="ASYNC_ROLLING"/>
</springProfile>
<springProfile name="local, dev">
<springProfile name="local, local-ccn, local-can, dev-ccn, dev-can">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="ASYNC_ROLLING"/>
</springProfile>

2
mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfCheonan.java
Unescape Escape View File

@ -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;
}
}

2
mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfChuncheon.java
Unescape Escape View File

@ -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;
}
}

20
mens-core/src/main/java/kr/xit/core/spring/config/support/ProfileConditionOfSisul.java
Unescape Escape View File

@ -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;
}
}

8
pom.xml
Unescape Escape View File

@ -234,9 +234,9 @@
</profile>
<profile>
<id>local-chuncheon</id>
<id>local-ccn</id>
<properties>
<env>local-chuncheon</env>
<env>local-ccn</env>
</properties>
<activation>
<activeByDefault>false</activeByDefault>
@ -244,9 +244,9 @@
</profile>
<profile>
<id>local-cheonan</id>
<id>local-can</id>
<properties>
<env>local-cheonan</env>
<env>local-can</env>
</properties>
<activation>
<activeByDefault>false</activeByDefault>

Write Preview
Loading…
Cancel
Save