Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/mjon_git
This commit is contained in:
commit
2f23ac4472
@ -444,7 +444,7 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
|
|||||||
kakaoAlimTalkService.selectKakaoAtSentRefundList();
|
kakaoAlimTalkService.selectKakaoAtSentRefundList();
|
||||||
|
|
||||||
// 카카오 친구톡 환불 처리
|
// 카카오 친구톡 환불 처리
|
||||||
kakaoAlimTalkService.selectKakaoFtSentRefundList();
|
// kakaoAlimTalkService.selectKakaoFtSentRefundList();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -28,15 +28,15 @@ Globals.Env = dev
|
|||||||
|
|
||||||
# mysql
|
# mysql
|
||||||
Globals.DriverClassName=com.mysql.jdbc.Driver
|
Globals.DriverClassName=com.mysql.jdbc.Driver
|
||||||
#Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon
|
Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon
|
||||||
#Globals.UserName= mjonUr
|
Globals.UserName= mjonUr
|
||||||
#Globals.Password= mjon!@#$
|
Globals.Password= mjon!@#$
|
||||||
|
|
||||||
# mysql-prod
|
# mysql-prod
|
||||||
#Globals.DriverClassName=com.mysql.jdbc.Driver
|
#Globals.DriverClassName=com.mysql.jdbc.Driver
|
||||||
Globals.Url=jdbc:mysql://139.150.72.157:3306/mjon
|
#Globals.Url=jdbc:mysql://139.150.72.157:3306/mjon
|
||||||
Globals.UserName= mjonUr
|
#Globals.UserName= mjonUr
|
||||||
Globals.Password= mjon!@#$
|
#Globals.Password= mjon!@#$
|
||||||
|
|
||||||
# MainPage Setting(admin)
|
# MainPage Setting(admin)
|
||||||
Globals.MainPage = /cmm/main/mainPage.do
|
Globals.MainPage = /cmm/main/mainPage.do
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user