Merge branch 'susu' into dev
# Conflicts: # admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java # admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java # admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java
This commit is contained in:
20
README.md
20
README.md
@@ -97,7 +97,7 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요.
|
|||||||
|
|
||||||
|
|
||||||
### VM Options 예시
|
### VM Options 예시
|
||||||
#### `admin`, `front`, `api` 모두 사용가능합니다.
|
#### `admin`, `front` 모두 사용가능합니다.
|
||||||
```
|
```
|
||||||
-Dspring.profiles.active=local
|
-Dspring.profiles.active=local
|
||||||
-Dapp.initData.core=false
|
-Dapp.initData.core=false
|
||||||
@@ -108,27 +108,19 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요.
|
|||||||
-Dserver.port=8080
|
-Dserver.port=8080
|
||||||
-Dserver.forward-headers-strategy=native
|
-Dserver.forward-headers-strategy=native
|
||||||
-Dlogging.level.org.springframework.security=DEBUG
|
-Dlogging.level.org.springframework.security=DEBUG
|
||||||
-Dspring.datasource.driver-class-name=org.postgresql.Driver
|
|
||||||
-Dspring.datasource.url=jdbc:postgresql://15.165.180.203:5432/korea_research
|
|
||||||
-Dspring.datasource.username=ko_research
|
|
||||||
-Dspring.datasource.password=koresearch1@#4
|
|
||||||
-Daes.secret-key=092HW829O0A0AVR0
|
-Daes.secret-key=092HW829O0A0AVR0
|
||||||
-Dpath.upload.storage=LOCAL
|
-Dpath.upload.storage=LOCAL
|
||||||
-Dpath.upload.sftp.public=/home/etribe/data/upload
|
-Dpath.upload.sftp.public=/home/etribe/data/upload
|
||||||
-Dpath.upload.sftp.tmpdir=${user.home}/upload/tmpdir
|
|
||||||
-Dfile.upload.sftp.ip=115.68.193.117
|
-Dfile.upload.sftp.ip=115.68.193.117
|
||||||
-Dfile.upload.sftp.id=etribe
|
-Dfile.upload.sftp.id=etribe
|
||||||
-Dfile.upload.sftp.password=Etribe@3415
|
-Dfile.upload.sftp.password=Etribe@3415
|
||||||
-Dfile.upload.sftp.port=22
|
-Dfile.upload.sftp.port=22
|
||||||
-Dspring.datasource.hikari.maximum-pool-size=10
|
|
||||||
-Dspring.datasource.hikari.minimum-idle=5
|
|
||||||
-Dspring.datasource.hikari.idle-timeout=120000
|
|
||||||
-Dspring.datasource.hikari.max-lifetime=900000
|
|
||||||
-Dspring.datasource.hikari.connection-timeout=5000
|
|
||||||
-Dspring.datasource.hikari.leak-detection-threshold=30000
|
|
||||||
```
|
```
|
||||||
** 주의 : 운영서버일 경우 -Dpath.upload.storage=SFTP로 설정
|
** 주의 : 운영서버일 경우 vm옵션 추가
|
||||||
|
-Dspring.profiles.active=prod
|
||||||
|
-Dpath.upload.storage=SFTP
|
||||||
|
-Djasypt.encryptor.password=ko-research
|
||||||
|
-Djasypt.encryptor.algorithm=PBEWITHHMACSHA512ANDAES_256
|
||||||
|
|
||||||
|
|
||||||
## JDBC 및 데이터 핸들링 구성 옵션
|
## JDBC 및 데이터 핸들링 구성 옵션
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package app.module.admin.config.application.bean;
|
||||||
|
|
||||||
|
import org.jasypt.encryption.StringEncryptor;
|
||||||
|
import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
|
||||||
|
import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class JasyptConfig {
|
||||||
|
@Value("${jasypt.encryptor.password}")
|
||||||
|
private String jasyptPassword;
|
||||||
|
|
||||||
|
@Value("${jasypt.encryptor.algorithm}")
|
||||||
|
private String jasyptAlgorithm;
|
||||||
|
|
||||||
|
@Bean("jasyptStringEncryptor")
|
||||||
|
public StringEncryptor stringEncryptor() {
|
||||||
|
SimpleStringPBEConfig config = new SimpleStringPBEConfig();
|
||||||
|
config.setPassword(jasyptPassword); // 암호화할 때 사용하는 키
|
||||||
|
config.setPoolSize("1"); // 인스턴스 pool
|
||||||
|
config.setAlgorithm(jasyptAlgorithm); // 암호화 알고리즘
|
||||||
|
config.setStringOutputType("base64"); // 인코딩 방식
|
||||||
|
config.setKeyObtentionIterations("1000"); // 반복할 해싱 회수
|
||||||
|
config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); // salt 생성 클래스
|
||||||
|
config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator");
|
||||||
|
|
||||||
|
PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
|
||||||
|
encryptor.setConfig(config);
|
||||||
|
return encryptor;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package app.module.admin.config.application.bean;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.ibatis.session.SqlSessionFactory;
|
||||||
|
import org.mybatis.spring.SqlSessionFactoryBean;
|
||||||
|
import org.mybatis.spring.SqlSessionTemplate;
|
||||||
|
import org.mybatis.spring.annotation.MapperScan;
|
||||||
|
import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
|
||||||
|
import org.springframework.beans.factory.annotation.Qualifier;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
import org.springframework.boot.jdbc.DataSourceBuilder;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.context.annotation.Primary;
|
||||||
|
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
|
||||||
|
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||||
|
|
||||||
|
import javax.sql.DataSource;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Configuration
|
||||||
|
@MapperScan(
|
||||||
|
basePackages = { "app.module.admin", "app.module.core" },
|
||||||
|
annotationClass = org.apache.ibatis.annotations.Mapper.class,
|
||||||
|
sqlSessionFactoryRef = "kriSqlSessionFactory")
|
||||||
|
@EnableTransactionManagement
|
||||||
|
public class KRIConfig {
|
||||||
|
|
||||||
|
@Value("${mybatis.mapper-locations.kri}")
|
||||||
|
private String mybatisMapper;
|
||||||
|
|
||||||
|
@Primary
|
||||||
|
@Bean(name = "kriDataSource")
|
||||||
|
@ConfigurationProperties(prefix = "spring.datasource.kri")
|
||||||
|
public DataSource kriDataSource() {
|
||||||
|
return DataSourceBuilder.create().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Primary
|
||||||
|
@Bean(name = "kriSqlSessionFactory")
|
||||||
|
public SqlSessionFactory kriSqlSessionFactory(@Qualifier("kriDataSource") DataSource dataSource) throws Exception {
|
||||||
|
SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean();
|
||||||
|
sessionFactoryBean.setVfs(SpringBootVFS.class);
|
||||||
|
configureSqlSessionFactory(sessionFactoryBean, dataSource);
|
||||||
|
return sessionFactoryBean.getObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void configureSqlSessionFactory(SqlSessionFactoryBean sessionFactoryBean, DataSource dataSource) throws IOException {
|
||||||
|
sessionFactoryBean.setDataSource(dataSource);
|
||||||
|
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
|
||||||
|
sessionFactoryBean.setMapperLocations(resolver.getResources(mybatisMapper));
|
||||||
|
|
||||||
|
org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration();
|
||||||
|
configuration.setMapUnderscoreToCamelCase(true);
|
||||||
|
sessionFactoryBean.setConfiguration(configuration);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Primary
|
||||||
|
@Bean(name = "kriSqlSessionTemplate")
|
||||||
|
public SqlSessionTemplate kriSqlSessionTemplate(@Qualifier("kriSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
|
||||||
|
SqlSessionTemplate sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory);
|
||||||
|
return sqlSessionTemplate;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package app.module.admin.config.application.bean;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.ibatis.session.SqlSessionFactory;
|
||||||
|
import org.mybatis.spring.SqlSessionFactoryBean;
|
||||||
|
import org.mybatis.spring.SqlSessionTemplate;
|
||||||
|
import org.mybatis.spring.annotation.MapperScan;
|
||||||
|
import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
|
||||||
|
import org.springframework.beans.factory.annotation.Qualifier;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
import org.springframework.boot.jdbc.DataSourceBuilder;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
|
||||||
|
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||||
|
|
||||||
|
import javax.sql.DataSource;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Configuration
|
||||||
|
@MapperScan(
|
||||||
|
basePackages = "app.module.mms",
|
||||||
|
annotationClass = org.apache.ibatis.annotations.Mapper.class,
|
||||||
|
sqlSessionFactoryRef = "mmsSqlSessionFactory")
|
||||||
|
@EnableTransactionManagement
|
||||||
|
public class MMSDBConfig {
|
||||||
|
|
||||||
|
@Value("${mybatis.mapper-locations.mms}")
|
||||||
|
private String mybatisMapper;
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
@ConfigurationProperties(prefix = "spring.datasource.mms")
|
||||||
|
public DataSource mmsDataSource() {
|
||||||
|
return DataSourceBuilder.create().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean(name = "mmsSqlSessionFactory")
|
||||||
|
public SqlSessionFactory mmsSqlSessionFactory(@Qualifier("mmsDataSource") DataSource dataSource) throws Exception {
|
||||||
|
SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean();
|
||||||
|
sessionFactoryBean.setVfs(SpringBootVFS.class);
|
||||||
|
configureSqlSessionFactory(sessionFactoryBean, dataSource);
|
||||||
|
return sessionFactoryBean.getObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void configureSqlSessionFactory(SqlSessionFactoryBean sessionFactoryBean, DataSource dataSource) throws IOException {
|
||||||
|
sessionFactoryBean.setDataSource(dataSource);
|
||||||
|
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
|
||||||
|
sessionFactoryBean.setMapperLocations(resolver.getResources(mybatisMapper));
|
||||||
|
|
||||||
|
org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration();
|
||||||
|
configuration.setMapUnderscoreToCamelCase(true);
|
||||||
|
// configuration.setJdbcTypeForNull(null);
|
||||||
|
sessionFactoryBean.setConfiguration(configuration);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean(name = "mmsSqlSessionTemplate")
|
||||||
|
public SqlSessionTemplate mmsSqlSessionTemplate(@Qualifier("mmsSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
|
||||||
|
SqlSessionTemplate sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory);
|
||||||
|
return sqlSessionTemplate;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
package app.module.admin.usecase.schedule.autoSchedules.adapters.web;
|
package app.module.admin.usecase.schedule.autoSchedules.adapters.web;
|
||||||
|
|
||||||
|
import app.module.admin.config.application.util.DateUiUtil;
|
||||||
|
import app.module.admin.config.application.util.model.DayRange;
|
||||||
import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn;
|
import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn;
|
||||||
|
import java.time.LocalDate;
|
||||||
import org.springframework.scheduling.annotation.Scheduled;
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
@@ -38,4 +41,10 @@ public class AutoSchedulesController {
|
|||||||
/**
|
/**
|
||||||
* TODO 스케쥴 있다면.. 추가.
|
* TODO 스케쥴 있다면.. 추가.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// 매일 오후 5시 마다 실행되는 스케줄러
|
||||||
|
@Scheduled(cron = "0 1 * * * ?")
|
||||||
|
public void fetchSmsAutoSenTest() {
|
||||||
|
portIn.sendAutoSmsTest();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,4 +7,5 @@ public interface AutoSchedulesPortIn {
|
|||||||
Optional<Boolean> operate();
|
Optional<Boolean> operate();
|
||||||
Optional<Boolean> sendAutoSms();
|
Optional<Boolean> sendAutoSms();
|
||||||
Optional<Boolean> monthlyCarryOver();
|
Optional<Boolean> monthlyCarryOver();
|
||||||
|
Optional<Boolean> sendAutoSmsTest();
|
||||||
}
|
}
|
||||||
@@ -13,6 +13,7 @@ import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.applicati
|
|||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import app.module.mms.ports.MMSPortIn;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@@ -25,6 +26,7 @@ import org.springframework.util.CollectionUtils;
|
|||||||
class AutoSchedulesService implements AutoSchedulesPortIn {
|
class AutoSchedulesService implements AutoSchedulesPortIn {
|
||||||
|
|
||||||
private final AutoSchedulesPortOut portOut;
|
private final AutoSchedulesPortOut portOut;
|
||||||
|
private final MMSPortIn mmsPortIn;
|
||||||
private final GetSmsAutoStatusPortIn getSmsAutoStatusPortIn;
|
private final GetSmsAutoStatusPortIn getSmsAutoStatusPortIn;
|
||||||
private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn;
|
private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn;
|
||||||
|
|
||||||
@@ -75,6 +77,31 @@ class AutoSchedulesService implements AutoSchedulesPortIn {
|
|||||||
return Optional.of(true);
|
return Optional.of(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Optional<Boolean> sendAutoSmsTest() {
|
||||||
|
String targetMonth = "202507";
|
||||||
|
DayRange dayRange = new DayRange(1, 7);
|
||||||
|
GetSmsAutoStatus getSmsAutoStatus = new GetSmsAutoStatus(true, "테스트", "01012345678", null, null);
|
||||||
|
|
||||||
|
// dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회
|
||||||
|
List<GetIncompleteHouseholds> incompleteHouseholds = getIncompleteHouseholdsPortIn.operate(
|
||||||
|
new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay())
|
||||||
|
);
|
||||||
|
|
||||||
|
System.out.println(incompleteHouseholds);
|
||||||
|
|
||||||
|
// 미등록 임가가 있을 경우에만 실행
|
||||||
|
if(!CollectionUtils.isEmpty(incompleteHouseholds)) {
|
||||||
|
mmsPortIn.sendAutoSms(new app.module.mms.ports.application.domain.CreateSmsAutoSendCmd(
|
||||||
|
incompleteHouseholds,
|
||||||
|
getSmsAutoStatus.getSendPhone(),
|
||||||
|
getSmsAutoStatus.getMessage()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
return Optional.of(true);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Optional<Boolean> monthlyCarryOver() {
|
public Optional<Boolean> monthlyCarryOver() {
|
||||||
return portOut.monthlyCarryOver();
|
return portOut.monthlyCarryOver();
|
||||||
|
|||||||
@@ -1,14 +1,12 @@
|
|||||||
package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain;
|
package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.*;
|
||||||
import lombok.EqualsAndHashCode;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.Setter;
|
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@EqualsAndHashCode
|
@EqualsAndHashCode
|
||||||
|
@ToString
|
||||||
public class GetIncompleteHouseholds {
|
public class GetIncompleteHouseholds {
|
||||||
private Long seq;
|
private Long seq;
|
||||||
private String householdNum;
|
private String householdNum;
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package app.module.mms.adapters.persistence;
|
||||||
|
|
||||||
|
import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd;
|
||||||
|
import app.module.mms.ports.MMSPortOut;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Repository
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class MMSDao implements MMSPortOut {
|
||||||
|
|
||||||
|
private final MMSMapper mapper;
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public Optional<Boolean> sendAutoSms(CreateSmsAutoSendCmd cmd) {
|
||||||
|
try {
|
||||||
|
log.debug("@@@ sendAutoSmsTest");
|
||||||
|
|
||||||
|
mapper.createSmsAutoSend(cmd);
|
||||||
|
|
||||||
|
return Optional.of(true);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.info(e.getMessage());
|
||||||
|
|
||||||
|
// 예외 발생 시 false 반환
|
||||||
|
return Optional.of(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package app.module.mms.adapters.persistence;
|
||||||
|
|
||||||
|
import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface MMSMapper {
|
||||||
|
void createSmsAutoSend(CreateSmsAutoSendCmd cmd);
|
||||||
|
}
|
||||||
10
admin/src/main/java/app/module/mms/ports/MMSPortIn.java
Normal file
10
admin/src/main/java/app/module/mms/ports/MMSPortIn.java
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package app.module.mms.ports;
|
||||||
|
|
||||||
|
import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
public interface MMSPortIn {
|
||||||
|
|
||||||
|
Optional<Boolean> sendAutoSms(CreateSmsAutoSendCmd cmd);
|
||||||
|
}
|
||||||
10
admin/src/main/java/app/module/mms/ports/MMSPortOut.java
Normal file
10
admin/src/main/java/app/module/mms/ports/MMSPortOut.java
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package app.module.mms.ports;
|
||||||
|
|
||||||
|
import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
public interface MMSPortOut {
|
||||||
|
|
||||||
|
Optional<Boolean> sendAutoSms(CreateSmsAutoSendCmd cmd);
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package app.module.mms.ports.application;
|
||||||
|
|
||||||
|
import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd;
|
||||||
|
import app.module.mms.ports.MMSPortIn;
|
||||||
|
import app.module.mms.ports.MMSPortOut;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
class MMSService implements MMSPortIn {
|
||||||
|
|
||||||
|
private final MMSPortOut portOut;
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public Optional<Boolean> sendAutoSms(CreateSmsAutoSendCmd command) {
|
||||||
|
portOut.sendAutoSms(command);
|
||||||
|
|
||||||
|
return Optional.of(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package app.module.mms.ports.application.domain;
|
||||||
|
|
||||||
|
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
@EqualsAndHashCode
|
||||||
|
public class CreateSmsAutoSendCmd {
|
||||||
|
private List<GetIncompleteHouseholds> sendHouseholds;
|
||||||
|
private String sendPhone;
|
||||||
|
private String message;
|
||||||
|
}
|
||||||
@@ -24,3 +24,30 @@ spring:
|
|||||||
# 4초마다 메시지 파일을 다시 읽어옵니다
|
# 4초마다 메시지 파일을 다시 읽어옵니다
|
||||||
# 개발 시에는 짧은 간격으로, 운영 시에는 길게 설정하는 것이 일반적
|
# 개발 시에는 짧은 간격으로, 운영 시에는 길게 설정하는 것이 일반적
|
||||||
cache-duration: 10s
|
cache-duration: 10s
|
||||||
|
thymeleaf:
|
||||||
|
# 타임리프 템플릿 캐시 비활성화 (개발 환경에서는 false 로 설정 권장)
|
||||||
|
cache: false
|
||||||
|
# ==============================================
|
||||||
|
# 데이터베이스 설정
|
||||||
|
# ==============================================
|
||||||
|
datasource:
|
||||||
|
kri:
|
||||||
|
driver-class-name: org.postgresql.Driver
|
||||||
|
jdbc-url: ENC(SH5G+4mdOrW3PpVEmVyNXIFyV7eFC6uLTa0e18qa+7ueQeWrduIeGVJLrQP3mUw86dzqLK7AUHjTRuex4ud+rTt026L7csDLFYzLWGkGCTEqfFBOwHng3uQ7n+qmkKiW)
|
||||||
|
username: ENC(37ccHxlpbsEz8vVcZUZA/j6azKYhP3eHwhOYVjYGf+zKC3u/qc+khKcKuBuE8+Ck)
|
||||||
|
password: ENC(uBHyXdI39UzPNvYNHDGfjmMMuhN83xoP8F3wDq/S9DxizhFwbMeEqa36oZ205CBg)
|
||||||
|
mms:
|
||||||
|
driver-class-name: org.postgresql.Driver
|
||||||
|
jdbc-url: jdbc:postgresql://15.165.180.203:5432/ko_research_hyunjoo
|
||||||
|
username: hyunjoo
|
||||||
|
password: hyunjoo1@#4
|
||||||
|
maximum-pool-size: 2
|
||||||
|
minimum-idle: 1
|
||||||
|
|
||||||
|
# ==============================================
|
||||||
|
# 암호화 설정
|
||||||
|
# ==============================================
|
||||||
|
jasypt:
|
||||||
|
encryptor:
|
||||||
|
password: etribe
|
||||||
|
algorithm: PBEWITHHMACSHA512ANDAES_256
|
||||||
@@ -8,7 +8,7 @@ logging:
|
|||||||
level:
|
level:
|
||||||
# 애플리케이션 기본 패키지 로깅 레벨 (INFO 로 설정)
|
# 애플리케이션 기본 패키지 로깅 레벨 (INFO 로 설정)
|
||||||
# 주의: 기본 패키지 변경 시 app.module 부분을 반드시 수정해야 애플리케이션 로그가 출력됨
|
# 주의: 기본 패키지 변경 시 app.module 부분을 반드시 수정해야 애플리케이션 로그가 출력됨
|
||||||
app.module: INFO
|
app.module: DEBUG
|
||||||
# Spring 프레임워크 로깅 레벨
|
# Spring 프레임워크 로깅 레벨
|
||||||
org.springframework: INFO
|
org.springframework: INFO
|
||||||
# Spring Security 로깅 레벨
|
# Spring Security 로깅 레벨
|
||||||
@@ -24,3 +24,34 @@ spring:
|
|||||||
thymeleaf:
|
thymeleaf:
|
||||||
# 타임리프 템플릿 캐시 비활성화 (개발 환경에서는 false 로 설정 권장)
|
# 타임리프 템플릿 캐시 비활성화 (개발 환경에서는 false 로 설정 권장)
|
||||||
cache: false
|
cache: false
|
||||||
|
# ==============================================
|
||||||
|
# 데이터베이스 설정
|
||||||
|
# ==============================================
|
||||||
|
datasource:
|
||||||
|
kri:
|
||||||
|
driver-class-name: org.postgresql.Driver
|
||||||
|
jdbc-url: ENC(SH5G+4mdOrW3PpVEmVyNXIFyV7eFC6uLTa0e18qa+7ueQeWrduIeGVJLrQP3mUw86dzqLK7AUHjTRuex4ud+rTt026L7csDLFYzLWGkGCTEqfFBOwHng3uQ7n+qmkKiW)
|
||||||
|
username: ENC(37ccHxlpbsEz8vVcZUZA/j6azKYhP3eHwhOYVjYGf+zKC3u/qc+khKcKuBuE8+Ck)
|
||||||
|
password: ENC(uBHyXdI39UzPNvYNHDGfjmMMuhN83xoP8F3wDq/S9DxizhFwbMeEqa36oZ205CBg)
|
||||||
|
mms:
|
||||||
|
driver-class-name: org.postgresql.Driver
|
||||||
|
jdbc-url: jdbc:postgresql://15.165.180.203:5432/ko_research_hyunjoo
|
||||||
|
username: hyunjoo
|
||||||
|
password: hyunjoo1@#4
|
||||||
|
maximum-pool-size: 2
|
||||||
|
minimum-idle: 1
|
||||||
|
hikari:
|
||||||
|
maximum-pool-size: 10
|
||||||
|
minimum-idle: 5
|
||||||
|
idle-timeout: 120000
|
||||||
|
max-lifetime: 900000
|
||||||
|
connection-timeout: 5000
|
||||||
|
leak-detection-threshold: 30000
|
||||||
|
|
||||||
|
# ==============================================
|
||||||
|
# 암호화 설정
|
||||||
|
# ==============================================
|
||||||
|
jasypt:
|
||||||
|
encryptor:
|
||||||
|
password: etribe
|
||||||
|
algorithm: PBEWITHHMACSHA512ANDAES_256
|
||||||
|
|||||||
@@ -19,11 +19,22 @@ logging:
|
|||||||
# 메시지 및 국제화(i18n) 설정
|
# 메시지 및 국제화(i18n) 설정
|
||||||
# ==============================================
|
# ==============================================
|
||||||
spring:
|
spring:
|
||||||
messages:
|
# ==============================================
|
||||||
# 메시지 소스 캐시 지속 시간 (단위: 초)
|
# 데이터베이스 설정
|
||||||
# 개발 환경에서는 짧은 간격(10-60초), 운영 환경에서는 긴 간격(3600초 이상) 권장
|
# ==============================================
|
||||||
cache-duration: 5m
|
datasource:
|
||||||
|
kri:
|
||||||
|
driver-class-name: org.postgresql.Driver
|
||||||
|
jdbc-url: ENC(mF3Z0fgCagFruOk/F2Z2PYzXhwGedE1secfYDgci+ke9z8xFEZ/GWbgXA4XeSq5D+k9/oRLOxzwx/D24tswdoHdQugHmGb0UqrW4vGBa7YFJvcnWylOpd5ppUeEIUJGv)
|
||||||
|
username: ENC(cNXntROGOeM115QfLlVhhBz8+qY70eTWwmwLM+7AMslWmfWTq9ZPl4pVnDopJauM)
|
||||||
|
password: ENC(kUIzqWTu0+bqjYH4Jq9TFOOh3UwY+XVvA2OlT4VXJvxWCas66UNdGRmWDQKri5fI)
|
||||||
|
mms:
|
||||||
|
driver-class-name: org.postgresql.Driver
|
||||||
|
jdbc-url: ENC(TZ7H8DIFZDbsNp3PRWbz3bkJbjsx3580ljmELMJInASgpiEH66Lb8adpjt5WGXoIdZbHetlgtEFo8F+U8XUa9fjYWNOpiZ+D99XoXJUOP3s=)
|
||||||
|
username: ENC(cNXntROGOeM115QfLlVhhBz8+qY70eTWwmwLM+7AMslWmfWTq9ZPl4pVnDopJauM)
|
||||||
|
password: ENC(kUIzqWTu0+bqjYH4Jq9TFOOh3UwY+XVvA2OlT4VXJvxWCas66UNdGRmWDQKri5fI)
|
||||||
|
maximum-pool-size: 2
|
||||||
|
minimum-idle: 1
|
||||||
# ==============================================
|
# ==============================================
|
||||||
# 서버 압축 설정
|
# 서버 압축 설정
|
||||||
# ==============================================
|
# ==============================================
|
||||||
|
|||||||
@@ -10,6 +10,17 @@ spring:
|
|||||||
# 메시지 캐시 지속 시간(초)
|
# 메시지 캐시 지속 시간(초)
|
||||||
cache-duration: 4
|
cache-duration: 4
|
||||||
# ==============================================
|
# ==============================================
|
||||||
|
# 데이터베이스 설정
|
||||||
|
# ==============================================
|
||||||
|
datasource:
|
||||||
|
hikari:
|
||||||
|
maximum-pool-size: 10
|
||||||
|
minimum-idle: 5
|
||||||
|
idle-timeout: 120000
|
||||||
|
max-lifetime: 900000
|
||||||
|
connection-timeout: 5000
|
||||||
|
leak-detection-threshold: 30000
|
||||||
|
# ==============================================
|
||||||
# 정적 리소스 설정
|
# 정적 리소스 설정
|
||||||
# ==============================================
|
# ==============================================
|
||||||
web:
|
web:
|
||||||
@@ -101,6 +112,8 @@ logging:
|
|||||||
# MyBatis 설정
|
# MyBatis 설정
|
||||||
# ==============================================
|
# ==============================================
|
||||||
mybatis:
|
mybatis:
|
||||||
mapper-locations: classpath*:mappers/**/*Mapper.xml # 매퍼 파일 위치
|
mapper-locations:
|
||||||
|
kri: classpath*:mappers/**/*Mapper.xml # 매퍼 파일 위치
|
||||||
|
mms: classpath*:mappers/mms/*Mapper.xml # 매퍼 파일 위치
|
||||||
configuration:
|
configuration:
|
||||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # SQL 로깅 구현체
|
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # SQL 로깅 구현체
|
||||||
|
|||||||
32
admin/src/main/resources/mappers/mms/MMSMapper.xml
Normal file
32
admin/src/main/resources/mappers/mms/MMSMapper.xml
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
<?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="app.module.mms.adapters.persistence.MMSMapper">
|
||||||
|
|
||||||
|
<insert id="createSmsAutoSend">
|
||||||
|
/* createSmsAutoSend : 문자 발송 insert */
|
||||||
|
INSERT INTO biz_msg
|
||||||
|
(
|
||||||
|
MSG_TYPE,
|
||||||
|
CMID,
|
||||||
|
REQUEST_TIME,
|
||||||
|
SEND_TIME,
|
||||||
|
DEST_PHONE,
|
||||||
|
SEND_PHONE,
|
||||||
|
MSG_BODY
|
||||||
|
)
|
||||||
|
VALUES
|
||||||
|
<foreach collection="sendHouseholds" item="item" separator=",">
|
||||||
|
(
|
||||||
|
5,
|
||||||
|
TO_CHAR(NOW(), 'YYYYMMDDHH24MISS') || '_' || #{item.householdNum},
|
||||||
|
NOW(),
|
||||||
|
NOW(),
|
||||||
|
#{item.phone},
|
||||||
|
#{sendPhone},
|
||||||
|
#{message}
|
||||||
|
)
|
||||||
|
</foreach>
|
||||||
|
</insert>
|
||||||
|
|
||||||
|
</mapper>
|
||||||
116
admin/src/test/java/app/module/admin/TestJasyptConfig.java
Normal file
116
admin/src/test/java/app/module/admin/TestJasyptConfig.java
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
package app.module.admin;
|
||||||
|
|
||||||
|
import org.assertj.core.api.Assertions;
|
||||||
|
import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
|
||||||
|
import org.jasypt.iv.RandomIvGenerator;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
public class TestJasyptConfig {
|
||||||
|
// 운영 서버만 옵션 비꾸기
|
||||||
|
private String jasyptPassword = "etribe";
|
||||||
|
private String jasyptPasswordPrd = "ko-research";
|
||||||
|
|
||||||
|
//PBEWithMD5AndDES
|
||||||
|
//PBEWITHHMACSHA512ANDAES_256
|
||||||
|
private String jasyptAlgorithm = "PBEWITHHMACSHA512ANDAES_256";
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void jasypt(){
|
||||||
|
String url = "jdbc:postgresql://15.165.180.203:5432/korea_research";
|
||||||
|
String encryptUrl = jasyptEncrypt(url);
|
||||||
|
|
||||||
|
System.out.println("encryptUrl : " + encryptUrl);
|
||||||
|
Assertions.assertThat(url).isEqualTo(jasyptDecryt(encryptUrl));
|
||||||
|
|
||||||
|
|
||||||
|
String username = "ko_research";
|
||||||
|
String encryptUsername = jasyptEncrypt(username);
|
||||||
|
|
||||||
|
System.out.println("encryptUsername : " + encryptUsername);
|
||||||
|
Assertions.assertThat(username).isEqualTo(jasyptDecryt(encryptUsername));
|
||||||
|
|
||||||
|
|
||||||
|
String password = "koresearch1@#4";
|
||||||
|
String encryptPassword = jasyptEncrypt(password);
|
||||||
|
|
||||||
|
System.out.println("encryptPassword : " + encryptPassword);
|
||||||
|
Assertions.assertThat(password).isEqualTo(jasyptDecryt(encryptPassword));
|
||||||
|
|
||||||
|
|
||||||
|
System.out.println("--------------------------------" );
|
||||||
|
|
||||||
|
System.out.println("운영서버 정보 엔코딩" );
|
||||||
|
String url2 = "jdbc:postgresql://115.68.193.117:5432/korea_research";
|
||||||
|
String encryptUrl2 = jasyptEncryptPrd(url2);
|
||||||
|
|
||||||
|
System.out.println("encryptUrl2 : " + encryptUrl2);
|
||||||
|
Assertions.assertThat(url2).isEqualTo(jasyptDecrytPrd(encryptUrl2));
|
||||||
|
|
||||||
|
|
||||||
|
String username2 = "etribe";
|
||||||
|
String encryptUsername2 = jasyptEncryptPrd(username2);
|
||||||
|
|
||||||
|
System.out.println("encryptUsername2 : " + encryptUsername2);
|
||||||
|
Assertions.assertThat(username2).isEqualTo(jasyptDecrytPrd(encryptUsername2));
|
||||||
|
|
||||||
|
|
||||||
|
String password2 = "Etribe@3415";
|
||||||
|
String encryptPassword2 = jasyptEncryptPrd(password2);
|
||||||
|
System.out.println("encryptPassword2 : " + encryptPassword2);
|
||||||
|
|
||||||
|
System.out.println("--------------------------------" );
|
||||||
|
|
||||||
|
System.out.println("운영서버 정보 MMS 엔코딩" );
|
||||||
|
String url3 = "jdbc:postgresql://115.68.193.117:5432/ppurio";
|
||||||
|
String encryptUrl3 = jasyptEncryptPrd(url3);
|
||||||
|
|
||||||
|
System.out.println("encryptUrl3 : " + encryptUrl3);
|
||||||
|
Assertions.assertThat(url3).isEqualTo(jasyptDecrytPrd(encryptUrl3));
|
||||||
|
|
||||||
|
|
||||||
|
String username3 = "etribe";
|
||||||
|
String encryptUsername3 = jasyptEncryptPrd(username3);
|
||||||
|
|
||||||
|
System.out.println("encryptUsername3 : " + encryptUsername3);
|
||||||
|
Assertions.assertThat(username3).isEqualTo(jasyptDecrytPrd(encryptUsername3));
|
||||||
|
|
||||||
|
|
||||||
|
String password3 = "Etribe@3415";
|
||||||
|
String encryptPassword3 = jasyptEncryptPrd(password3);
|
||||||
|
System.out.println("encryptPassword3 : " + encryptPassword3);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private String jasyptEncrypt(String input) {
|
||||||
|
StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
|
||||||
|
encryptor.setAlgorithm(jasyptAlgorithm);
|
||||||
|
encryptor.setPassword(jasyptPassword);
|
||||||
|
encryptor.setIvGenerator(new RandomIvGenerator());
|
||||||
|
return encryptor.encrypt(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String jasyptDecryt(String input){
|
||||||
|
StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
|
||||||
|
encryptor.setAlgorithm(jasyptAlgorithm);
|
||||||
|
encryptor.setPassword(jasyptPassword);
|
||||||
|
encryptor.setIvGenerator(new RandomIvGenerator());
|
||||||
|
return encryptor.decrypt(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private String jasyptEncryptPrd(String input) {
|
||||||
|
StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
|
||||||
|
encryptor.setAlgorithm(jasyptAlgorithm);
|
||||||
|
encryptor.setPassword(jasyptPasswordPrd);
|
||||||
|
encryptor.setIvGenerator(new RandomIvGenerator());
|
||||||
|
return encryptor.encrypt(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String jasyptDecrytPrd(String input){
|
||||||
|
StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
|
||||||
|
encryptor.setAlgorithm(jasyptAlgorithm);
|
||||||
|
encryptor.setPassword(jasyptPasswordPrd);
|
||||||
|
encryptor.setIvGenerator(new RandomIvGenerator());
|
||||||
|
return encryptor.decrypt(input);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,9 +29,6 @@ public class SftpStorageFileUploadStrategy implements FileUploadStrategy {
|
|||||||
@Value("${path.upload.sftp.public}")
|
@Value("${path.upload.sftp.public}")
|
||||||
private String publicPath;
|
private String publicPath;
|
||||||
|
|
||||||
@Value("${path.upload.sftp.tmpdir}")
|
|
||||||
private String tmpPath;
|
|
||||||
|
|
||||||
private final SftpConnector sftpConnector;
|
private final SftpConnector sftpConnector;
|
||||||
private final AESEncryptUtil aesEncryptUtil;
|
private final AESEncryptUtil aesEncryptUtil;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package app.module.front.config.application.bean;
|
||||||
|
|
||||||
|
import org.jasypt.encryption.StringEncryptor;
|
||||||
|
import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
|
||||||
|
import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class JasyptConfig {
|
||||||
|
@Value("${jasypt.encryptor.password}")
|
||||||
|
private String jasyptPassword;
|
||||||
|
|
||||||
|
@Value("${jasypt.encryptor.algorithm}")
|
||||||
|
private String jasyptAlgorithm;
|
||||||
|
|
||||||
|
@Bean("jasyptStringEncryptor")
|
||||||
|
public StringEncryptor stringEncryptor() {
|
||||||
|
SimpleStringPBEConfig config = new SimpleStringPBEConfig();
|
||||||
|
config.setPassword(jasyptPassword); // 암호화할 때 사용하는 키
|
||||||
|
config.setPoolSize("1"); // 인스턴스 pool
|
||||||
|
config.setAlgorithm(jasyptAlgorithm); // 암호화 알고리즘
|
||||||
|
config.setStringOutputType("base64"); // 인코딩 방식
|
||||||
|
config.setKeyObtentionIterations("1000"); // 반복할 해싱 회수
|
||||||
|
config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); // salt 생성 클래스
|
||||||
|
config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator");
|
||||||
|
|
||||||
|
PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
|
||||||
|
encryptor.setConfig(config);
|
||||||
|
return encryptor;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package app.module.front.config.application.bean;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.ibatis.session.SqlSessionFactory;
|
||||||
|
import org.mybatis.spring.SqlSessionFactoryBean;
|
||||||
|
import org.mybatis.spring.SqlSessionTemplate;
|
||||||
|
import org.mybatis.spring.annotation.MapperScan;
|
||||||
|
import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
|
||||||
|
import org.springframework.beans.factory.annotation.Qualifier;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
import org.springframework.boot.jdbc.DataSourceBuilder;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.context.annotation.Primary;
|
||||||
|
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
|
||||||
|
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||||
|
|
||||||
|
import javax.sql.DataSource;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Configuration
|
||||||
|
@MapperScan(
|
||||||
|
basePackages = { "app.module.front", "app.module.core" },
|
||||||
|
annotationClass = org.apache.ibatis.annotations.Mapper.class,
|
||||||
|
sqlSessionFactoryRef = "kriSqlSessionFactory")
|
||||||
|
@EnableTransactionManagement
|
||||||
|
public class KRIConfig {
|
||||||
|
|
||||||
|
@Value("${mybatis.mapper-locations.kri}")
|
||||||
|
private String mybatisMapper;
|
||||||
|
|
||||||
|
@Primary
|
||||||
|
@Bean(name = "kriDataSource")
|
||||||
|
@ConfigurationProperties(prefix = "spring.datasource.kri")
|
||||||
|
public DataSource kriDataSource() {
|
||||||
|
return DataSourceBuilder.create().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Primary
|
||||||
|
@Bean(name = "kriSqlSessionFactory")
|
||||||
|
public SqlSessionFactory kriSqlSessionFactory(@Qualifier("kriDataSource") DataSource dataSource) throws Exception {
|
||||||
|
SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean();
|
||||||
|
sessionFactoryBean.setVfs(SpringBootVFS.class);
|
||||||
|
configureSqlSessionFactory(sessionFactoryBean, dataSource);
|
||||||
|
return sessionFactoryBean.getObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void configureSqlSessionFactory(SqlSessionFactoryBean sessionFactoryBean, DataSource dataSource) throws IOException {
|
||||||
|
sessionFactoryBean.setDataSource(dataSource);
|
||||||
|
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
|
||||||
|
sessionFactoryBean.setMapperLocations(resolver.getResources(mybatisMapper));
|
||||||
|
|
||||||
|
org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration();
|
||||||
|
configuration.setMapUnderscoreToCamelCase(true);
|
||||||
|
sessionFactoryBean.setConfiguration(configuration);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Primary
|
||||||
|
@Bean(name = "kriSqlSessionTemplate")
|
||||||
|
public SqlSessionTemplate kriSqlSessionTemplate(@Qualifier("kriSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
|
||||||
|
SqlSessionTemplate sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory);
|
||||||
|
return sqlSessionTemplate;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,3 +7,33 @@ logging:
|
|||||||
level:
|
level:
|
||||||
app:
|
app:
|
||||||
module: DEBUG # 애플리케이션 기본 패키지 로깅 레벨 (패키지 경로 변경 필요시 수정)
|
module: DEBUG # 애플리케이션 기본 패키지 로깅 레벨 (패키지 경로 변경 필요시 수정)
|
||||||
|
|
||||||
|
# ==============================================
|
||||||
|
# 메시지 및 국제화(i18n) 설정
|
||||||
|
# ==============================================
|
||||||
|
spring:
|
||||||
|
messages:
|
||||||
|
# 메시지 소스 캐시 지속 시간(초)
|
||||||
|
# 4초마다 메시지 파일을 다시 읽어옵니다
|
||||||
|
# 개발 시에는 짧은 간격으로, 운영 시에는 길게 설정하는 것이 일반적
|
||||||
|
cache-duration: 10s
|
||||||
|
thymeleaf:
|
||||||
|
# 타임리프 템플릿 캐시 비활성화 (개발 환경에서는 false 로 설정 권장)
|
||||||
|
cache: false
|
||||||
|
# ==============================================
|
||||||
|
# 데이터베이스 설정
|
||||||
|
# ==============================================
|
||||||
|
datasource:
|
||||||
|
kri:
|
||||||
|
driver-class-name: org.postgresql.Driver
|
||||||
|
jdbc-url: ENC(SH5G+4mdOrW3PpVEmVyNXIFyV7eFC6uLTa0e18qa+7ueQeWrduIeGVJLrQP3mUw86dzqLK7AUHjTRuex4ud+rTt026L7csDLFYzLWGkGCTEqfFBOwHng3uQ7n+qmkKiW)
|
||||||
|
username: ENC(37ccHxlpbsEz8vVcZUZA/j6azKYhP3eHwhOYVjYGf+zKC3u/qc+khKcKuBuE8+Ck)
|
||||||
|
password: ENC(uBHyXdI39UzPNvYNHDGfjmMMuhN83xoP8F3wDq/S9DxizhFwbMeEqa36oZ205CBg)
|
||||||
|
|
||||||
|
# ==============================================
|
||||||
|
# 암호화 설정
|
||||||
|
# ==============================================
|
||||||
|
jasypt:
|
||||||
|
encryptor:
|
||||||
|
password: etribe
|
||||||
|
algorithm: PBEWITHHMACSHA512ANDAES_256
|
||||||
@@ -7,3 +7,20 @@ logging:
|
|||||||
level:
|
level:
|
||||||
app:
|
app:
|
||||||
module: DEBUG # 애플리케이션 기본 패키지 로깅 레벨 (패키지 경로 변경 필요시 수정)
|
module: DEBUG # 애플리케이션 기본 패키지 로깅 레벨 (패키지 경로 변경 필요시 수정)
|
||||||
|
# ==============================================
|
||||||
|
# 메시지 및 다국어 처리 설정
|
||||||
|
# ==============================================
|
||||||
|
spring:
|
||||||
|
datasource:
|
||||||
|
kri:
|
||||||
|
driver-class-name: org.postgresql.Driver
|
||||||
|
jdbc-url: ENC(SH5G+4mdOrW3PpVEmVyNXIFyV7eFC6uLTa0e18qa+7ueQeWrduIeGVJLrQP3mUw86dzqLK7AUHjTRuex4ud+rTt026L7csDLFYzLWGkGCTEqfFBOwHng3uQ7n+qmkKiW)
|
||||||
|
username: ENC(37ccHxlpbsEz8vVcZUZA/j6azKYhP3eHwhOYVjYGf+zKC3u/qc+khKcKuBuE8+Ck)
|
||||||
|
password: ENC(uBHyXdI39UzPNvYNHDGfjmMMuhN83xoP8F3wDq/S9DxizhFwbMeEqa36oZ205CBg)
|
||||||
|
# ==============================================
|
||||||
|
# 암호화 설정
|
||||||
|
# ==============================================
|
||||||
|
jasypt:
|
||||||
|
encryptor:
|
||||||
|
password: etribe
|
||||||
|
algorithm: PBEWITHHMACSHA512ANDAES_256
|
||||||
@@ -8,7 +8,26 @@ logging:
|
|||||||
app:
|
app:
|
||||||
module: INFO # 애플리케이션 기본 패키지 로깅 레벨 (패키지 경로 변경 필요시 수정)
|
module: INFO # 애플리케이션 기본 패키지 로깅 레벨 (패키지 경로 변경 필요시 수정)
|
||||||
|
|
||||||
|
# ==============================================
|
||||||
|
# 메시지 및 국제화(i18n) 설정
|
||||||
|
# ==============================================
|
||||||
|
spring:
|
||||||
|
messages:
|
||||||
|
# 메시지 소스 캐시 지속 시간 (단위: 초)
|
||||||
|
# 개발 환경에서는 짧은 간격(10-60초), 운영 환경에서는 긴 간격(3600초 이상) 권장
|
||||||
|
cache-duration: 5m
|
||||||
|
thymeleaf:
|
||||||
|
# 타임리프 템플릿 캐시 비활성화 (개발 환경에서는 false 로 설정 권장)
|
||||||
|
cache: false
|
||||||
|
# ==============================================
|
||||||
|
# 데이터베이스 설정
|
||||||
|
# ==============================================
|
||||||
|
datasource:
|
||||||
|
kri:
|
||||||
|
driver-class-name: org.postgresql.Driver
|
||||||
|
jdbc-url: ENC(mF3Z0fgCagFruOk/F2Z2PYzXhwGedE1secfYDgci+ke9z8xFEZ/GWbgXA4XeSq5D+k9/oRLOxzwx/D24tswdoHdQugHmGb0UqrW4vGBa7YFJvcnWylOpd5ppUeEIUJGv)
|
||||||
|
username: ENC(cNXntROGOeM115QfLlVhhBz8+qY70eTWwmwLM+7AMslWmfWTq9ZPl4pVnDopJauM)
|
||||||
|
password: ENC(kUIzqWTu0+bqjYH4Jq9TFOOh3UwY+XVvA2OlT4VXJvxWCas66UNdGRmWDQKri5fI)
|
||||||
|
|
||||||
# ==============================================
|
# ==============================================
|
||||||
# 서버 압축 설정
|
# 서버 압축 설정
|
||||||
|
|||||||
@@ -10,6 +10,17 @@ spring:
|
|||||||
enabled: true
|
enabled: true
|
||||||
mime-types: text/html,text/xml,text/plain,text/css,text/javascript,application/javascript
|
mime-types: text/html,text/xml,text/plain,text/css,text/javascript,application/javascript
|
||||||
min-response-size: 2048
|
min-response-size: 2048
|
||||||
|
# ==============================================
|
||||||
|
# 데이터베이스 설정
|
||||||
|
# ==============================================
|
||||||
|
datasource:
|
||||||
|
hikari:
|
||||||
|
maximum-pool-size: 10
|
||||||
|
minimum-idle: 5
|
||||||
|
idle-timeout: 120000
|
||||||
|
max-lifetime: 900000
|
||||||
|
connection-timeout: 5000
|
||||||
|
leak-detection-threshold: 30000
|
||||||
|
|
||||||
# 정적 자원 캐싱 설정
|
# 정적 자원 캐싱 설정
|
||||||
web:
|
web:
|
||||||
@@ -92,6 +103,14 @@ logging:
|
|||||||
jdbc:
|
jdbc:
|
||||||
bind: trace # Hibernate SQL 파라미터 바인딩 로깅
|
bind: trace # Hibernate SQL 파라미터 바인딩 로깅
|
||||||
# ==============================================
|
# ==============================================
|
||||||
|
# MyBatis 설정
|
||||||
|
# ==============================================
|
||||||
|
mybatis:
|
||||||
|
mapper-locations:
|
||||||
|
kri: classpath*:mappers/**/*Mapper.xml # 매퍼 파일 위치
|
||||||
|
configuration:
|
||||||
|
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # SQL 로깅 구현체
|
||||||
|
# ==============================================
|
||||||
# 서버 압축 설정
|
# 서버 압축 설정
|
||||||
# ==============================================
|
# ==============================================
|
||||||
server:
|
server:
|
||||||
|
|||||||
6
pom.xml
6
pom.xml
@@ -180,6 +180,12 @@
|
|||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.ulisesbocchio</groupId>
|
||||||
|
<artifactId>jasypt-spring-boot-starter</artifactId>
|
||||||
|
<version>3.0.5</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
|||||||
Reference in New Issue
Block a user