somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

소스충돌 해결

Browse Source
This commit is contained in:
JSYOO 2021-09-17 09:38:46 +09:00
parent 2aa9031f59
commit 181ad6e51d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/egovframework/spring/context-oauth.xml
View File

@ -8,7 +8,7 @@
<constructor-arg value="naver" /><!-- Service Name --> <constructor-arg value="naver" /><!-- Service Name -->
<constructor-arg value="jefkoYhSfrQ3TtZz5mTp" /><!-- naverClientID --> <constructor-arg value="jefkoYhSfrQ3TtZz5mTp" /><!-- naverClientID -->
<constructor-arg value="E2qAGaLEaG" /><!-- naverClientSecret --> <constructor-arg value="E2qAGaLEaG" /><!-- naverClientSecret -->
<constructor-arg value="https://nlib.nculture.org/nlib/{callType}/{oauthServiceName}/callback.do" /><!-- naverRedirectUrl : callType(login|member) --> <constructor-arg value="https://nlib-dev.nculture.org/nlib/{callType}/{oauthServiceName}/callback.do" /><!-- naverRedirectUrl : callType(login|member) -->
</bean> </bean>
<!-- GOOGLE OAuth Configuration --> <!-- GOOGLE OAuth Configuration -->
@ -16,7 +16,7 @@
<constructor-arg value="google" /><!-- Service Name --> <constructor-arg value="google" /><!-- Service Name -->
<constructor-arg value="879126511006-jro7bld7b2epl3n5mkksp0p24k2inbpu.apps.googleusercontent.com" /><!-- googleClientID --> <constructor-arg value="879126511006-jro7bld7b2epl3n5mkksp0p24k2inbpu.apps.googleusercontent.com" /><!-- googleClientID -->
<constructor-arg value="F6T-ZV9jibLhKtcugxPUtBlN" /><!-- googleClientSecret --> <constructor-arg value="F6T-ZV9jibLhKtcugxPUtBlN" /><!-- googleClientSecret -->
<constructor-arg value="https://nlib.nculture.org/nlib/{callType}/{oauthServiceName}/callback.do" /><!-- googleRedirectUrl : callType(login|member) --> <constructor-arg value="https://nlib-dev.nculture.org/nlib/{callType}/{oauthServiceName}/callback.do" /><!-- googleRedirectUrl : callType(login|member) -->
</bean> </bean>
<!-- KAKAO OAuth Configuration --> <!-- KAKAO OAuth Configuration -->
@ -24,7 +24,7 @@
<constructor-arg value="kakao" /><!-- Service Name --> <constructor-arg value="kakao" /><!-- Service Name -->
<constructor-arg value="e74d25210853313dd1fead4c6c1f06ec" /><!-- kakaoClientID --> <constructor-arg value="e74d25210853313dd1fead4c6c1f06ec" /><!-- kakaoClientID -->
<constructor-arg value="AGxiWEwu2ytIifA1AY2PoqVSrdnRZiao" /><!-- kakaoClientSecret --> <constructor-arg value="AGxiWEwu2ytIifA1AY2PoqVSrdnRZiao" /><!-- kakaoClientSecret -->
<constructor-arg value="https://nlib.nculture.org/nlib/{callType}/{oauthServiceName}/callback.do" /><!-- kakaoRedirectUrl : callType(login|member) --> <constructor-arg value="https://nlib-dev.nculture.org/nlib/{callType}/{oauthServiceName}/callback.do" /><!-- kakaoRedirectUrl : callType(login|member) -->
</bean> </bean>
</beans> </beans>

2
src/main/resources/nlib/nlib.properties
View File

@ -34,7 +34,7 @@ login.newcouncil.url = /login/agreeProvInfoForm.do
nculture.login.redirect.uri = /login/loginForm.do nculture.login.redirect.uri = /login/loginForm.do
nculture.login.post.login.redirect.uri = /login/loginCouncilSSO.do nculture.login.post.login.redirect.uri = /login/loginCouncilSSO.do
nculture.login.post.member.redirect.uri = /member/selectMemberJoiningInfo.do nculture.login.post.member.redirect.uri = /member/selectMemberJoiningInfo.do
nculture.login.preset.redirect.url = http://nlib.nculture.org/nlib/login/loginPreSet.do nculture.login.preset.redirect.url = https://nlib-dev.nculture.org/login/loginPreSet.do
nculture.member.redirect.uri = /member/snsCertForm.do nculture.member.redirect.uri = /member/snsCertForm.do
#---------------------------------------- #----------------------------------------