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

Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib

Browse Source
This commit is contained in:
com02 2021-12-16 17:14:53 +09:00
commit e71493dff0
5 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java
View File

@ -80,15 +80,8 @@ public class NlibSearchServiceImpl implements NlibSearchService{
searchVO.setListCount(Integer.toString(searchVO.getPageSize()));
searchVO.setStartCount(Integer.toString(searchVO.getPageIndex()));
String collectionTemp="";
String nameTemp="";
//-----------------------------------
// 입력값 검증작업
//-----------------------------------
/*resVO = DataApiInterface.checkReqCommonParams(reqVO);
if(resVO != null) return resVO;
HttpMethod method = reqVO.getReqMethod();*/
//-----------------------------------
// 폼 파라메터 생성 작업 및 요청 처리

7
src/main/java/nlib/user/web/UserInfoController.java
View File

@ -170,6 +170,8 @@ public class UserInfoController extends NlibCommonController {
//사용자 정보를 가져온다.
NlibLoginVO loginVO = getNlibLoginVO(authentication);
if(loginVO != null)
{
//이메일인증 확인
if(!(vo.getEmail().equals(loginVO.getEmail())))
{
@ -194,6 +196,11 @@ public class UserInfoController extends NlibCommonController {
}
vo.setMobileNo(loginVO.getMobileTemp());
}
}else {
model.addAttribute("msg","잘못된 접근입니다. \\n장시간 대기로 다시 로그인 진행해주세요.");
model.addAttribute("url","/");
return "nlib/cmm/alert";
}
String encodedText=null;
encodedText = egovPasswordEncoder.encryptPassword(vo.getPassword());

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

@ -4,12 +4,20 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
<!-- NAVER OAuth Configuration -->
<!-- 개발서버 -->
<bean id="naverAuthVO" class="egovframework.com.ext.oauth.service.OAuthVO">
<constructor-arg value="naver" /><!-- Service Name -->
<constructor-arg value="EUu_FlgfyBlpQwGkXbit" /><!-- naverClientID -->
<constructor-arg value="f34KD054kW" /><!-- naverClientSecret -->
<constructor-arg value="https://nlib-dev.nculture.org/{callType}/{oauthServiceName}/callback.do" /><!-- naverRedirectUrl : callType(login|member) -->
</bean>
<!-- 운영서버 -->
<!-- <bean id="naverAuthVO" class="egovframework.com.ext.oauth.service.OAuthVO">
<constructor-arg value="naver" />Service Name
<constructor-arg value="Mm_mRiuBRjFYXNVUVcsi" />naverClientID
<constructor-arg value="IgSxpdvDPr" />naverClientSecret
<constructor-arg value="https://nlib.nculture.org/{callType}/{oauthServiceName}/callback.do" />naverRedirectUrl : callType(login|member)
</bean> -->
<!-- GOOGLE OAuth Configuration -->
<bean id="googleAuthVO" class="egovframework.com.ext.oauth.service.OAuthVO">

15
src/main/webapp/WEB-INF/jsp/nlib/member/alreadySignUpPopup.jsp
View File

@ -36,7 +36,10 @@ $(document).ready(function(){
if(cnt > 0) {
gfn_showLayerPop();
} else {
window.close();
if($("#linkType").val() == "signUp")
{
setTimeout(goSignUp, 100);
}
}
@ -53,7 +56,7 @@ $(document).ready(function(){
function notMe()
{
$("#alreadySignUpChk").val('Y');
gfn_closeLayerPopup();
if($("#linkType").val() == "signUp")
@ -62,6 +65,10 @@ function notMe()
}
}
function closeBtn(){
$("#alreadySignUpChk").val('N');
gfn_closeLayerPopup();
}
function selectAccount(mbInfoId,name,email)
{
@ -137,7 +144,7 @@ function accountLink()
<div class="row btn">
<p><a href="javascript:void(0);" class="cancel" onclick="notMe();">아니요, 내가 아닙니다.</a></p>
</div>
<button type="button" class="login-close" onclick="gfn_closeLayerPopup();"></button>
<button type="button" class="login-close" onclick="closeBtn();"></button>
</div>
<div class="Bg"></div>
</div>
@ -169,7 +176,7 @@ function accountLink()
<button type="button" class="btn btn-gray" onclick="goPrevious();" id="cancel">이전으로</button>
<button type="button" class="btn btn-color" onclick="accountLink();" >계정 연결하기</button>
</div>
<button type="button" class="login-close" onclick="gfn_closeLayerPopup();"></button>
<button type="button" class="login-close" onclick="closeBtn();"></button>
</div>
<div class="Bg"></div>
</div>

3
src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
View File

@ -187,7 +187,7 @@ $(document).ready(function() {
$("#birth_dd").val(birth_dd).prop("selected", true);
}
var mobileNo="${loginVO.snsMobileNo}";
var mobileNo="<c:out value="${loginVO.snsMobileNo}"/>";
if(mobileNo != "")
{
$("#mobileNo").val(mobileNo);
@ -480,6 +480,7 @@ function checkBirthday() {
function alreadySignUpChk(type){
$("#linkType").val(type);
$("#alreadySignUpChk").val("Y");
document.joinForm.action="${pageContext.request.contextPath}/member/selectAlreadySignUpMobilePopup.do";
gfn_layerPopFormSubmit("joinForm",false);
}