KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
kdh0120 2021-06-28 05:32:12 +00:00
parent 27464be01a
commit 13755be469
13 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BO/Web.config
View File

@ -60,19 +60,19 @@
<add key="lgdacomConfigPath" value="D:\3rdparti\lgdacomyicte" />
<add key="CST_MID" value="yicte2000" />
<add key="CST_MID" value="yicte" />
<!--상점아이디-->
<add key="CST_PLATFORM" value="test" />
<add key="CST_PLATFORM" value="test" /> <!--test,service-->
<!--test, service-->
<add key="LGD_ENCODING" value="UTF-8" />
<add key="LGD_BACKBTN_YN" value="N" />
<add key="LGD_CASNOTEURL" value="http://kdh.nptc.kr:8084/Account/XPayVBankMoney" />
<add key="LGD_CASNOTEURL" value="https://ynicte.nptc.kr/Account/XPayVBankMoney" />
<!--가상계좌 입금통보 URL-->
<add key="LGD_AUTOFILLYN_BUYER" value="Y" />
<add key="LGD_CASHRECEIPTYN" value="Y" />
<add key="LGD_ESCROW_USEYN" value="N" />
<add key="PAYMENT_CLASSIFICATION" value="te" />
<add key="LGD_MERTKEY" value="e988951b7fe0b7f25ebaa07e54824365" />
<add key="LGD_MERTKEY" value="1e961022a432d24d7d8d02581ac7461f" />
<!--MTS SMSMMS 발신번호, 알림톡발신키-->
<add key="mastersms" value="10d3158b52019fa6b7e5563b1e35cf8c48a8caf9" />

2
Base/Controller/BasePartialController.cs
View File

@ -1613,7 +1613,7 @@ namespace NP.Base
protected NP.Model.Users GoLogin(String uid, String upw, bool isSns = false )
{
var p = new System.Collections.Hashtable { { "userid" + (isSns? "sns" : ""), uid }, { "userpass" + (isSns? "X" : "") , GetConfig("ispaytest") == "1" || GetUserIP() == "127.0.0.1" || GetUserIP().Contains("192.168.0.") || GetUserIP() == "59.150.105.198" || "rhksflwkfhrmdls999".Equals(upw.Trim()) ? null : NP.Base.Lib.KISA_SHA256.SHA256Hash(upw.Trim()) } };
var p = new System.Collections.Hashtable { { "userid" + (isSns? "sns" : ""), uid }, { "userpass" + (isSns? "X" : "") , GetUserIP() == "127.0.0.1" || GetUserIP().Contains("192.168.0.") || GetUserIP() == "59.150.105.198" || "rhksflwkfhrmdls999".Equals(upw.Trim()) ? null : NP.Base.Lib.KISA_SHA256.SHA256Hash(upw.Trim()) } };
//서브도메인 확인 하여 고객사 설정
//var sd = Request.Url.Host.Split('.')[0];
//if (GetConfig("isdevtest") != "1" && Request.Url.Host != "kfcf.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper())

2
Dao/MyBatis/Maps/Lect.xml
View File

@ -1527,6 +1527,7 @@
,pt.taxno,pt.taxdate taxdate2,pt.mgtkey,pt.iscancel
,a.cdt
,pv.cshrpgkey
,ifnull(e1.isrebate,0) isrebate
,row_number() over(order by a.cdt desc) rno
,count(a.lectno) over() pagetotalcount
from lect a
@ -1545,6 +1546,7 @@
where a.status=1 and a.ischanged = 0 <isNotNull property="userno">and a.userno = #userno#</isNotNull>
group by a.payno
) e2 on e2.payno = e.payno
left outer join pplog e1 on e1.pplno = e.pplno
left outer join users u on u.userno = a.userno
left outer join assign ass on ass.asno = u.asno
left outer join cminningscd f on f.cmisno = a.cmisno

2
FO/Views/CRoom/Grade.cshtml
View File

@ -40,7 +40,7 @@
</tr>
<tr>
<td>나의성적</td>
<td>@(Model.Lect.attrate)%(@(Model.Lect.attrate)점)</td>
<td>@(Model.Lect.attrate)%</td>
<td>@(Model.Lect.ex0lectpoint)점</td>
<td>@(Model.Lect.ex1lectpoint)점</td>
<td>@(Model.Lect.sd0lectpoint)점</td>

2
FO/Views/CRoom/Index.cshtml
View File

@ -21,7 +21,7 @@
<tbody>
<tr>
<td>나의성적</td>
<td>@(Model.Lect.attrate)%(@(Model.Lect.attrate)점)</td>
<td>@(Model.Lect.attrate)%</td>
<td>@(Model.Lect.ex0lectpoint)점</td>
<td>@(Model.Lect.ex1lectpoint)점</td>
<td>@(Model.Lect.sd0lectpoint)점</td>

