소스 충돌 처리
This commit is contained in:
KNKIM
parent
9c2a86bef6
commit
0ea03c1eeb
@ -1,86 +1,86 @@
|
||||
<%
|
||||
/**
|
||||
* <pre>
|
||||
* @Class Name : accountConsolidationForm.jsp
|
||||
*
|
||||
* @Description : 계정통합처리 알림폼
|
||||
*
|
||||
*
|
||||
* @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
* @ ------------ -------- ---------------------------
|
||||
* @ 수정일 수정자 수정내용
|
||||
* @ ------------ -------- ---------------------------
|
||||
* @ 2021. 9. 1. JSYOO 최초 생성
|
||||
*
|
||||
*
|
||||
* @author 이씨플라자 * DIGITALSHIP JSYOO
|
||||
* @since 2021. 9. 1.
|
||||
* @version 1.0
|
||||
*
|
||||
*/
|
||||
%>
|
||||
<%@ page language="java" contentType="text/html; charset=UTF-8" %>
|
||||
<%@ page import="java.util.Date" %>
|
||||
<%@ page import="java.text.SimpleDateFormat" %>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
|
||||
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
|
||||
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
|
||||
<%
|
||||
Date nowTime = new Date();
|
||||
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
SimpleDateFormat sf2 = new SimpleDateFormat("a hh:mm:ss");
|
||||
%>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>Insert title here</title>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 계정연결완료 섹션 -->
|
||||
<div class="location join succ connect">
|
||||
<h2 class="blind">계정연결완료 섹션영역</h2>
|
||||
<div class="inner">
|
||||
<div class="row-top icon">
|
||||
<div class="icon"><img src="/images/icon/icon-connect.png" alt="자물쇠 아이콘"></div>
|
||||
<p>계정연결 완료</p>
|
||||
</div>
|
||||
<div class="contents row-bottom">
|
||||
<div class="join-box">
|
||||
<div class="success">
|
||||
<div class="text">
|
||||
<p>기가입 계정에
|
||||
<span>
|
||||
<c:if test="${oauthUser.snsType eq 'NAVER'}">네이버</c:if>
|
||||
<c:if test="${oauthUser.snsType eq 'KAKAO'}">카카오</c:if>
|
||||
<c:if test="${oauthUser.snsType eq 'GOOGLE'}">구글</c:if>
|
||||
</span>계정이 통합되었습니다.
|
||||
</p>
|
||||
<p><button type="button"><span class="name"><c:out value="${NlibLoginVO.name }"/></span><span class="mail"><c:out value="${NlibLoginVO.email }"/></span></button></p>
|
||||
</div>
|
||||
<div class="box">
|
||||
<div class="icon">
|
||||
<c:if test="${oauthUser.snsType eq 'NAVER'}"><img src="/images/icon/icon-naver-login.png" alt="네이버 아이콘"></c:if>
|
||||
<c:if test="${oauthUser.snsType eq 'KAKAO'}"><img src="/images/icon/icon-kakao-login.png" alt="카카오 아이콘"></c:if>
|
||||
<c:if test="${oauthUser.snsType eq 'GOOGLE'}"><img src="/images/icon/icon-google-login.png" alt="구글 아이콘"></c:if>
|
||||
</div>
|
||||
<div class="text">
|
||||
<p><c:out value="${oauthUser.snsUserId }"/></p>
|
||||
<p><span class="date"><%= sf.format(nowTime) %></span><span class="time"><%= sf2.format(nowTime) %> 연결완료</span></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="btn">
|
||||
<a href="/" class="btn-color">소장자료관으로</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
<%
|
||||
/**
|
||||
* <pre>
|
||||
* @Class Name : accountConsolidationForm.jsp
|
||||
*
|
||||
* @Description : 계정통합처리 알림폼
|
||||
*
|
||||
*
|
||||
* @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
* @ ------------ -------- ---------------------------
|
||||
* @ 수정일 수정자 수정내용
|
||||
* @ ------------ -------- ---------------------------
|
||||
* @ 2021. 9. 1. JSYOO 최초 생성
|
||||
*
|
||||
*
|
||||
* @author 이씨플라자 * DIGITALSHIP JSYOO
|
||||
* @since 2021. 9. 1.
|
||||
* @version 1.0
|
||||
*
|
||||
*/
|
||||
%>
|
||||
<%@ page language="java" contentType="text/html; charset=UTF-8" %>
|
||||
<%@ page import="java.util.Date" %>
|
||||
<%@ page import="java.text.SimpleDateFormat" %>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
|
||||
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
|
||||
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
|
||||
<%
|
||||
Date nowTime = new Date();
|
||||
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
SimpleDateFormat sf2 = new SimpleDateFormat("a hh:mm:ss");
|
||||
%>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>Insert title here</title>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 계정연결완료 섹션 -->
|
||||
<div class="location join succ connect">
|
||||
<h2 class="blind">계정연결완료 섹션영역</h2>
|
||||
<div class="inner">
|
||||
<div class="row-top icon">
|
||||
<div class="icon"><img src="/images/icon/icon-connect.png" alt="자물쇠 아이콘"></div>
|
||||
<p>계정연결 완료</p>
|
||||
</div>
|
||||
<div class="contents row-bottom">
|
||||
<div class="join-box">
|
||||
<div class="success">
|
||||
<div class="text">
|
||||
<p>기가입 계정에
|
||||
<span>
|
||||
<c:if test="${oauthUser.snsType eq 'NAVER'}">네이버</c:if>
|
||||
<c:if test="${oauthUser.snsType eq 'KAKAO'}">카카오</c:if>
|
||||
<c:if test="${oauthUser.snsType eq 'GOOGLE'}">구글</c:if>
|
||||
</span>계정이 통합되었습니다.
|
||||
</p>
|
||||
<p><button type="button"><span class="name"><c:out value="${result.name }"/></span><span class="mail"><c:out value="${result.email }"/></span></button></p>
|
||||
</div>
|
||||
<div class="box">
|
||||
<div class="icon">
|
||||
<c:if test="${oauthUser.snsType eq 'NAVER'}"><img src="/images/icon/icon-naver-login.png" alt="네이버 아이콘"></c:if>
|
||||
<c:if test="${oauthUser.snsType eq 'KAKAO'}"><img src="/images/icon/icon-kakao-login.png" alt="카카오 아이콘"></c:if>
|
||||
<c:if test="${oauthUser.snsType eq 'GOOGLE'}"><img src="/images/icon/icon-google-login.png" alt="구글 아이콘"></c:if>
|
||||
</div>
|
||||
<div class="text">
|
||||
<p><c:out value="${oauthUser.snsUserId }"/></p>
|
||||
<p><span class="date"><%= sf.format(nowTime) %></span><span class="time"><%= sf2.format(nowTime) %> 연결완료</span></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="btn">
|
||||
<a href="/" class="btn-color">소장자료관으로</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue
Block a user