Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
김현주
2025-07-21 15:52:22 +09:00
4 changed files with 18 additions and 28 deletions

View File

@@ -30,6 +30,7 @@ public class MMSDBConfig {
@Value("${mybatis.mapper-locations.mms}") @Value("${mybatis.mapper-locations.mms}")
private String mybatisMapper; private String mybatisMapper;
@Bean @Bean
@ConfigurationProperties(prefix = "spring.datasource.mms") @ConfigurationProperties(prefix = "spring.datasource.mms")
public DataSource mmsDataSource() { public DataSource mmsDataSource() {

View File

@@ -23,9 +23,9 @@ spring:
password: ENC(uBHyXdI39UzPNvYNHDGfjmMMuhN83xoP8F3wDq/S9DxizhFwbMeEqa36oZ205CBg) password: ENC(uBHyXdI39UzPNvYNHDGfjmMMuhN83xoP8F3wDq/S9DxizhFwbMeEqa36oZ205CBg)
mms: mms:
driver-class-name: org.postgresql.Driver driver-class-name: org.postgresql.Driver
jdbc-url: ENC(TZ7H8DIFZDbsNp3PRWbz3bkJbjsx3580ljmELMJInASgpiEH66Lb8adpjt5WGXoIdZbHetlgtEFo8F+U8XUa9fjYWNOpiZ+D99XoXJUOP3s=) jdbc-url: ENC(nIbEeTRz/Vrv1pjLblFtN6HI054zN7YIVKVD4JYYMN+ZeIQqZLniPZ6otat2aIf2zmj6LXYQXbEDPTneWwWZ04MolFpAQqjTchCR6G/aqeE=)
username: ENC(cNXntROGOeM115QfLlVhhBz8+qY70eTWwmwLM+7AMslWmfWTq9ZPl4pVnDopJauM) username: ENC(CfM5GxJyKpB+khFBcaEOnKzrKdN8GbYAUTLd/BUzsOZ0EJWe8rLW36xQUYdXyDB+)
password: ENC(kUIzqWTu0+bqjYH4Jq9TFOOh3UwY+XVvA2OlT4VXJvxWCas66UNdGRmWDQKri5fI) password: ENC(bccatoZiPRex7f1n/leaSrx3xxy8zwd0+steZJxzamFgrzwOscLpXyzHI/t8cQSm)
maximum-pool-size: 2 maximum-pool-size: 2
minimum-idle: 1 minimum-idle: 1
@@ -37,6 +37,7 @@ logging:
app: app:
module: DEBUG # 애플리케이션 기본 패키지 로깅 레벨 (패키지 경로 변경 필요시 수정) module: DEBUG # 애플리케이션 기본 패키지 로깅 레벨 (패키지 경로 변경 필요시 수정)
# ============================================== # ==============================================
# 암호화 설정 # 암호화 설정
# ============================================== # ==============================================

View File

@@ -62,21 +62,21 @@ public class TestJasyptConfig {
System.out.println("운영서버 정보 MMS 엔코딩" ); System.out.println("운영서버 정보 MMS 엔코딩" );
String url3 = "jdbc:postgresql://115.68.193.117:5432/ppurio"; String url3 = "jdbc:postgresql://115.68.193.117:5432/ppurio";
String encryptUrl3 = jasyptEncryptPrd(url3); String encryptUrl3 = jasyptEncrypt(url3);
System.out.println("encryptUrl3 : " + encryptUrl3); System.out.println("encryptUrl3 : " + encryptUrl3);
Assertions.assertThat(url3).isEqualTo(jasyptDecrytPrd(encryptUrl3)); /* Assertions.assertThat(url3).isEqualTo(jasyptEncrypt(encryptUrl3));*/
String username3 = "etribe"; String username3 = "etribe";
String encryptUsername3 = jasyptEncryptPrd(username3); String encryptUsername3 = jasyptEncrypt(username3);
System.out.println("encryptUsername3 : " + encryptUsername3); System.out.println("encryptUsername3 : " + encryptUsername3);
Assertions.assertThat(username3).isEqualTo(jasyptDecrytPrd(encryptUsername3)); /* Assertions.assertThat(username3).isEqualTo(jasyptEncrypt(encryptUsername3));*/
String password3 = "Etribe@3415"; String password3 = "Etribe@3415";
String encryptPassword3 = jasyptEncryptPrd(password3); String encryptPassword3 = jasyptEncrypt(password3);
System.out.println("encryptPassword3 : " + encryptPassword3); System.out.println("encryptPassword3 : " + encryptPassword3);
} }

View File

@@ -819,15 +819,16 @@
// 오늘 날짜가 해당 달의 마지막 날인지 확인 // 오늘 날짜가 해당 달의 마지막 날인지 확인
const today = new Date(); const today = new Date();
const lastDayOfMonth = new Date(viewDate.getFullYear(), viewDate.getMonth() + 1, 0); // 해당 달의 마지막 날 //const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0); // 해당 달의 마지막 날
// 쿠키에서 마지막 alert 날짜 확인 const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 21); // TODO 삭제 테스트를 위해 22일로 수정
const lastAlertDate = getCookie('lastAlertDate'); // 마지막 alert 날짜 확인
const todayDateString = today.toISOString().split('T')[0]; const lastAlertDate = sessionStorage.getItem('lastAlertDate');
const todayDateString = today.toDateString();
if (lastAlertDate !== todayDateString && if (lastAlertDate !== todayDateString &&
today.getFullYear() === lastDayOfMonth.getFullYear() && today.getFullYear() === lastDayOfMonth.getFullYear() &&
today.getMonth() === lastDayOfMonth.getMonth() && today.getMonth() === lastDayOfMonth.getMonth() &&
today.getDate() === lastDayOfMonth.getDate()) { today.getDate() === lastDayOfMonth.getDate()) {
ajaxUtil._ajaxSyncMethod( ajaxUtil._ajaxSyncMethod(
ENV.httpUrl.alert.replace('{searchMonth}', searchMonth.replace('-', '')), ENV.httpUrl.alert.replace('{searchMonth}', searchMonth.replace('-', '')),
{}, {},
@@ -862,6 +863,7 @@
message: msgTxt, message: msgTxt,
type:'alert', type:'alert',
callback: function () { callback: function () {
sessionStorage.setItem('lastAlertDate',lastDayOfMonth.toDateString());
}, },
}); });
} }
@@ -879,20 +881,6 @@
}, },
}; };
// 쿠키 설정 함수
function setCookie(name, value, days) {
const expires = new Date();
expires.setTime(expires.getTime() + days * 24 * 60 * 60 * 1000);
document.cookie = `${name}=${value};expires=${expires.toUTCString()};path=/`;
}
// 쿠키 가져오기 함수
function getCookie(name) {
const value = `; ${document.cookie}`;
const parts = value.split(`; ${name}=`);
if (parts.length === 2) return parts.pop().split(';').shift();
return null;
}
</script> </script>
<script id="dailyNoneTmpl" type="text/x-jsrender"> <script id="dailyNoneTmpl" type="text/x-jsrender">
{{include tmpl="#titleTmpl" /}} {{include tmpl="#titleTmpl" /}}