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

Merge branch 'master' into 5180_요금사용내역_및_결제내역

Browse Source
This commit is contained in:
JIWOO 2025-07-30 15:57:42 +09:00
commit 5966ff97f0
7 changed files with 104 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/itn/let/mjo/test/web/TestController.java
View File

@ -42,6 +42,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
@ -3501,5 +3502,40 @@ public class TestController {
} }
@RequestMapping("/uss/ion/test/callNicepay.do")
public String callNicepay(Model model) {
String url = "https://dev.nicepay.co.kr/webapi/sslConnectionTest.jsp";
String mid = "itn180208m"; // 실제 MID 값으로 변경
try {
// RestTemplate 사용
RestTemplate restTemplate = new RestTemplate();
// 헤더 설정
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
// 파라미터 설정
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
params.add("MID", mid);
HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(params, headers);
// POST 요청
ResponseEntity<String> response = restTemplate.postForEntity(url, request, String.class);
// JSP에 전달
model.addAttribute("result", response.getBody());
model.addAttribute("url", url);
model.addAttribute("mid", mid);
} catch (Exception e) {
model.addAttribute("result", "에러 발생: " + e.getMessage());
}
return "uss/ion/test/TestNicePaySSL"; // nicepayResult.jsp로 이동
}
} }

57
src/main/webapp/WEB-INF/jsp/uss/ion/test/TestNicePaySSL.jsp Normal file
View File

@ -0,0 +1,57 @@
<%@ page contentType="text/html; charset=utf-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<html lang="ko">
<head>
<title>세금계산서 관리</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
</head>
<body>
<div class="contWrap">
<div class="pageTitle">
<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt=""></div>
<h2 class="titType1 c_222222 fwBold">Nicepay SSL 호출 결과</h2>
<p class="tType6 c_999999">Nicepay SSL 호출 결과</p>
</div>
<div class="pageCont">
<!-- 세금계산서 -->
<div class="tableWrap">
<table class="tbType1">
<colgroup>
<col style="width: 40%">
<col style="width: 20%">
<col style="width: 40%">
</colgroup>
<thead>
<tr>
<th>url</th>
<th>mid</th>
<th>결과</th>
</tr>
</thead>
<tbody>
<tr>
<td>
${url}
</td>
<td>
${mid}
</td>
<td>
${result}
</td>
</tr>
</tbody>
</table>
</div>
<div class="btnWrap">
</div>
</div>
</div>
</body>
</html>

6
src/main/webapp/publish/css/common.css
View File

