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

Merge branch 'master' into 5102_친구톡_발송속도_개선

Browse Source
This commit is contained in:
hehihoho3@gmail.com 2025-06-12 14:56:13 +09:00
commit 6da46e1c0e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ Globals.Env = local
# mysql # mysql
Globals.DriverClassName=com.mysql.jdbc.Driver Globals.DriverClassName=com.mysql.jdbc.Driver
Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon
#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon #Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon
Globals.UserName= mjonUr Globals.UserName= mjonUr
Globals.Password= mjon!@#$ Globals.Password= mjon!@#$

2
src/main/webapp/publish/js/content.js
View File

@ -1452,7 +1452,7 @@ function sendPhoneFixed() {
}); });
} else if (t > ofsT) { } else if (t > ofsT) {
$('.send_top .send_right .phone').css({ $('.send_top .send_right .phone').css({
'top': h - pH + 100, 'top': h - pH + 30,
'transition': 'all 0.2s' 'transition': 'all 0.2s'
}); });
} else if (t <= ofsT) { } else if (t <= ofsT) {