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

키워드 수정

Browse Source 
nlib.js수정

주석 수정
This commit is contained in:
JSYOO 2021-12-09 17:58:01 +09:00
parent 5338723ce2
commit 95f0ac9dac
7 changed files with 99 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/nlib/sch/web/NlibSearchController.java
View File

@ -225,7 +225,7 @@ public class NlibSearchController extends NlibCommonController {
}
secondClassList.get(i).put("cnt", Integer.toString(count));
}
// CSRF 토큰 생성 (2021.12.02 KKN 추가)
// CSRF 토큰 생성
String token = generateCsrfToken(request);
model.addAttribute("csrfToken", token);
@ -374,10 +374,6 @@ public class NlibSearchController extends NlibCommonController {
imagePath = StringUtil.getString(vo.getRprsThumbUrl(),"");
}
// CSRF 토큰 생성 (2021.12.02 KKN 추가)
String token = generateCsrfToken(request);
model.addAttribute("csrfToken", token);
model.addAttribute("imageType",imageType);
model.addAttribute("imagePath",imagePath);
model.addAttribute("keywordList",keywordList);
@ -473,7 +469,7 @@ public class NlibSearchController extends NlibCommonController {
model.addAttribute("firstClassList", codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD));
model.addAttribute("secondClassList", codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD));
// CSRF 토큰 생성 (2021.12.02 KKN 추가)
// CSRF 토큰 생성
String token = generateCsrfToken(request);
model.addAttribute("csrfToken", token);
return "nlib/search/getDetailedSearchFormPopup";

1
src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml
View File

@ -28,6 +28,7 @@
AND RM.REG_STATUS = 'REG_OK'
AND RM.OPER_READ_RANGE_CD != '03' /* 전체열람, 목록열람으로 한정 : 열람불가 제외 */
) T
WHERE KEY_NAME != '-'
GROUP BY T.KEY_NAME
ORDER BY CNT DESC, T.KEY_NAME
LIMIT 20

2
src/main/resources/egovframework/mapper/nlib/col/InterestDAO_SQL.xml
View File

@ -101,8 +101,6 @@
WHERE 1=1
AND SD.USE_YN = "Y"
AND SD.CLOSE_FLAG = "0"
AND IFNULL(NULLIF(SD.APPLY_START_YMD,''),"99999999") < date_format(NOW(), '%Y%m%d')
AND IFNULL(NULLIF(SD.APPLY_CLOSE_YMD,''),"99999999") > date_format(NOW(), '%Y%m%d')
AND MI.USE_YN = "Y"
AND MI.MB_INFO_ID = #{mbInfoId}
GROUP BY ORG_CD,DEPT_NM

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