@ -133,7 +133,7 @@ caption, .label {position: absolute;width: 1px;height: 1px;margin: -1px;border:
.login2 .check_money .hover_content_wrap{display:inline-block;position:relative;} .login2 .check_money .hover_content_wrap{display:inline-block;position:relative;}
.login2 .check_money .hover_content_wrap .qmMark{width:17px;height:17px;margin:0 4px 0 0;background:#6a6c72;border-radius:100%;color:#fff;text-align:center;} .login2 .check_money .hover_content_wrap .qmMark{width:17px;height:17px;margin:0 4px 0 0;background:#6a6c72;border-radius:100%;color:#fff;text-align:center;}
.login2 .check_money .hover_content_wrap .qmMark:hover+.hover_content{display:block;} .login2 .check_money .hover_content_wrap .qmMark:hover+.hover_content{display:block;}
.login2 .check_money .hover_content{display:none;position:absolute;padding:12px 10px 8px 10px;border:2px solid #002c9a;background:#fff;box-shadow: 0 3px 10px 0 rgba(0,0,0,0.5);transform:translateX(-50%);border-radius:5px;top:34px;left:8px;} .login2 .check_money .hover_content{display:none;position:absolute;padding:12px 12px 8px 12px;border:2px solid #002c9a;background:#fff;box-shadow: 0 3px 10px 0 rgba(0,0,0,0.5);transform:translateX(-50%);border-radius:5px;top:34px;left:8px;}
.login2 .check_money .hover_content::after{content:'';position:absolute;left:50%;top:-10px;width:16px;height:10px;margin:0 0 0 -8px;background:url(../images/content/icon_account_arrow.png) no-repeat left top;} .login2 .check_money .hover_content::after{content:'';position:absolute;left:50%;top:-10px;width:16px;height:10px;margin:0 0 0 -8px;background:url(../images/content/icon_account_arrow.png) no-repeat left top;}
.login2 .check_money .hover_content .hover_content_title{font-size:14px;font-weight:600;margin:0 0 10px 0;} .login2 .check_money .hover_content .hover_content_title{font-size:14px;font-weight:600;margin:0 0 10px 0;}
.login2 .check_money .hover_content .hover_content_title span{padding:0;font-size:13px;font-weight:400;} .login2 .check_money .hover_content .hover_content_title span{padding:0;font-size:13px;font-weight:400;}
@ -142,7 +142,9 @@ caption, .label {position: absolute;width: 1px;height: 1px;margin: -1px;border:
.login2 .check_money .hover_content .send_available_number li{display:flex;justify-content:space-between;font-size:13px;} .login2 .check_money .hover_content .send_available_number li{display:flex;justify-content:space-between;font-size:13px;}
.login2 .check_money .hover_content .title{min-width:70px;} .login2 .check_money .hover_content .title{min-width:70px;}
.login2 .check_money .hover_content .number{text-align:right;padding:0;} .login2 .check_money .hover_content .number{text-align:right;padding:0;}
.login2 .check_money .hover_content .event_term{width:100%;padding:2px 0;margin:8px 0 0 0;background:#e5e5e5;font-size:13px;color:#444;text-align:center;border-radius:25px;} .login2 .check_money .hover_content .event_term{display:flex;width:100%;padding:4px 5px 4px 7px;margin:8px 0 0 0;background:#FFE5E5;font-size:13px;color:#e40000;text-align:center;border-radius:25px;justify-content:space-between;box-sizing:border-box;}
.login2 .check_money .hover_content .event_term p:last-child{color:#222;}
.login2 .check_money .hover_content .event_term p:last-child span{color:#e40000;}
/*후불 회원에게만 노출되는 안내레이어*/ /*후불 회원에게만 노출되는 안내레이어*/
.login2 .check_money .holdingsum_box {position: relative; display:flex; align-items: center;} .login2 .check_money .holdingsum_box {position: relative; display:flex; align-items: center;}

2
src/main/webapp/publish/css/popupLayer.css
View File

@ -1050,6 +1050,8 @@
.template_choice_popup .kakao_template_list{display:flex;flex-wrap:wrap;gap:30px 16px;margin:20px 0;} .template_choice_popup .kakao_template_list{display:flex;flex-wrap:wrap;gap:30px 16px;margin:20px 0;}
/* .template_choice_popup .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 80px)/3); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 11px 40px 0;} */ /* .template_choice_popup .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 80px)/3); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 11px 40px 0;} */
.template_choice_popup .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 80px)/3); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px;} .template_choice_popup .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 80px)/3); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px;}
.template_choice_popup .kakao_template_list li.template_none{width:100%;text-align:center;box-shadow:none;}
.template_choice_popup .kakao_template_list li.template_none::after{display:none;}
.template_choice_popup .kakao_template_list li:nth-child(3n){margin: 0 0 0 0;} .template_choice_popup .kakao_template_list li:nth-child(3n){margin: 0 0 0 0;}
.template_choice_popup .kakao_template_list li::after{position: absolute; content: " "; width: 100%; height: 18px; background: url(/publish/images/kakao_template_cont.png) no-repeat top center; top: 8px;} .template_choice_popup .kakao_template_list li::after{position: absolute; content: " "; width: 100%; height: 18px; background: url(/publish/images/kakao_template_cont.png) no-repeat top center; top: 8px;}
.template_choice_popup .kakao_template_list .kakao_template_wrap{width: 100%; height: 370px; padding: 30px 0 15px 0; border-radius: 22px 22px 0 0; box-shadow: inset 0 2px 8px rgba(0,0,0,0.2); background: #b6cddd; overflow-y: auto; box-sizing: border-box;} .template_choice_popup .kakao_template_list .kakao_template_wrap{width: 100%; height: 370px; padding: 30px 0 15px 0; border-radius: 22px 22px 0 0; box-shadow: inset 0 2px 8px rgba(0,0,0,0.2); background: #b6cddd; overflow-y: auto; box-sizing: border-box;}

3
src/main/webapp/publish/kakao_friendtalk_send.html
View File

@ -785,6 +785,7 @@
<textarea id="smsTxtArea" name="smsTxtArea" class="put_text"></textarea> <textarea id="smsTxtArea" name="smsTxtArea" class="put_text"></textarea>
<div class="text_length"> <div class="text_length">
<div class="deny_txt"><p>무료거부 0808800858</p> </div>
<div name="afterDeny"> <div name="afterDeny">
<p> <p>
<span class="fwMd" id="msgLeng">0 / <span class="fwMd" id="msgLeng">0 /
@ -820,6 +821,7 @@
</div> </div>
<textarea id="smsTxtArea" name="smsTxtArea" class="put_text"></textarea> <textarea id="smsTxtArea" name="smsTxtArea" class="put_text"></textarea>
<div class="text_length"> <div class="text_length">
<div class="deny_txt"><p>무료거부 0808800858</p> </div>
<div name="afterDeny"> <div name="afterDeny">
<p> <p>
<span class="fwMd" id="msgLeng">0 / <span class="fwMd" id="msgLeng">0 /
@ -877,6 +879,7 @@
</div> </div>
<textarea id="smsTxtArea" name="smsTxtArea" class="put_text"></textarea> <textarea id="smsTxtArea" name="smsTxtArea" class="put_text"></textarea>
<div class="text_length"> <div class="text_length">
<div class="deny_txt"><p>무료거부 0808800858</p> </div>
<div name="afterDeny"> <div name="afterDeny">
<p> <p>
<span class="fwMd" id="msgLeng">0 / <span class="fwMd" id="msgLeng">0 /

2
src/main/webapp/publish/layout/_header.html
View File

@ -370,7 +370,7 @@
<p class="number"><span class="c_002c9a fwBold">58</span>원(345매)</p> <p class="number"><span class="c_002c9a fwBold">58</span>원(345매)</p>
</li> </li>
</ul> </ul>
<p class="event_term">이벤트 적용중 <span class="fwBold">D-60</span></p> <div class="event_term"><p>이벤트<span class="fwBold">(D-60)</span></p><p><span class="fwBold price">500,000.99</span>원</p></div>
</div> </div>
</div> </div>
<span class="fwMd" id="hdUserMoney">999,999,999.99</span>원 <span class="fwMd" id="hdUserMoney">999,999,999.99</span>원

1
src/main/webapp/publish/popup_friendtalk_template_choice.html
View File

@ -42,6 +42,7 @@
</div> </div>
<div class="template_list"> <div class="template_list">
<ul class="kakao_template_list thumbnail_list"> <ul class="kakao_template_list thumbnail_list">
<li class="template_none">등록된 템플릿이 없습니다.</li>
<li> <li>
<div class="kakao_template_wrap"> <div class="kakao_template_wrap">
<div class="template_cont"> <div class="template_cont">