tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'at_emoji'

Browse Source
This commit is contained in:
hehihoho3@gmail.com 2025-10-29 14:06:34 +09:00
commit f1f610d0e8
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -146,7 +146,7 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.31</version> <version>5.1.49</version>
</dependency> </dependency>
<!-- oracle 10g driver --> <!-- oracle 10g driver -->

2
src/main/resources/egovframework/egovProps/globals_dev.properties
View File

@ -28,7 +28,7 @@ Globals.Env = dev
# mysql # mysql
Globals.DriverClassName=com.mysql.jdbc.Driver 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_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul
#Globals.Url=jdbc:mysql://139.150.73.12:3306/mjon #Globals.Url=jdbc:mysql://139.150.73.12:3306/mjon
Globals.UserName= mjonUr Globals.UserName= mjonUr
Globals.Password= mjon!@#$ Globals.Password= mjon!@#$

6
src/main/resources/egovframework/egovProps/globals_local.properties
View File

@ -28,8 +28,10 @@ Globals.Env = local
# mysql # mysql
Globals.DriverClassName=com.mysql.jdbc.Driver 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_advc
#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon #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.UserName= mjonUr
Globals.Password= mjon!@#$ Globals.Password= mjon!@#$
#Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon #Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon

2
src/main/resources/egovframework/egovProps/globals_prod.properties
View File

@ -27,7 +27,7 @@ Globals.Env = prod
# mysql # mysql
Globals.DriverClassName=com.mysql.jdbc.Driver 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.UserName= mjonUr
Globals.Password= mjon!@#$ Globals.Password= mjon!@#$

4
src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp
View File

@ -536,9 +536,9 @@ function addTemplate(){
} }
if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){ /* if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){
return false; return false;
} } */
var data = new FormData(bizForm); var data = new FormData(bizForm);