diff --git a/README.md b/README.md index 23a754cf..8552712a 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요. ### VM Options 예시 -#### `admin`, `front`, `api` 모두 사용가능합니다. +#### `admin`, `front` 모두 사용가능합니다. ``` -Dspring.profiles.active=local -Dapp.initData.core=false @@ -108,27 +108,19 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요. -Dserver.port=8080 -Dserver.forward-headers-strategy=native -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 -Dpath.upload.storage=LOCAL -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.id=etribe -Dfile.upload.sftp.password=Etribe@3415 -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 및 데이터 핸들링 구성 옵션 diff --git a/admin/src/main/java/app/module/admin/config/application/bean/JasyptConfig.java b/admin/src/main/java/app/module/admin/config/application/bean/JasyptConfig.java new file mode 100644 index 00000000..1306908b --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/bean/JasyptConfig.java @@ -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; + } +} diff --git a/admin/src/main/java/app/module/admin/config/application/bean/KRIConfig.java b/admin/src/main/java/app/module/admin/config/application/bean/KRIConfig.java new file mode 100644 index 00000000..f50a410c --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/bean/KRIConfig.java @@ -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; + } +} diff --git a/admin/src/main/java/app/module/admin/config/application/bean/MMSDBConfig.java b/admin/src/main/java/app/module/admin/config/application/bean/MMSDBConfig.java new file mode 100644 index 00000000..01477dd1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/bean/MMSDBConfig.java @@ -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; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java index 98b34dfc..5ee03e7a 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java @@ -1,6 +1,9 @@ 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 java.time.LocalDate; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -34,8 +37,14 @@ public class AutoSchedulesController { public void fetchMonthlyCarryOver() { portIn.monthlyCarryOver(); } - + /** * TODO 스케쥴 있다면.. 추가. */ + + // 매일 오후 5시 마다 실행되는 스케줄러 + @Scheduled(cron = "0 1 * * * ?") + public void fetchSmsAutoSenTest() { + portIn.sendAutoSmsTest(); + } } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java index 7720745e..4317bf4b 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java @@ -7,4 +7,5 @@ public interface AutoSchedulesPortIn { Optional operate(); Optional sendAutoSms(); Optional monthlyCarryOver(); + Optional sendAutoSmsTest(); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java index e83cad8c..e5626845 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java @@ -13,6 +13,7 @@ import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.applicati import java.time.LocalDate; import java.util.List; +import app.module.mms.ports.MMSPortIn; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -25,6 +26,7 @@ import org.springframework.util.CollectionUtils; class AutoSchedulesService implements AutoSchedulesPortIn { private final AutoSchedulesPortOut portOut; + private final MMSPortIn mmsPortIn; private final GetSmsAutoStatusPortIn getSmsAutoStatusPortIn; private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn; @@ -75,6 +77,31 @@ class AutoSchedulesService implements AutoSchedulesPortIn { return Optional.of(true); } + @Override + public Optional sendAutoSmsTest() { + String targetMonth = "202507"; + DayRange dayRange = new DayRange(1, 7); + GetSmsAutoStatus getSmsAutoStatus = new GetSmsAutoStatus(true, "테스트", "01012345678", null, null); + + // dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회 + List 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 public Optional monthlyCarryOver() { return portOut.monthlyCarryOver(); diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java index d4b6a02f..7b9c3797 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java @@ -1,14 +1,12 @@ package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import lombok.*; @Getter @Setter @AllArgsConstructor @EqualsAndHashCode +@ToString public class GetIncompleteHouseholds { private Long seq; private String householdNum; diff --git a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java new file mode 100644 index 00000000..7dbc2379 --- /dev/null +++ b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java @@ -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 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); + } + } +} diff --git a/admin/src/main/java/app/module/mms/adapters/persistence/MMSMapper.java b/admin/src/main/java/app/module/mms/adapters/persistence/MMSMapper.java new file mode 100644 index 00000000..fa7ca337 --- /dev/null +++ b/admin/src/main/java/app/module/mms/adapters/persistence/MMSMapper.java @@ -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); +} diff --git a/admin/src/main/java/app/module/mms/ports/MMSPortIn.java b/admin/src/main/java/app/module/mms/ports/MMSPortIn.java new file mode 100644 index 00000000..6fbd5549 --- /dev/null +++ b/admin/src/main/java/app/module/mms/ports/MMSPortIn.java @@ -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 sendAutoSms(CreateSmsAutoSendCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/mms/ports/MMSPortOut.java b/admin/src/main/java/app/module/mms/ports/MMSPortOut.java new file mode 100644 index 00000000..d01fc3ff --- /dev/null +++ b/admin/src/main/java/app/module/mms/ports/MMSPortOut.java @@ -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 sendAutoSms(CreateSmsAutoSendCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/mms/ports/application/MMSService.java b/admin/src/main/java/app/module/mms/ports/application/MMSService.java new file mode 100644 index 00000000..170b03b1 --- /dev/null +++ b/admin/src/main/java/app/module/mms/ports/application/MMSService.java @@ -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 sendAutoSms(CreateSmsAutoSendCmd command) { + portOut.sendAutoSms(command); + + return Optional.of(true); + } + +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/mms/ports/application/domain/CreateSmsAutoSendCmd.java b/admin/src/main/java/app/module/mms/ports/application/domain/CreateSmsAutoSendCmd.java new file mode 100644 index 00000000..f130db9b --- /dev/null +++ b/admin/src/main/java/app/module/mms/ports/application/domain/CreateSmsAutoSendCmd.java @@ -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 sendHouseholds; + private String sendPhone; + private String message; +} diff --git a/admin/src/main/resources/application-dev.yml b/admin/src/main/resources/application-dev.yml index 4226cc80..bd584fd4 100644 --- a/admin/src/main/resources/application-dev.yml +++ b/admin/src/main/resources/application-dev.yml @@ -23,4 +23,31 @@ spring: # 메시지 소스 캐시 지속 시간(초) # 4초마다 메시지 파일을 다시 읽어옵니다 # 개발 시에는 짧은 간격으로, 운영 시에는 길게 설정하는 것이 일반적 - cache-duration: 10s \ No newline at end of file + 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 \ No newline at end of file diff --git a/admin/src/main/resources/application-local.yml b/admin/src/main/resources/application-local.yml index 567af0ca..61912755 100644 --- a/admin/src/main/resources/application-local.yml +++ b/admin/src/main/resources/application-local.yml @@ -8,7 +8,7 @@ logging: level: # 애플리케이션 기본 패키지 로깅 레벨 (INFO 로 설정) # 주의: 기본 패키지 변경 시 app.module 부분을 반드시 수정해야 애플리케이션 로그가 출력됨 - app.module: INFO + app.module: DEBUG # Spring 프레임워크 로깅 레벨 org.springframework: INFO # Spring Security 로깅 레벨 @@ -23,4 +23,35 @@ spring: cache-duration: 10s thymeleaf: # 타임리프 템플릿 캐시 비활성화 (개발 환경에서는 false 로 설정 권장) - cache: false \ No newline at end of file + 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 diff --git a/admin/src/main/resources/application-prod.yml b/admin/src/main/resources/application-prod.yml index e7b29ec4..368452f4 100644 --- a/admin/src/main/resources/application-prod.yml +++ b/admin/src/main/resources/application-prod.yml @@ -19,11 +19,22 @@ logging: # 메시지 및 국제화(i18n) 설정 # ============================================== 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 # ============================================== # 서버 압축 설정 # ============================================== diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml index 20e1af8a..d24df858 100644 --- a/admin/src/main/resources/application.yml +++ b/admin/src/main/resources/application.yml @@ -10,6 +10,17 @@ spring: # 메시지 캐시 지속 시간(초) 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: @@ -101,6 +112,8 @@ logging: # MyBatis 설정 # ============================================== mybatis: - mapper-locations: classpath*:mappers/**/*Mapper.xml # 매퍼 파일 위치 + mapper-locations: + kri: classpath*:mappers/**/*Mapper.xml # 매퍼 파일 위치 + mms: classpath*:mappers/mms/*Mapper.xml # 매퍼 파일 위치 configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # SQL 로깅 구현체 diff --git a/admin/src/main/resources/mappers/mms/MMSMapper.xml b/admin/src/main/resources/mappers/mms/MMSMapper.xml new file mode 100644 index 00000000..a506a06f --- /dev/null +++ b/admin/src/main/resources/mappers/mms/MMSMapper.xml @@ -0,0 +1,32 @@ + + + + + + /* createSmsAutoSend : 문자 발송 insert */ + INSERT INTO biz_msg + ( + MSG_TYPE, + CMID, + REQUEST_TIME, + SEND_TIME, + DEST_PHONE, + SEND_PHONE, + MSG_BODY + ) + VALUES + + ( + 5, + TO_CHAR(NOW(), 'YYYYMMDDHH24MISS') || '_' || #{item.householdNum}, + NOW(), + NOW(), + #{item.phone}, + #{sendPhone}, + #{message} + ) + + + + \ No newline at end of file diff --git a/admin/src/test/java/app/module/admin/TestJasyptConfig.java b/admin/src/test/java/app/module/admin/TestJasyptConfig.java new file mode 100644 index 00000000..b14cb316 --- /dev/null +++ b/admin/src/test/java/app/module/admin/TestJasyptConfig.java @@ -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); + } +} diff --git a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpStorageFileUploadStrategy.java b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpStorageFileUploadStrategy.java index 9b3d8539..c468d3f0 100644 --- a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpStorageFileUploadStrategy.java +++ b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpStorageFileUploadStrategy.java @@ -29,9 +29,6 @@ public class SftpStorageFileUploadStrategy implements FileUploadStrategy { @Value("${path.upload.sftp.public}") private String publicPath; - @Value("${path.upload.sftp.tmpdir}") - private String tmpPath; - private final SftpConnector sftpConnector; private final AESEncryptUtil aesEncryptUtil; diff --git a/front/src/main/java/app/module/front/config/application/bean/JasyptConfig.java b/front/src/main/java/app/module/front/config/application/bean/JasyptConfig.java new file mode 100644 index 00000000..94760216 --- /dev/null +++ b/front/src/main/java/app/module/front/config/application/bean/JasyptConfig.java @@ -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; + } +} diff --git a/front/src/main/java/app/module/front/config/application/bean/KRIConfig.java b/front/src/main/java/app/module/front/config/application/bean/KRIConfig.java new file mode 100644 index 00000000..e46a2828 --- /dev/null +++ b/front/src/main/java/app/module/front/config/application/bean/KRIConfig.java @@ -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; + } +} diff --git a/front/src/main/resources/application-dev.yml b/front/src/main/resources/application-dev.yml index 3618e923..d985f574 100644 --- a/front/src/main/resources/application-dev.yml +++ b/front/src/main/resources/application-dev.yml @@ -6,4 +6,34 @@ logging: path: ${user.home}/logs # 로그 파일 저장 경로 (사용자 홈 디렉토리 하위 logs 폴더) level: app: - module: DEBUG # 애플리케이션 기본 패키지 로깅 레벨 (패키지 경로 변경 필요시 수정) \ No newline at end of file + 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 \ No newline at end of file diff --git a/front/src/main/resources/application-local.yml b/front/src/main/resources/application-local.yml index 3618e923..11a10ad4 100644 --- a/front/src/main/resources/application-local.yml +++ b/front/src/main/resources/application-local.yml @@ -6,4 +6,21 @@ logging: path: ${user.home}/logs # 로그 파일 저장 경로 (사용자 홈 디렉토리 하위 logs 폴더) level: app: - module: DEBUG # 애플리케이션 기본 패키지 로깅 레벨 (패키지 경로 변경 필요시 수정) \ No newline at end of file + 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 \ No newline at end of file diff --git a/front/src/main/resources/application-prod.yml b/front/src/main/resources/application-prod.yml index 470b6343..6fe93171 100644 --- a/front/src/main/resources/application-prod.yml +++ b/front/src/main/resources/application-prod.yml @@ -8,7 +8,26 @@ logging: app: 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) # ============================================== # 서버 압축 설정 diff --git a/front/src/main/resources/application.yml b/front/src/main/resources/application.yml index e020e3c5..e7fd4c38 100644 --- a/front/src/main/resources/application.yml +++ b/front/src/main/resources/application.yml @@ -10,6 +10,17 @@ spring: enabled: true mime-types: text/html,text/xml,text/plain,text/css,text/javascript,application/javascript 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: @@ -92,6 +103,14 @@ logging: jdbc: bind: trace # Hibernate SQL 파라미터 바인딩 로깅 # ============================================== +# MyBatis 설정 +# ============================================== +mybatis: + mapper-locations: + kri: classpath*:mappers/**/*Mapper.xml # 매퍼 파일 위치 + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # SQL 로깅 구현체 +# ============================================== # 서버 압축 설정 # ============================================== server: diff --git a/pom.xml b/pom.xml index 00f47f8f..df75f610 100644 --- a/pom.xml +++ b/pom.xml @@ -180,6 +180,12 @@ 3.1.0 test + + + com.github.ulisesbocchio + jasypt-spring-boot-starter + 3.0.5 +