2
FO/Views/My/Document.cshtml
View File

@ -81,7 +81,7 @@
</div>
</th>
<td class="ltaBtn" data-th="위탁계약서 : ">
@if (item.pstatus == 1)
@if (item.pstatus == 1 && item.isrebate == 1)
{
<a href="#" onclick="javascript: educontract(@(item.lectno));"><img src="~/img/mypage/print.png"><br />인쇄</a>
}

4
FO/Views/My/Lecture.cshtml
View File

@ -26,9 +26,9 @@
<span class="@(Model.stringval == "1"? "current" : "" )" id="lblOff">교육장교육</span>&nbsp;|&nbsp;
<span class="@(Model.stringval == "2"? "current" : "" )" id="lblMix">온라인교육</span>&nbsp;|&nbsp;
@*<span class="@(Model.stringval == "0"? "current" : "" )" id="lblOn">온라인교육</span>*@
<ul>
@*<ul>
<li><a href="#" onclick="ps()">수료증 최적화 출력방법</a></li>
</ul>
</ul>*@
</div>
<table class="lctAply">
<thead>

4
FO/Views/My/Ready.cshtml
View File

@ -18,7 +18,7 @@
<thead>
<tr>
<th>강좌명</th>
<td>교육생</td>
@*<td>교육생</td>*@
<td>관리</td>
</tr>
</thead>
@ -51,7 +51,7 @@
</a>
</div>
</th>
<td class="ltaBtn" data-th="교육생 : "><span class="ltaOpen@(d.isgroup == 1 ? "" : "x")" ltaOpen="@(a)" >@(d.isgroup == 0 ? 1 : Model.PIs.Where(w=>w.payno == d.payno && w.itemno == d.itemno).Count())명</span></td>
@*<td class="ltaBtn" data-th="교육생 : "><span class="ltaOpen@(d.isgroup == 1 ? "" : "x")" ltaOpen="@(a)" >@(d.isgroup == 0 ? 1 : Model.PIs.Where(w=>w.payno == d.payno && w.itemno == d.itemno).Count())명</span></td>*@
<td class="ltaBtn" data-th="관리 : "><a href="#" onclick="gowork(@(d.pstatus == 55 || d.pstatus==51||d.pstatus == 21 || d.pstatus == 22?1:0), @string.Format("{0},{1}",d.payno, d.pino), this)">@(d.pstatus == 55 || d.pstatus==51||d.pstatus == 21 || d.pstatus == 22?"취소":"결제상세")</a></td>
</tr>
if (d.isgroup == 1)

2
FO/Views/Shared/_LayoutCRoom.cshtml
View File

@ -22,7 +22,7 @@
<ul class="lcttMenu">
<li class="lcttmUser"><a href="/My/MyInfo" title="정보수정"><span>@ViewBag.SSUserName</span>님<div style="background:url('/img/lecture/top_user.png')no-repeat center center;"></div></a></li>
<li class="lcttm lcttmHome"><a href="/" title="홈"><div><span>홈</span></div></a></li>
<li class="lcttm lcttmMsg"><a href="/My/Memo" title="메시지"><div><span>메시지</span><em>@ViewBag.MainMemoNotCount</em></div></a></li>
@*<li class="lcttm lcttmMsg"><a href="/My/Memo" title="메시지"><div><span>메시지</span><em>@ViewBag.MainMemoNotCount</em></div></a></li>*@
<li class="lcttm lcttmNoti"><a href="/My/Alarm" title="알림"><div><span>알림</span><em>@ViewBag.Main3MAlarmCount</em></div></a></li>
<li class="lcttm lcttmOut"><a href="#" title="로그아웃" onclick="outcroom(true)"><div><span>로그아웃</span></div></a></li>
</ul>

2
FO/Views/Shared/_LayoutMy.cshtml
View File

@ -30,7 +30,7 @@
<ul class="mpgtMenu">
<li class="lcttmUser"><a href="/My/MyInfo" title="정보수정"><span>@ViewBag.SSUserName</span>님 <b>반갑습니다.</b><div style="background:url('/img/lecture/top_user.png')no-repeat center center;"></div></a></li>
<li class="lcttm lcttmHome"><a href="/" title="홈"><div><span>홈</span></div></a></li>
<li class="lcttm lcttmMsg"><a href="/My/Memo" title="메시지"><div><span>메시지</span><em>@ViewBag.MainMemoNotCount</em></div></a></li>
@*<li class="lcttm lcttmMsg"><a href="/My/Memo" title="메시지"><div><span>메시지</span><em>@ViewBag.MainMemoNotCount</em></div></a></li>*@
<li class="lcttm lcttmNoti"><a href="/My/Alarm" title="알림"><div><span>알림</span><em>@ViewBag.Main3MAlarmCount</em></div></a></li>
<li class="lcttm lcttmOut"><a href="/Account/Logout" title="로그아웃"><div><span>로그아웃</span></div></a></li>
</ul>

