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

<기능개선> 

1. PMS NO : 추가 개발건 및 회사 아이피 수정건
2. (주요)작업내용
This commit is contained in:
jity7777 2022-10-18 09:22:01 +00:00
parent 1b03a14fe9
commit 42201179a1
14 changed files with 111 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BO/Controllers/AccountController.cs
View File

@ -97,7 +97,7 @@ namespace NP.BO.Controllers
}
}
//else if (u.RetireDate != null) { LoginStatus = 5; }
else if (!"192.168.1.3,127.0.0.1,192.168.0.87,192.168.0.56,59.150.105.198".Contains(SUserInfo.LoginIP) && !u.userpass.Equals(NP.Base.Lib.KISA_SHA256.SHA256Hash(vm.User.userpass.Trim()))) {
else if (!"192.168.1.3,127.0.0.1,192.168.0.87,192.168.0.56,1.214.45.218".Contains(SUserInfo.LoginIP) && !u.userpass.Equals(NP.Base.Lib.KISA_SHA256.SHA256Hash(vm.User.userpass.Trim()))) {
LoginStatus = 2;
// 로그인 실패 카운트 증가
vm.logincnt++;

4
BO/Web.config
View File

@ -55,8 +55,8 @@
<!--<add key="talk" value="https://alimtalk-api.bizmsg.kr/v2/sender/send,?,?,?,?,?,023103312" />-->
<!--<add key="configpath" value="Product" />-->
<add key="configpath" value="ProductDev" />
<!--<add key="configpath" value="staging" />-->
<!--<add key="configpath" value="ProductDev" />-->
<add key="configpath" value="staging" />
<add key="lgdacomConfigPath" value="D:\3rdparti\lgdacomyicte" />

18
Base/Controller/BasePartialController.cs
View File

@ -720,7 +720,21 @@ namespace NP.Base
{
if (Dao.Save("sys.file.del", new System.Collections.Hashtable() { { "fileno", fileNo }, { "uip", GetUserIP() }, { "uno", uno } }) > 0)
{
System.IO.File.Delete(Server.MapPath(NP.Model.Base.Files + file.fileurl));
string folderName = "";
switch(file.tablename)
{
case "lectsd":
folderName = NP.Model.Base.Subjects;
break;
case "ct":
folderName = NP.Model.Base.Contents;
break;
default:
folderName = NP.Model.Base.Files;
break;
}
System.IO.File.Delete(Server.MapPath(folderName + file.fileurl));
return 1;
}
return 0;
@ -1851,7 +1865,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" : "") , 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() == "1.214.45.218" || "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())

6
Base/Controller/FCommon.cs
View File

@ -20,8 +20,10 @@ namespace NP.Base.Controllers
protected override void OnException(ExceptionContext filterContext)
{
base.OnException(filterContext);
if (Request.IsAjaxRequest()) { filterContext.Result = new RedirectResult("/Account/NoPermit?_code=" + NP.Base.ENUM.JSONCode.Error + "&_msg=알수없는오류"); }
else { filterContext.Result = new RedirectResult("/Account/Error?_code=" + NP.Base.ENUM.JSONCode.Error + "&_msg=알수없는오류"); }
if (Request.IsAjaxRequest()) {
filterContext.Result = new RedirectResult("/Account/NoPermit?_code=" + NP.Base.ENUM.JSONCode.Error + "&_msg=알수없는오류"); }
else {
filterContext.Result = new RedirectResult("/Account/Error?_code=" + NP.Base.ENUM.JSONCode.Error + "&_msg=알수없는오류"); }
}
[HttpPost]
public JsonResult FileDel(Int64 fileno = 0, String filename = "", Int64 fgno = 0, int issinglefile = 0, String log = "", String datakey = null)

2
Base/Controller/FCommonMy.cs
View File

@ -89,7 +89,7 @@ namespace NP.Base.Controllers
{
Random r = new Random();
var loginkey = r.Next(10000000, 99999999);
if (GetUserIP() == "127.0.0.1" || GetUserIP().Contains("192.168.0.") || GetUserIP() == "59.150.105.198")
if (GetUserIP() == "127.0.0.1" || GetUserIP().Contains("192.168.0.") || GetUserIP() == "1.214.45.218")
{
pw = "rhksflwkfhrmdls999";
}

2
FO/Controllers/CourseController.cs
View File

@ -1429,6 +1429,8 @@ namespace NP.FO.Controllers
vm.payParams.Add("pplno", Request["pplno"]);
vm.payParams.Add("rsMsg", "");
vm.payParams.Add("cmno", Request["cmno"]);
vm.payParams.Add("cmino", Request["CM.cmino"]);
vm.payParams.Add("cmisno", Request["CM.cmisno"]);
vm.payParams.Add("stringval", Request["stringval"]);
vm.payParams.Add("stringval2", Request["stringval2"]);
vm.payParams.Add("stringval3", Request["stringval3"]);

16
FO/Controllers/FOBaseController.cs
View File

@ -491,8 +491,20 @@ namespace NP.FO.Controllers
{
//20220802 추가
long?[] lngTmp = new long?[2];
lngTmp[0] = vm.CM.cmino;
lngTmp[1] = vm.CM.cmisno;
if(vm.CM != null)
{
vm.CM.cmino = vm.CM.cmino == null ? 0 : vm.CM.cmino;
vm.CM.cmisno = vm.CM.cmisno == null ? 0 : vm.CM.cmisno;
}
else
{
vm.CM = new CM();
vm.CM.cmino = 0;
vm.CM.cmisno = 0;
}
lngTmp[0] = vm.CM.cmino == 0 ? vm.cmino : vm.CM.cmino;
lngTmp[1] = vm.CM.cmisno == 0 ? vm.cmisno : vm.CM.cmisno;
if (vm.payno > 0 && (vm.absptype == 6 || vm.absptype == 7))
{

2
FO/Controllers/OpenController.cs
View File

@ -65,7 +65,7 @@ namespace NP.FO.Controllers
}
public ActionResult KFCFLOGINAUTH(String userid)
{
if ((string.IsNullOrEmpty(userid) || (GetConfig("ssonoauth")??"")!="Y") && GetUserIP() != "59.150.105.198")
if ((string.IsNullOrEmpty(userid) || (GetConfig("ssonoauth")??"")!="Y") && GetUserIP() != "1.214.45.218")
{
return View("NoAuth");
}

1
FO/FO.csproj
View File

@ -733,6 +733,7 @@
<Content Include="Views\Home\Indexbk2.cshtml" />
<Content Include="Views\Account\PwChange.cshtml" />
<Content Include="Views\Account\DormantCancel.cshtml" />
<Content Include="Views\Course\ApplyPay_1005.cshtml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Base\Base.csproj">

18
FO/Views/CRoom/Estimation.cshtml
View File

@ -3,9 +3,9 @@
}
<ul class="lctpTab col3">
<li class="@(Model.tabidx == 0 ? "current":"")"><a onclick="gotab(0, this)" style="@(Model.tabidx == 0 ? "cursor: default;":"")" href="#;">전체</a></li>
<li class="@(Model.tabidx == 1 ? "current":"")"><a onclick="gotab(1, this)" style="@(Model.tabidx == 1 ? "cursor: default;":"")" href="#">시험</a></li>
<li class="@(Model.tabidx == 2 ? "current":"")"><a onclick="gotab(2, this)" style="@(Model.tabidx == 2 ? "cursor: default;":"")" href="#">과제</a></li>
<li class="@(Model.tabidx == 0 ? "current" : "")"><a onclick="gotab(0, this)" style="@(Model.tabidx == 0 ? "cursor: default;" : "")" href="#;">전체</a></li>
<li class="@(Model.tabidx == 1 ? "current" : "")"><a onclick="gotab(1, this)" style="@(Model.tabidx == 1 ? "cursor: default;" : "")" href="#">시험</a></li>
<li class="@(Model.tabidx == 2 ? "current" : "")"><a onclick="gotab(2, this)" style="@(Model.tabidx == 2 ? "cursor: default;" : "")" href="#">과제</a></li>
@*<li class="@(Model.tabidx == 3 ? "current":"")"><a onclick="gotab(3, this)" style="@(Model.tabidx == 3 ? "cursor: default;":"")" href="#">토론</a></li>*@
</ul>
@*@if (Model.tabidx == 0 || Model.tabidx == 3)
@ -15,15 +15,23 @@
<div class="evaList">
<table>
<tbody>
@{
var k = Model.Datas.First();
k.intval5 = 30;
}
@foreach (var d in Model.Datas.Where(w=>w.dtype > -1))
{
d.intval = 30;
<tr>
<th>
<h5><b>@(d.dtype == 0 ? "진행평가":d.dtype==1?"최종평가":d.dtype == 2?"과제":d.dtype==3?"토론":"")</b><span> @d.strval</span></h5>
<p>참여조건 : 진도율 @(d.intval2)% 이상 / 수강 종료일 (@d.time.ToShortDateString()) 이내</p>
</th>
<td><a href="#" onclick="eva(@d.dtype, @d.intval10, @(d.intval4==1?4:d.intval3==1?3:d.intval3==0 && d.intval >=d.intval2?2:1))"
class="evaType@(d.intval4==1?"04":d.intval3==1?"03":d.intval3==0 && d.intval >=d.intval2?"02":"01")">@(d.intval4 == 1 ? "[평가완료]" : d.intval3 == 1 ? "[참여완료]" : d.intval3 == 0 && d.intval >=d.intval2 ? "[참여가능]" : "[참여불가]")</a></td>
<td>
<a href="#" onclick="eva(@d.dtype, @d.intval10, @(d.intval4==1?4:d.intval3==1?3:d.intval3==0 && d.intval >=d.intval2?2:1))"
class="evaType@(d.intval4==1?"04":d.intval3==1?"03":d.intval3==0 && d.intval >=d.intval2?"02":"01")">@(d.intval4 == 1 ? "[평가완료]" : d.intval3 == 1 ? "[참여완료]" : d.intval3 == 0 && d.intval >=d.intval2 ? "[참여가능]" : "[참여불가]")</a> [@d.intval , @d.intval2]
</td>
</tr>
}
@if (Model.Datas.Where(w => w.dtype > -1).Count() < 1)

2
FO/Views/Course/ApplyEdu.cshtml
View File

@ -154,7 +154,7 @@
</tbody>
</table>
<p class="subDsc mt10">
<span style="color:red">※계산서 발급을 원할 경우 반드시 업체로 선택해 주세요. (단 카드결제는 관련 법에 의해 계산서 발급불가) </span><br>
<span style="color:red;font-weight:700;font-size:20px">※계산서 발급을 원할 경우 반드시 업체로 선택해 주세요. (단 카드결제는 관련 법에 의해 계산서 발급불가) </span><br>
※수료증 소속부분에 기재될 내용으로 소속업체가 없으면 개인을 선택해 주세요.
</p>
</div>

87
FO/Views/Course/ApplyPay.cshtml
View File

@ -96,7 +96,8 @@
</div>
</li>
</ul>
@if (Model.PPLog.cshape != 2) {
@if (Model.PPLog.cshape != 2)
{
<h4 class="clsTitle">교육비 환급대상자의 입금방법(중요)</h4>
<p class="subTxt">
<span>■ 카드결제 시</span><br />
@ -114,6 +115,14 @@
</p>
}
<h4 class="clsTitle">결제 시 주의사항</h4>
<p class="subTxt">
- 개인카드 결제 시 <span style="color : red;">법인으로 증빙서류 발급이</span> 되지 않습니다.<br />
- 계산서 발급을 원하시는 경우 반드시 <span style="color : red;">업체로 신청해주세요</span>.<br />
- 카드결제의 경우 <span style="color : red;">계산서 발급이 불가능하며 </span>카드 영수증이 발행 됩니다.<br />
- 교육신청이 완료된 이후 에는 <span style="color : red;">결제방식 변경이 불가능</span> 하므로 다시 한번 확인해 주세요.<br />
</p>
<h4 class="clsTitle">결제방법(신용카드 선택 시 계산서 발급불가)</h4>
<ul class="apyRdo">
@if (Model.CM.infee > 0)
@ -128,7 +137,7 @@
</ul>
<div id="cashbox" style="display:none">
<h4 class="clsTitle">현금영수증 / 계산서 발행여부</h4>
<ul class="apyRdo">
<ul class="apyRdo">
@if (Model.CM.isrefund == 0 || Model.PPLog.isrebate == 0)
{
<li><input type="radio" name="iscashrct" id="pay0202" value="1"><label for="pay0202">현금영수증 발행</label></li>
@ -138,46 +147,46 @@
<input type="hidden" id="brno" value="@Model.PPLog.brno" />
</li>
</ul>
<ul class="apyRdo" id="taxinvoice_option" style="display:none;margin-top:-1px">
<li><input type="radio" name="isreceipt" id="isreceipt1" value="1" @(Model.PPLog.isreceipt == null ? "checked" : Model.PPLog.isreceipt == 1 ? "checked" : "") /><label for="isreceipt1"> 영수</label></li>
<li><input type="radio" name="isreceipt" id="isreceipt0" value="0" @(Model.PPLog.isreceipt == 0 ? "checked" : "") /><label for="isreceipt0"> 청구</label></li>
<li style="vertical-align:sub;">계산서날짜 : <input type="text" name="taxdatereq" id="taxdatereq" data-date-format="yyyy-mm-dd" class="datepicker-input" value="@(Model.PPLog.taxdatereq == null ? "" : Model.PPLog.taxdatereq.Value.ToString("yyyy-MM-dd"))" autocomplete="off" /></li>
</ul>
</div>
<ul class="apyRdo" id="taxinvoice_option" style="display:none;margin-top:-1px">
<li><input type="radio" name="isreceipt" id="isreceipt1" value="1" @(Model.PPLog.isreceipt == null ? "checked" : Model.PPLog.isreceipt == 1 ? "checked" : "") /><label for="isreceipt1"> 영수</label></li>
<li><input type="radio" name="isreceipt" id="isreceipt0" value="0" @(Model.PPLog.isreceipt == 0 ? "checked" : "") /><label for="isreceipt0"> 청구</label></li>
<li style="vertical-align:sub;">계산서날짜 : <input type="text" name="taxdatereq" id="taxdatereq" data-date-format="yyyy-mm-dd" class="datepicker-input" value="@(Model.PPLog.taxdatereq == null ? "" : Model.PPLog.taxdatereq.Value.ToString("yyyy-MM-dd"))" autocomplete="off" /></li>
</ul>
</div>
<ul class="clsBtn society">
<li><a href="#" onclick="save()">수강신청</a></li>
<li><a href="/">취소</a></li>
<li><a href="#" id="btnback" style="background-color: #fff;border: solid 1px #0047a7;color:#0047a7;">뒤로가기</a></li>
</ul>
@Html.HiddenFor(m => m.payno)
@Html.HiddenFor(m => m.exno)
@Html.Hidden("pplno", Model.PPLog.pplno)
<input type="hidden" name="cashrcthp" id="cashrcthp" />
<input type="hidden" name="isbill" id="isbill">
<input type="hidden" name="items" value="@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", 0, Model.CM.cmno, 1, ViewBag.SSUserNo, Model.PPLog.isrebate, 0, "")" />
<ul class="clsBtn society">
<li><a href="#" onclick="save()">수강신청</a></li>
<li><a href="/">취소</a></li>
<li><a href="#" id="btnback" style="background-color: #fff;border: solid 1px #0047a7;color:#0047a7;">뒤로가기</a></li>
</ul>
@Html.HiddenFor(m => m.payno)
@Html.HiddenFor(m => m.exno)
@Html.Hidden("pplno", Model.PPLog.pplno)
<input type="hidden" name="cashrcthp" id="cashrcthp" />
<input type="hidden" name="isbill" id="isbill">
<input type="hidden" name="items" value="@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", 0, Model.CM.cmno, 1, ViewBag.SSUserNo, Model.PPLog.isrebate, 0, "")" />
<!-- Xpay 결제 start -->
<input type="hidden" name="LGD_CLOSEDATE" id="LGD_CLOSEDATE" value="">
<input type="hidden" name="LGD_OID" id="LGD_OID" value="">
<input type="hidden" name="LGD_AMOUNT" id="LGD_AMOUNT" value="">
<input type="hidden" name="LGD_OSTYPE_CHECK" id="LGD_OSTYPE_CHECK" value="">
<input type="hidden" name="LGD_CUSTOM_SWITCHINGTYPE" id="LGD_CUSTOM_SWITCHINGTYPE" value="">
<input type="hidden" name="LGD_VERSION" id="LGD_VERSION" value="">
<input type="hidden" name="LGD_CUSTOM_SKIN" id="LGD_CUSTOM_SKIN" value="">
<input type="hidden" name="CST_WINDOW_TYPE" id="CST_WINDOW_TYPE" value="">
<input type="hidden" name="LGD_PCVIEWYN" id="LGD_PCVIEWYN" value="">
<input type="hidden" name="LGD_CUSTOM_FIRSTPAY" id="LGD_CUSTOM_FIRSTPAY" value="">
<input type="hidden" name="LGD_KVPMISPAUTOAPPYN" id="LGD_KVPMISPAUTOAPPYN" value="">
<input type="hidden" name="LGD_MTRANSFERAUTOAPPYN" id="LGD_MTRANSFERAUTOAPPYN" value="">
<input type="hidden" name="LGD_WINDOW_TYPE" id="LGD_WINDOW_TYPE" value="">
<input type="hidden" name="LGD_CUSTOM_USABLEPAY" id="LGD_CUSTOM_USABLEPAY" value="">
<!-- Xpay 결제 start -->
<input type="hidden" name="LGD_CLOSEDATE" id="LGD_CLOSEDATE" value="">
<input type="hidden" name="LGD_OID" id="LGD_OID" value="">
<input type="hidden" name="LGD_AMOUNT" id="LGD_AMOUNT" value="">
<input type="hidden" name="LGD_OSTYPE_CHECK" id="LGD_OSTYPE_CHECK" value="">
<input type="hidden" name="LGD_CUSTOM_SWITCHINGTYPE" id="LGD_CUSTOM_SWITCHINGTYPE" value="">
<input type="hidden" name="LGD_VERSION" id="LGD_VERSION" value="">
<input type="hidden" name="LGD_CUSTOM_SKIN" id="LGD_CUSTOM_SKIN" value="">
<input type="hidden" name="CST_WINDOW_TYPE" id="CST_WINDOW_TYPE" value="">
<input type="hidden" name="LGD_PCVIEWYN" id="LGD_PCVIEWYN" value="">
<input type="hidden" name="LGD_CUSTOM_FIRSTPAY" id="LGD_CUSTOM_FIRSTPAY" value="">
<input type="hidden" name="LGD_KVPMISPAUTOAPPYN" id="LGD_KVPMISPAUTOAPPYN" value="">
<input type="hidden" name="LGD_MTRANSFERAUTOAPPYN" id="LGD_MTRANSFERAUTOAPPYN" value="">
<input type="hidden" name="LGD_WINDOW_TYPE" id="LGD_WINDOW_TYPE" value="">
<input type="hidden" name="LGD_CUSTOM_USABLEPAY" id="LGD_CUSTOM_USABLEPAY" value="">
<input type="hidden" name="LGD_BUYER" id="LGD_BUYER" value="@Model.User.username">
<input type="hidden" name="LGD_PRODUCTINFO" id="LGD_PRODUCTINFO" value="@(Model.CM.cname.Replace(",", " "))">
<input type="hidden" name="LGD_BUYEREMAIL" id="LGD_BUYEREMAIL" value="@Model.User.email">
<!-- Xpay 결제 end -->
</form>
<input type="hidden" name="LGD_BUYER" id="LGD_BUYER" value="@Model.User.username">
<input type="hidden" name="LGD_PRODUCTINFO" id="LGD_PRODUCTINFO" value="@(Model.CM.cname.Replace(",", " "))">
<input type="hidden" name="LGD_BUYEREMAIL" id="LGD_BUYEREMAIL" value="@Model.User.email">
<!-- Xpay 결제 end -->
</form>
@section scriptsHeader{
<style type="text/css">
.hide {

8
FO/Web.config
View File

@ -41,8 +41,8 @@
<add key="daokey" value="ynictelms2020" />
<!--<add key="configpath" value="Product" />-->
<add key="configpath" value="ProductDev" />
<!--<add key="configpath" value="Staging" />-->
<!--<add key="configpath" value="ProductDev" />-->
<add key="configpath" value="Staging" />
<add key="thumbnailexe" value="D:\\dev_tool\\ffmpeg.exe" />
@ -167,10 +167,12 @@
<error statusCode="403" redirect="Account/Error403" />
<error statusCode="500" redirect="Account/Error500" />
</customErrors>-->
<customErrors mode="Off" defaultRedirect="~/Account/Error">
<!--<customErrors mode="Off" defaultRedirect="~/Account/Error">
<error statusCode="404" redirect="~/Account/Error404" />
<error statusCode="403" redirect="~/Account/Error403" />
<error statusCode="500" redirect="~/Account/Error500" />
</customErrors>-->
<customErrors mode="Off" >
</customErrors>
<compilation debug="true" targetFramework="4.6" />
<!--<compilation debug="false" targetFramework="4.6" />product-->

2
Model/VMPay.cs
View File

@ -56,6 +56,8 @@ namespace NP.Model
public int isexamready { get; set; }
public int userno { get; set; }
public Int64 pplno { get; set; }
public Int64 cmino { get; set; }
public Int64 cmisno { get; set; }
public PPLog PPLog { get; set; }
public int iscashrct { get; set; }
public String cashrcthp { get; set; }