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

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp
This commit is contained in:
KNKIM 2021-11-16 11:17:54 +09:00
commit b13c2dc6d4
11 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/nlib/cmm/web/MainController.java
View File

@ -181,6 +181,8 @@ public class MainController extends NlibCommonController {
model.addAttribute("cartCnt", cartCnt);
model.addAttribute("unreadNotiCnt", unreadNotiCnt);
model.addAttribute("docViewUrl", NlibProperty.getString("pdf.url"));
model.addAttribute("videoViewUrl", NlibProperty.getString("video.url"));
model.addAttribute("imageViewUrl", NlibProperty.getString("image.url"));
return "nlib/cmm/headerSubPart";
}

9
src/main/java/nlib/user/web/MemberController.java
View File

@ -239,7 +239,7 @@ public class MemberController extends NlibCommonController{
vo.setEmail(StringUtil.maskEmail(ariaCrypto.decode(vo.getEmail())));
vo.setName(StringUtil.maskName(vo.getName()));
oauthUser.setSnsUserId(StringUtil.maskEmail(oauthUser.getSnsUserId()));
model.addAttribute("NlibLoginVO",vo);
model.addAttribute("result",vo);
model.addAttribute("oauthUser",oauthUser);
//통합처리 url
return "nlib/member/accountConsolidationForm";
@ -341,7 +341,11 @@ public class MemberController extends NlibCommonController{
loginVO.setEmail(StringUtil.maskEmail(loginVO.getEmail()));
loginVO.setName(StringUtil.maskName(loginVO.getName()));
String jsessionId = session.getId();
OAuthUniversalUser oauthUser = SessionConfig.popNewMemberInfo(jsessionId);
model.addAttribute("result",loginVO);
model.addAttribute("oauthUser",oauthUser);
return "/nlib/member/accountConsolidationForm";
}
/**
@ -494,6 +498,7 @@ public class MemberController extends NlibCommonController{
replaceContents.put("${councilNm}", councilNm);
emailUtil.sendEmail(email,"온라인자료대출시스템 이메일 인증번호입니다.",replaceContents,certTemplate);
map.put("msg","이메일 인증번호가 발송됐습니다.");
map.put("emailCertYn","Y");
return map;
@ -593,7 +598,7 @@ public class MemberController extends NlibCommonController{
smsVO.setCmid(UUID.getNlibCommonID("",32));
smsVO.setDestPhone(mobileNo);
smsVO.setSendPhone(senderNumber);
smsVO.setMsgBody("인증번호는 " + CertNumber + " 입니다.");
smsVO.setMsgBody("[한국문화원연합회] 본인확인 인증번호 [" + CertNumber + "]를 입력해주세요.");
//문자발송 솔루션
memberService.sendSms(smsVO);
//------------

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

@ -199,3 +199,15 @@ shorturl.api = https://local-dev.nculture.org/yourls-api.php?signature=d48a5ab90
pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=I
# \uac1c\ubc1c (\ucd94\ud6c4)
#pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N
# \uc6d0\ubb38\ubcf4\uae30 (IMAGE)
# \uac1c\ubc1c (\ud604\uc7ac)
image.url = https://port-dev.nculture.org/nImageView.do?nImage=I
# \uac1c\ubc1c (\ucd94\ud6c4)
#pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N
# \uc6d0\ubb38\ubcf4\uae30 (VIDEO)
# \uac1c\ubc1c (\ud604\uc7ac)
video.url = https://port-dev.nculture.org/nvodView.do?nvod=I
# \uac1c\ubc1c (\ucd94\ud6c4)
#pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N

2
src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp
View File

@ -12,6 +12,8 @@ String councilNm = (String)session.getAttribute("councilNm");
<script>
$(document).ready(function() {
DOC_VIEW_URL = "${docViewUrl}";
VIDEO_VIEW_URL = "${videoViewUrl}";
IMAGE_VIEW_URL = "${imageViewUrl}";
});
function goSearch(){

2
src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
View File

@ -255,7 +255,7 @@ function fn_listPops(typeDivCd) {
${itemOnline.masterId }</li>
</ul>
<div class="btn-box">
<div class="view"><a href="javascript:void(0)" onclick="gfn_showDocPdf('${itemOnline.interfaceId }','${itemOnline.masterId }')">원문보기</a></div>
<div class="view"><a href="javascript:void(0)" onclick="gfn_showDocPdf('${itemOnline.interfaceId }','${itemOnline.masterId }','${itemOnline.typeDivCd}','${itemOnline.dtlsTypeDivCd}')">원문보기</a></div>
<div class="RIS"><a href="javascript:void(0)" onclick="risShow('${itemOnline.masterId }')">RIS</a></div>
</div>
</div>

2
src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
View File

@ -224,7 +224,7 @@
}
if(!fn_isEmpty(obj.interfaceId) && !fn_isEmpty(obj.openDivCd) && obj.openDivCd != '3' && obj.digitalReadYn == 'Y')
{
t_btn+= "<button type=\"button\" class=\"btn-color\" onclick=\"gfn_showDocPdf('" + obj.interfaceId + "','" + obj.masterId + "');\">원문보기</button>";
t_btn+= "<button type=\"button\" class=\"btn-color\" onclick=\"gfn_showDocPdf('" + obj.interfaceId + "','" + obj.masterId + "','" + obj.typeDivCd + "','" + obj.dtlsTypeDivCd + "');\">원문보기</button>";
}
t_btn+= "<button type=\"button\" class=\"btn-gray\" onclick=\"risShow('" + obj.masterId +"');\">RIS</button>";

7
src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
View File

@ -128,7 +128,7 @@ function goList(){
<div class="right">
<div class="con-1">
<c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
<button type="button" class="view" onclick="gfn_showDocPdf('<c:out value="${result.interfaceId}"/>','<c:out value="${result.masterId}"/>')";>원문보기</button>
<button type="button" class="view" onclick="gfn_showDocPdf('<c:out value="${result.interfaceId}"/>','<c:out value="${result.masterId}"/>','<c:out value="${result.typeDivCd}"/>','<c:out value="${result.dtlsTypeDivCd}"/>')";>원문보기</button>
</c:if>
<button type="button" class="ris" onclick="risShow('<c:out value="${result.masterId}"/>')";>RIS</button>
<c:if test='${result.MUseYn == "Y"}'>
@ -137,10 +137,9 @@ function goList(){
<c:if test='${result.MUseYn != "Y"}'>
<button type="button" class="favorit" onclick="fn_changeInterestBtn('${result.masterId }', 'on');">즐겨찾기</button>
</c:if>
<%-- <c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId)}">
<c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
<button type="button" class="share" data-curl="${pdfUri}<c:out value="${result.interfaceId}"/>">공유</button>
</c:if> --%>
<button type="button" class="share" data-cUrl="${pdfUri}3568">공유</button>
</c:if>
</div>
<div class="con-2">
<div class="de-data">

2
src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
View File

@ -436,7 +436,7 @@ function fn_search_article(pageIndex) {
</c:otherwise>
</c:choose>
<c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
<button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}')";>원문보기</button>
<button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}','${result.typeDivCd}','${result.dtlsTypeDivCd}')";>원문보기</button>
</c:if>
<button type="button" class="btn-gray" onclick="risShow('${result.masterId}')";>RIS</button>
</div>

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

@ -514,9 +514,9 @@ function calcAge(birth) {
<div class="form-group Userbirth">
<label>생년월일</label>
<div class="con">
<select name="birth_yy" id="birth_yy"></select> 년
<select name="birth_mm" id="birth_mm"></select> 월
<select name="birth_dd" id="birth_dd"></select> 일
<select name="birth_yy" id="birth_yy"></select>
<select name="birth_mm" id="birth_mm"></select>
<select name="birth_dd" id="birth_dd"></select>
</div>
</div>

2
src/main/webapp/css/default.css
View File

@ -735,7 +735,7 @@ transform: rotate(45deg);}
.filter-wrap .filter {margin-top: 32px;}
.filter-wrap .filter-tit {clear: both;border-bottom: 1px solid #ccc;padding-bottom: 6px;_margin-bottom: 16px;}
.filter-wrap .filter-tit h3 {color: #000;font-size: 16px;float: left;}
.filter-wrap .filter-tit .btn-toggle {float: right;background: url(/images/btn/btn-minus.jpg) no-repeat center right;text-indent: -9999px;}
.filter-wrap .filter-tit .btn-toggle {float: right;text-indent: -9999px;}
.filter-wrap .filter-tit .btn-toggle.on {background: url(/images/btn/btn-plus.png) no-repeat center right;}
.filter-wrap .filter-tit:after {content: "";display: block;clear: both;}
.filter-wrap .filter .depth-1 {margin-top: 11px;padding-left: 10px;}

18
src/main/webapp/js/nlib.js
View File

@ -425,7 +425,21 @@ function fn_formatDateStr(yyyymmdd, defVal) {
// 원문보기
var DOC_VIEW_URL = "https://port.nculture.org/npdfView.do?npdf=N";
function gfn_showDocPdf(interfaceId,masterId) {
var VIDEO_VIEW_URL = "https://port.nculture.org/nvodView.do?nvod=N";
var IMAGE_VIEW_URL = "https://port.nculture.org/nImageView.do?nImage=N";
function gfn_showDocPdf(interfaceId,masterId,typeDivCd,dtlsTypeDivCd) {
var url="";
if(typeDivCd == "IT_PHOTO" && (dtlsTypeDivCd == "C199" || dtlsTypeDivCd == "C01" || dtlsTypeDivCd == "C1"))
{
url = IMG_VIEW_URL;
}else if((typeDivCd == "IT_VIDEO") && (dtlsTypeDivCd == "C290" || dtlsTypeDivCd == "C02" || dtlsTypeDivCd == "C03"))
{
url = VIDEO_VIEW_URL;
}else{
url = IMAGE_VIEW_URL;
}
//로그
$.ajax({
type: "post",
@ -434,7 +448,7 @@ function gfn_showDocPdf(interfaceId,masterId) {
}).done(function(response){
});
var openNewWindow = window.open(DOC_VIEW_URL + interfaceId, "_blank");
var openNewWindow = window.open(url + interfaceId, "_blank");
}
function snsShare(snsType, url) {