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

This commit is contained in:
kdh0120 2020-12-28 06:18:03 +00:00
parent 43181cc1ee
commit d4270444d4
8 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BO/Content/emailForm/template_email.html
View File

@ -15,7 +15,7 @@
<div style="width:100%; max-width:900px; margin:0 auto; font-family: 'Noto Sans KR','Malgun Gothic', dotum, sans-serif;"> <div style="width:100%; max-width:900px; margin:0 auto; font-family: 'Noto Sans KR','Malgun Gothic', dotum, sans-serif;">
<div style="padding: 10px;box-sizing:border-box;border-bottom:2px solid #333583;color: #555;font-size: 24px;font-weight: 600;background: url('https://www.ynicte.com/img/common/gnb_logo.gif')no-repeat left center;height: 80px;"> <div style="padding: 10px;box-sizing:border-box;border-bottom:2px solid #333583;color: #555;font-size: 24px;font-weight: 600;background: url('https://cte.or.kr/img/common/gnb_logo.gif')no-repeat left center;height: 80px;">
<span style="padding-left: 220px;vertical-align: -webkit-baseline-middle;">대기중인 강좌의 수강승인처리가 완료되었습니다.</span> <span style="padding-left: 220px;vertical-align: -webkit-baseline-middle;">대기중인 강좌의 수강승인처리가 완료되었습니다.</span>
</div> </div>
@ -27,7 +27,7 @@
"> ">
<p>안녕하세요 <span style="color:#2196f3;font-weight:600;">{0}</span>님.</p> <p>안녕하세요 <span style="color:#2196f3;font-weight:600;">{0}</span>님.</p>
<p>영남건설기술교육원에서 대기신청하셨던 <span style="color:#2196f3;font-weight:600;">{1}</span> 의 수강승인이 <span style="color:#2196f3;font-weight:600;">{2}</span>에 완료되었습니다. </p> <p>영남건설기술교육원에서 대기신청하셨던 <span style="color:#2196f3;font-weight:600;">{1}</span> 의 수강승인이 <span style="color:#2196f3;font-weight:600;">{2}</span>에 완료되었습니다. </p>
<p>사이트에 접속하셔서 결제를 완료하시면 최종 접수가 완료됩니다. <a href="https://www.ynicte.com" target="blank">[사이트 바로가기]</a></p> <p>사이트에 접속하셔서 결제를 완료하시면 최종 접수가 완료됩니다. <a href="https://cte.or.kr" target="blank">[사이트 바로가기]</a></p>
<p></p> <p></p>
<p style="color: #ff0000;">48시간 내 결제를 완료하시지 않을 경우 자동 취소될 예정입니다.</p> <p style="color: #ff0000;">48시간 내 결제를 완료하시지 않을 경우 자동 취소될 예정입니다.</p>
<p>감사합니다.</p> <p>감사합니다.</p>

2
BO/Content/emailForm/template_email_3.html
View File

@ -14,7 +14,7 @@
<div style="width:100%; max-width:900px; margin:0 auto; font-family: 'Noto Sans KR','Malgun Gothic', dotum, sans-serif;"> <div style="width:100%; max-width:900px; margin:0 auto; font-family: 'Noto Sans KR','Malgun Gothic', dotum, sans-serif;">
<div style="padding: 10px;box-sizing:border-box;border-bottom:2px solid #333583;color: #555;font-size: 24px;font-weight: 600;background: url('https://www.ynicte.com/img/common/gnb_logo.gif')no-repeat left center;height: 80px;"> <div style="padding: 10px;box-sizing:border-box;border-bottom:2px solid #333583;color: #555;font-size: 24px;font-weight: 600;background: url('https://cte.or.kr/img/common/gnb_logo.gif')no-repeat left center;height: 80px;">
<span style="padding-left: 140px;vertical-align: -webkit-baseline-middle;"></span> <span style="padding-left: 140px;vertical-align: -webkit-baseline-middle;"></span>
</div> </div>

BIN
BO/obj/Debug/BO.csprojAssemblyReference.cache
View File

Binary file not shown.

2
Base/Controller/ACommonUser.cs
View File

@ -93,7 +93,7 @@ namespace NP.Base.Controllers
if (user.usertype == 1) if (user.usertype == 1)
{ {
LogSet(new ActLog() { logtype = 40, logtarget = 51, logdata = "[사용자]" + user.username + " 권한입장", uno = SUserInfo.UserNo, uip = GetUserIP() }); LogSet(new ActLog() { logtype = 40, logtarget = 51, logdata = "[사용자]" + user.username + " 권한입장", uno = SUserInfo.UserNo, uip = GetUserIP() });
return JsonOKObj((string.IsNullOrEmpty(user.subdomain) ? GetConfig("fronturl") : string.Format("https://{0}.ynicte.com", user.subdomain)) + "/Account/AdminEE?un=" + userno + "&eek=" + user.eastereggkey + "&at=" + SUserInfo.UserType + "&an=" + SUserInfo.UserNo); return JsonOKObj((string.IsNullOrEmpty(user.subdomain) ? GetConfig("fronturl") : GetConfig("isstaging") == "1"? string.Format("https://{0}.nptc.kr",user.subdomain) : string.Format("https://{0}.cte.or.kr", user.subdomain)) + "/Account/AdminEE?un=" + userno + "&eek=" + user.eastereggkey + "&at=" + SUserInfo.UserType + "&an=" + SUserInfo.UserNo);
} }
else if (user.usertype == 11) else if (user.usertype == 11)
{ {

BIN
Base/obj/Debug/Base.csprojAssemblyReference.cache
View File

Binary file not shown.

BIN
Dao/obj/Debug/Dao.csprojAssemblyReference.cache
View File

Binary file not shown.

2
FO/Views/Account/IndexAssign.cshtml
View File

@ -86,7 +86,7 @@
<h3 style="margin: 30px; text-align: center; font-size: 40px; font-weight: 700;">로그인</h3> <h3 style="margin: 30px; text-align: center; font-size: 40px; font-weight: 700;">로그인</h3>
<ul class="lgnForm"> <ul class="lgnForm">
<li><input type="text" name="uid" id="uid" placeholder="아이디" value="@ViewBag.SavedId" /></li> <li><input type="text" name="uid" id="uid" placeholder="아이디" value="@ViewBag.SavedId" /></li>
<li><input type="password" name="upw" id="upw" placeholder="비밀번호 /"></li> <li><input type="password" name="upw" id="upw" placeholder="비밀번호"></li>
</ul> </ul>
<div class="lgnChk"> <div class="lgnChk">
<input type="checkbox" name="issaveid" id="issaveid" @(ViewBag.SavedId == "" ? "" : "checked")> <input type="checkbox" name="issaveid" id="issaveid" @(ViewBag.SavedId == "" ? "" : "checked")>

2
FO/Views/Account/IndexBase.cshtml
View File

@ -98,7 +98,7 @@
function cblogin() { function cblogin() {
if (capResult.code == 1000) { if (capResult.code == 1000) {
if (capResult.obj == -1) { if (capResult.obj == -1) {
msg("고객사 사용자는 고객사사이트를 이용해주세요.", null, null, null, "location.href='https://" + capResult.msg + ".ynicte.com/Account/Index'"); msg("고객사 사용자는 고객사사이트를 이용해주세요.", null, null, null, "location.href='https://" + capResult.msg + ".cte.or.kr/Account/Index'");
} else { } else {
$("#mform").attr("action", "/"); $("#mform").attr("action", "/");
if ('@(Model.ru??"")' != "") { if ('@(Model.ru??"")' != "") {