@ -1,3 +1,28 @@
<%
/**
* <pre>
* @Class Name : alreadySignUpPopup.jsp
*
* @Description : 계정통합팝업
*
*
* @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
*
* </pre>
*
* @ ------------ -------- ---------------------------
* @ 수정일 수정자 수정내용
* @ ------------ -------- ---------------------------
* @ 2021. 9. 9. JSYOO 최초 생성
*
*
* @author 이씨플라자 * DIGITALSHIP JSYOO
* @since 2021. 9. 9.
* @version 1.0
*
*/
%>
<%@ page language="java" contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
@ -14,6 +39,8 @@ $(document).ready(function(){
window.close();
}
<%//비밀번호 찾기 페이지에서 다시 돌아왔을 경우 %>
var previousPage = "${vo.previousPage}";
if(previousPage == "alreadySignUpPopup")
@ -24,6 +51,18 @@ $(document).ready(function(){
}
});
function notMe()
{
$("#alreadySignUpChk").val('Y');
gfn_closeLayerPopup();
if($("#linkType").val() == "signUp")
{
setTimeout(goSignUp, 100);
}
}
function selectAccount(mbInfoId,name,email)
{
$("#alreadySingUpForm").css("display","none");
@ -96,7 +135,7 @@ function accountLink()
</c:forEach>
</div>
<div class="row btn">
<p><a href="javascript:void(0);" class="cancel" onclick="gfn_closeLayerPopup();">아니요, 내가 아닙니다.</a></p>
<p><a href="javascript:void(0);" class="cancel" onclick="notMe();">아니요, 내가 아닙니다.</a></p>
</div>
<button type="button" class="login-close" onclick="gfn_closeLayerPopup();"></button>
</div>
@ -107,7 +146,7 @@ function accountLink()
<input type="hidden" id="mbInfoId" name="mbInfoId" value="<c:out value='${vo.mbInfoId }'/>">
<input type="hidden" id="nameTemp" name="nameTemp" value="<c:out value='${vo.nameTemp }'/>">
<input type="hidden" id="emailTemp" name="emailTemp" value="<c:out value='${vo.emailTemp }'/>">
<input type="hidden" id="mobileNo" name="mobileNo" value="<c:out value='${vo.mobileNo }'/>">
<input type="hidden" name="mobileNo" value="<c:out value='${vo.mobileNo }'/>">
<input type="hidden" id="previousPage" name="previousPage" value="alreadySignUpPopup">
<!-- 계정연결 비밀번호 팝업 -->
<div class="pop-login-password">

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

@ -136,25 +136,33 @@ function signUp(){
alert("대출/열람 정보 수신에 동의해주세요.");
return false;
}
if($("#alreadySignUpChk").val() == 'N')
{
alreadySignUpChk("signUp");
}else{
goSignUp();
}
}
function goSignUp(){
if(confirm("회원가입하시겠습니까?")){
$("#birthday").val($("#birth_yy").val()+$("#birth_mm").val()+$("#birth_dd").val());
$("#mobileNo").val($("#mobileNo_1").val()+$("#mobileNo_2").val()+$("#mobileNo_3").val());
$("#birthday").val($("#birth_yy").val()+$("#birth_mm").val()+$("#birth_dd").val());
$("#mobileNo").val($("#mobileNo_1").val()+$("#mobileNo_2").val()+$("#mobileNo_3").val());
if($("input[name='mktRecvSmsYnChk']").is(":checked"))$("#mktRecvSmsYn").val("Y");
else $("#mktRecvSmsYn").val("N");
if($("input[name='mktRecvEmailYnChk']").is(":checked"))$("#mktRecvEmailYn").val("Y");
else $("#mktRecvEmailYn").val("N");
if($("input[name='mktRecvSmsYnChk']").is(":checked"))$("#mktRecvSmsYn").val("Y");
else $("#mktRecvSmsYn").val("N");
if($("input[name='mktRecvEmailYnChk']").is(":checked"))$("#mktRecvEmailYn").val("Y");
else $("#mktRecvEmailYn").val("N");
<%
//연락받을 이메일 입력
%>
$("#loginUserId").val($("#email").val());
var form = document.joinForm;
form.action="${pageContext.request.contextPath}/member/insertMemberInfo.do";
form.submit();
<%
//연락받을 이메일 입력
%>
$("#loginUserId").val($("#email").val());
var form = document.joinForm;
form.action="${pageContext.request.contextPath}/member/insertMemberInfo.do";
form.submit();
}
return false;
}
$(document).ready(function() {
@ -179,24 +187,28 @@ $(document).ready(function() {
$("#birth_dd").val(birth_dd).prop("selected", true);
}
var MobileNo="${loginVO.snsMobileNo}";
var mobileNo="${loginVO.snsMobileNo}";
if(mobileNo != "")
{
$("#mobileNo").val(mobileNo);
}
if(!gfn_isEmpty(MobileNo))
if(!gfn_isEmpty(mobileNo))
{
var mobileNo_1 = "";
var mobileNo_2 = "";
var mobileNo_3 = "";
if(MobileNo.length == 11)
if(mobileNo.length == 11)
{
mobileNo_1 =MobileNo.substr(0,3);
mobileNo_2 =MobileNo.substr(3,4);
mobileNo_3 =MobileNo.substr(7,4);
mobileNo_1 =mobileNo.substr(0,3);
mobileNo_2 =mobileNo.substr(3,4);
mobileNo_3 =mobileNo.substr(7,4);
}
if(MobileNo.length == 10)
if(mobileNo.length == 10)
{
mobileNo_1 =MobileNo.substr(0,3);
mobileNo_2 =MobileNo.substr(3,3);
mobileNo_3 =MobileNo.substr(6,4);
mobileNo_1 =mobileNo.substr(0,3);
mobileNo_2 =mobileNo.substr(3,3);
mobileNo_3 =mobileNo.substr(6,4);
}
$("#mobileNo_1").val(mobileNo_1);
@ -366,6 +378,7 @@ function mobileCert(){
data : {"mobileNo" : mobileNo},
success : function(result){
alert("인증번호가 발송됐습니다.");
$("#alreadySignUpChk").val("N");
$("#mobileVrfctNo").val("");
$("#mobileCertYn").val("N");
$("#mobileCertSendBtn").removeClass('btn-color');
@ -412,13 +425,16 @@ function certMobileCheck(){
if(result=="true")
{
alert("인증되었습니다.");
if($("#alreadySignUpChk").val() == 'N')
{
alreadySignUpChk("mCert");
}
$("#mobileCertYn").val("Y");
$("#mobileCertSendBtn").css("display","none");
$("#mobileReSend").css("display","none");
$("[id^='mobileSuc']").css("display","inline-block");
$("[id^='mobileVrfctNo']").css("display","none");
document.joinForm.action="${pageContext.request.contextPath}/member/selectAlreadySignUpMobilePopup.do";
gfn_layerPopFormSubmit("joinForm",false);
}else
{
alert("인증번호가 일치하지않습니다.");
@ -462,6 +478,12 @@ function checkBirthday() {
}
}
function alreadySignUpChk(type){
$("#linkType").val(type);
document.joinForm.action="${pageContext.request.contextPath}/member/selectAlreadySignUpMobilePopup.do";
gfn_layerPopFormSubmit("joinForm",false);
}
function isValidDate(param) {
try {
param = param.replace(/-/g, '');
@ -589,6 +611,8 @@ function fn_cancel(){
<div class="info">
<form id="joinForm" name="joinForm" method="post" class="mt-5 form-container">
<input type="hidden" id="birthday" name="birthday" >
<input type="hidden" id="linkType" name="linkType" value="">
<input type="hidden" id="alreadySignUpChk" name="alreadySignUpChk" value="N" >
<input type="hidden" id="mobileNo" name="mobileNo" >
<input type="hidden" id="mobileCertYn" name="mobileCertYn" value="Y">
<input type="hidden" id="emailCertYn" name="emailCertYn" value="Y">
@ -698,7 +722,7 @@ function fn_cancel(){
</div>
<div class="btn-box">
<button type="button" class="btn btn-gray" id="cancel" onclick="fn_cancel();">취소</button>
<button type="button" class="btn btn-gray" onclick="fn_cancel();">취소</button>
<button type="button" class="btn btn-color" onclick="signUp();">가입하기</button>
</div>
</form>

27
src/main/webapp/WEB-INF/jsp/nlib/member/snsCertForm.jsp
View File

@ -1,31 +1,4 @@
<%
/**
* <pre>
* @Class Name : snsCertForm.jsp
*
* @Description : 회원가입 SNS 인증
*
*
* @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
*
* </pre>
*
* @ ------------ -------- ---------------------------
* @ 수정일 수정자 수정내용
* @ ------------ -------- ---------------------------
* @ 2021. 7. 12. JSYOO 최초 생성
*
*
* @author 이씨플라자 * DIGITALSHIP JSYOO
* @since 2021. 7. 12.
* @version 1.0
*
*/
%>
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%
/**
* <pre>
* @Class Name : snsCertForm.jsp

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

@ -244,7 +244,7 @@ function gfn_changeInterestBtn(masterId,onOff){
data: {"masterId" : masterId}
}).done(function(result){
alert(result);
if(result == "로그인 후 이용하실 수 있습니다.")
if(result == "로그인 후, 이용하실 수 있습니다.")
{
return false;
}
@ -263,7 +263,7 @@ function gfn_changeInterestBtn(masterId,onOff){
data : {"masterIdList" : masterIdArray},
success : function(result){
alert(result);
if(result == "로그인 후 이용하실 수 있습니다.")
if(result == "로그인 후, 이용하실 수 있습니다.")
{
return false;
}