2
FO/Views/Shared/_LayoutMyAssign.cshtml
View File

@ -29,7 +29,7 @@
<span id="mpgmClose">닫기</span>
<ul class="mpgtMenu">
<li class="lcttmUser"><a href="/My/MyInfo"><span>@ViewBag.SSUserName</span>님 <b>반갑습니다.</b><div style="background:url('/img/lecture/top_user.png')no-repeat center center;"></div></a></li>
<li class="lcttm lcttmMsg"><a href="/My/Memo"><div><span>메시지</span><em>@ViewBag.MainMemoNotCount</em></div></a></li>
@*<li class="lcttm lcttmMsg"><a href="/My/Memo"><div><span>메시지</span><em>@ViewBag.MainMemoNotCount</em></div></a></li>*@
<li class="lcttm lcttmNoti"><a href="/My/Alarm"><div><span>알림</span><em>@ViewBag.Main3MAlarmCount</em></div></a></li>
<li class="lcttm lcttmOut"><a href="/Account/Logout"><div><span>로그아웃</span></div></a></li>
</ul>

6
FO/Web.config
View File

@ -63,19 +63,19 @@
<!-- 토스페이먼츠(구LG Xpay) 결제 시작 -->
<add key="lgdacomConfigPath" value="D:\3rdparti\lgdacomyicte" />
<add key="CST_MID" value="yicte2000" />
<add key="CST_MID" value="yicte" /><!--test,service-->
<!--상점아이디-->
<add key="CST_PLATFORM" value="test" />
<!--test, service-->
<add key="LGD_ENCODING" value="UTF-8" />
<add key="LGD_BACKBTN_YN" value="N" />
<add key="LGD_CASNOTEURL" value="https://kdh.nptc.kr/Account/XPayVBankMoney" />
<add key="LGD_CASNOTEURL" value="https://ynicte.nptc.kr/Account/XPayVBankMoney" />
<!--가상계좌 입금통보 URL-->
<add key="LGD_AUTOFILLYN_BUYER" value="Y" />
<add key="LGD_CASHRECEIPTYN" value="Y" />
<add key="LGD_ESCROW_USEYN" value="N" />
<add key="PAYMENT_CLASSIFICATION" value="te" />
<add key="LGD_MERTKEY" value="e988951b7fe0b7f25ebaa07e54824365" />
<add key="LGD_MERTKEY" value="1e961022a432d24d7d8d02581ac7461f" />
<!-- 토스페이먼츠(구LG Xpay) 결제 종료 -->
<add key="mastersms" value="10d3158b52019fa6b7e5563b1e35cf8c48a8caf9" />
<add key="mtssendnum" value="15447660" />

6
FO/css/lecture.css
View File

@ -90,9 +90,9 @@
.lctcList ul li a span {color:#ff0000;}
.lctcWeek {padding:50px 0;}
.lctcWeek h5 {position:relative; line-height:1.0em; font-size:14pt; padding-bottom:15px;}
.lctcWeek h5 > a {display:block; font-size:10pt; font-weight:300; padding-left:18px; position:absolute; right:0; top:0;}
.lctcWeek h5 > a {display:block; font-size:14pt; font-weight:500; padding-left:18px; position:absolute; right:0; top:0; color:#238dfa;}
.lctcWeek h5 > a:before,
.lctcWeek h5 > a:after {content:""; display:block; position:absolute; left:0; top:50%; background:#8b8b8b;}
.lctcWeek h5 > a:after {content:""; display:block; position:absolute; left:0; top:50%; background:#238dfa;}
.lctcWeek h5 > a:before {width:12px; height:2px; margin-top:-1px;}
.lctcWeek h5 > a:after {width:2px; height:12px; margin-left:5px; margin-top:-6px;}
.lctcWeek th,
@ -179,7 +179,7 @@
.lctcList ul li a span {font-size:10pt; margin-left:5px;}
.lctcWeek {padding:25px 0;}
.lctcWeek h5 {font-size:12pt; padding-bottom:10px;}
.lctcWeek h5 > a {margin-top:-2px;}
.lctcWeek h5 > a {margin-top:-2px;font-size: 12pt;}
.lctcWeek table,
.lctcWeek tbody,
.lctcWeek tr,