tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hylee'

Browse Source
This commit is contained in:
hylee 2022-12-02 14:08:10 +09:00
commit 57ba4aa612
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp
View File

@ -271,11 +271,11 @@
<a href="#" onclick="fn_adjstReq_preview('<c:out value="${info.adrSeq}" />'); return false;">${list.adrDocTy}</a> <a href="#" onclick="fn_adjstReq_preview('<c:out value="${info.adrSeq}" />'); return false;">${list.adrDocTy}</a>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<%-- <a href="<c:url value='/cmm/fms/FileDown.do?atchFileId=${list.atchFileId}&&fileSn=${list.fileSn}'/>" title="첨부파일 다운로드" targe="_blank"> <a href="<c:url value='/cmm/fms/FileDown.do?atchFileId=${list.atchFileId}&&fileSn=${list.fileSn}'/>" title="첨부파일 다운로드" targe="_blank">
<c:out value="${list.adrDocTy}"></c:out>&nbsp; <c:out value="${list.adrDocTy}"></c:out>&nbsp;
</a> --%> </a>
<!-- pdf 뷰어로 일단 보여주기_이준호_221109 --> <!-- pdf 뷰어로 일단 보여주기_이준호_221109 -->
<a href="http://192.168.0.176:8085/streamdocs/view/sd;streamdocsId=oeVmgWE9e_IUJP_bTHVkhtjmWBCUBmNwkxGenGKMF4U"><c:out value="${list.adrDocTy}"/></a> <%-- <a href="http://192.168.0.176:8085/streamdocs/view/sd;streamdocsId=oeVmgWE9e_IUJP_bTHVkhtjmWBCUBmNwkxGenGKMF4U"><c:out value="${list.adrDocTy}"/></a> --%>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</td> </td>

10
src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp
View File

@ -3,6 +3,10 @@
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<spring:eval expression="@globalSettings['Globals.Naver.clientId']" var="NAVER_CLIENTID"/>
<spring:eval expression="@globalSettings['Globals.Naver.callbackUrl']" var="NAVER_CALLBACKURL"/>
<spring:eval expression="@globalSettings['Globals.Kakao.Key']" var="KAKAO_KEY"/>
<form name="snsLoginForm" id="snsLoginForm"> <form name="snsLoginForm" id="snsLoginForm">
<input type="hidden" name="email" value="" /> <input type="hidden" name="email" value="" />
@ -68,7 +72,7 @@ $(document).on("click", "#naverLogin", function(){
//카카오로그인 //카카오로그인
// Kakao.init('bf3de0d897afe0e4bef0775f7086f048'); // LOCAL 발급받은 키 중 javascript키를 사용해준다. // Kakao.init('bf3de0d897afe0e4bef0775f7086f048'); // LOCAL 발급받은 키 중 javascript키를 사용해준다.
Kakao.init('5c0404a0840eb8821a0fdf6b3f2659b4'); // DEV 발급받은 키 중 javascript키를 사용해준다. Kakao.init('<c:out value="${KAKAO_KEY}" />'); // DEV 발급받은 키 중 javascript키를 사용해준다.
function kakaoLogin() { function kakaoLogin() {
Kakao.Auth.login({ Kakao.Auth.login({
success: function (response) { success: function (response) {
@ -99,8 +103,8 @@ $(document).on("click", "#naverLogin", function(){
window.name='opener'; window.name='opener';
var naverLogin = new naver.LoginWithNaverId( var naverLogin = new naver.LoginWithNaverId(
{ {
callbackUrl: "http://127.0.0.1:8090/web/kccadr/certDoc/snsCallBack.do", callbackUrl: '<c:out value="${NAVER_CALLBACKURL}" />',
clientId: "c7G40_m4so3YV8Ypb4D3", // DEV clientId: '<c:out value="${NAVER_CLIENTID}" />',
loginButton: {color: "green", type: 4, height: 40}, loginButton: {color: "green", type: 4, height: 40},
isPopup: true /* 팝업을 통한 연동처리 여부 */ isPopup: true /* 팝업을 통한 연동처리 여부 */
} }

7
src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp
View File

@ -3,15 +3,16 @@
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<spring:eval expression="@globalSettings['Globals.Naver.clientId']" var="NAVER_CLIENTID"/>
<spring:eval expression="@globalSettings['Globals.Naver.callbackUrl']" var="NAVER_CALLBACKURL"/>
<script src="<c:url value='/js/kccadr/naverjs/naveridlogin_js_sdk_2.0.2.js' />"></script> <script src="<c:url value='/js/kccadr/naverjs/naveridlogin_js_sdk_2.0.2.js' />"></script>
<script type="text/javascript"> <script type="text/javascript">
//네이버로그인 //네이버로그인
var naverLogin = new naver.LoginWithNaverId( var naverLogin = new naver.LoginWithNaverId(
{ {
// clientId: "UiWLhNqpDveCCjwepWtS", // LOCAL clientId: '<c:out value="${NAVER_CLIENTID}" />',
clientId: "c7G40_m4so3YV8Ypb4D3", // DEV callbackUrl: '<c:out value="${NAVER_CALLBACKURL}" />',
callbackUrl: "http://127.0.0.1:8090/web/kccadr/certDoc/snsCallBack.do",
isPopup: false, isPopup: false,
callbackHandle: true callbackHandle: true
} }