diff --git a/.claude/.gitignore b/.claude/.gitignore index 53ced0f0..6dfd1063 100644 --- a/.claude/.gitignore +++ b/.claude/.gitignore @@ -1 +1,2 @@ /settings.local.json +/mcp_settings.json diff --git a/pom.xml b/pom.xml index c7ddbe01..0f11dcba 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ mysql mysql-connector-java - 5.1.31 + 5.1.49 diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 338e88a2..c240387d 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -28,8 +28,10 @@ Globals.Env = local # mysql Globals.DriverClassName=com.mysql.jdbc.Driver -Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc -#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon +#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc +#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?characterEncoding=UTF-8&useUnicode=true&serverTimezone=Asia/Seoul +Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul + Globals.UserName= mjonUr Globals.Password= mjon!@#$ #Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon diff --git a/src/main/resources/egovframework/egovProps/globals_prod.properties b/src/main/resources/egovframework/egovProps/globals_prod.properties index 68ca97df..518daf29 100644 --- a/src/main/resources/egovframework/egovProps/globals_prod.properties +++ b/src/main/resources/egovframework/egovProps/globals_prod.properties @@ -27,7 +27,7 @@ Globals.Env = prod # mysql Globals.DriverClassName=com.mysql.jdbc.Driver -Globals.Url=jdbc:mysql://10.12.107.14:3306/mjon_advc +Globals.Url=jdbc:mysql://10.12.107.14:3306/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul Globals.UserName= mjonUr Globals.Password= mjon!@#$ diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp index 075dabd1..79307ad3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp @@ -536,9 +536,9 @@ function addTemplate(){ } - if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){ + /* if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){ return false; - } + } */ var data = new FormData(bizForm);