From 42201179a1ae74a113b9c1986bd0b65c59d5ae0b Mon Sep 17 00:00:00 2001 From: jity7777 Date: Tue, 18 Oct 2022 09:22:01 +0000 Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?= =?UTF-8?q?MS=20NO=20:=20=EC=B6=94=EA=B0=80=20=EA=B0=9C=EB=B0=9C=EA=B1=B4?= =?UTF-8?q?=20=EB=B0=8F=20=ED=9A=8C=EC=82=AC=20=EC=95=84=EC=9D=B4=ED=94=BC?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=EA=B1=B4=202.=20(=EC=A3=BC=EC=9A=94)?= =?UTF-8?q?=EC=9E=91=EC=97=85=EB=82=B4=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Controllers/AccountController.cs | 2 +- BO/Web.config | 4 +- Base/Controller/BasePartialController.cs | 18 ++++- Base/Controller/FCommon.cs | 6 +- Base/Controller/FCommonMy.cs | 2 +- FO/Controllers/CourseController.cs | 2 + FO/Controllers/FOBaseController.cs | 16 ++++- FO/Controllers/OpenController.cs | 2 +- FO/FO.csproj | 1 + FO/Views/CRoom/Estimation.cshtml | 18 +++-- FO/Views/Course/ApplyEdu.cshtml | 2 +- FO/Views/Course/ApplyPay.cshtml | 87 +++++++++++++----------- FO/Web.config | 8 ++- Model/VMPay.cs | 2 + 14 files changed, 111 insertions(+), 59 deletions(-) diff --git a/BO/Controllers/AccountController.cs b/BO/Controllers/AccountController.cs index 725358e..5430965 100644 --- a/BO/Controllers/AccountController.cs +++ b/BO/Controllers/AccountController.cs @@ -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++; diff --git a/BO/Web.config b/BO/Web.config index 9b979cd..4eec37f 100644 --- a/BO/Web.config +++ b/BO/Web.config @@ -55,8 +55,8 @@ - - + + diff --git a/Base/Controller/BasePartialController.cs b/Base/Controller/BasePartialController.cs index 7f3bd6e..3ca4827 100644 --- a/Base/Controller/BasePartialController.cs +++ b/Base/Controller/BasePartialController.cs @@ -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()) diff --git a/Base/Controller/FCommon.cs b/Base/Controller/FCommon.cs index e22bfee..e7b9096 100644 --- a/Base/Controller/FCommon.cs +++ b/Base/Controller/FCommon.cs @@ -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) diff --git a/Base/Controller/FCommonMy.cs b/Base/Controller/FCommonMy.cs index b41d250..f98d313 100644 --- a/Base/Controller/FCommonMy.cs +++ b/Base/Controller/FCommonMy.cs @@ -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"; } diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index c4ff613..7dc5f06 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -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"]); diff --git a/FO/Controllers/FOBaseController.cs b/FO/Controllers/FOBaseController.cs index deb74c4..ed61dbf 100644 --- a/FO/Controllers/FOBaseController.cs +++ b/FO/Controllers/FOBaseController.cs @@ -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)) { diff --git a/FO/Controllers/OpenController.cs b/FO/Controllers/OpenController.cs index f9f0203..c817850 100644 --- a/FO/Controllers/OpenController.cs +++ b/FO/Controllers/OpenController.cs @@ -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"); } diff --git a/FO/FO.csproj b/FO/FO.csproj index 50588bc..367126b 100644 --- a/FO/FO.csproj +++ b/FO/FO.csproj @@ -733,6 +733,7 @@ + diff --git a/FO/Views/CRoom/Estimation.cshtml b/FO/Views/CRoom/Estimation.cshtml index d443252..4164a67 100644 --- a/FO/Views/CRoom/Estimation.cshtml +++ b/FO/Views/CRoom/Estimation.cshtml @@ -3,9 +3,9 @@ } @*@if (Model.tabidx == 0 || Model.tabidx == 3) @@ -15,15 +15,23 @@
+ +@{ + var k = Model.Datas.First(); + k.intval5 = 30; +} @foreach (var d in Model.Datas.Where(w=>w.dtype > -1)) { + d.intval = 30; - + } @if (Model.Datas.Where(w => w.dtype > -1).Count() < 1) diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml index 2d28aa8..ed60629 100644 --- a/FO/Views/Course/ApplyEdu.cshtml +++ b/FO/Views/Course/ApplyEdu.cshtml @@ -154,7 +154,7 @@
@(d.dtype == 0 ? "진행평가":d.dtype==1?"최종평가":d.dtype == 2?"과제":d.dtype==3?"토론":"") @d.strval

참여조건 : 진도율 @(d.intval2)% 이상 / 수강 종료일 (@d.time.ToShortDateString()) 이내

=d.intval2?"02":"01")">@(d.intval4 == 1 ? "[평가완료]" : d.intval3 == 1 ? "[참여완료]" : d.intval3 == 0 && d.intval >=d.intval2 ? "[참여가능]" : "[참여불가]") + =d.intval2?"02":"01")">@(d.intval4 == 1 ? "[평가완료]" : d.intval3 == 1 ? "[참여완료]" : d.intval3 == 0 && d.intval >=d.intval2 ? "[참여가능]" : "[참여불가]") [@d.intval , @d.intval2] +

- ※계산서 발급을 원할 경우 반드시 업체로 선택해 주세요. (단 카드결제는 관련 법에 의해 계산서 발급불가)
+ ※계산서 발급을 원할 경우 반드시 업체로 선택해 주세요. (단 카드결제는 관련 법에 의해 계산서 발급불가)
※수료증 소속부분에 기재될 내용으로 소속업체가 없으면 개인을 선택해 주세요.

diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml index 119c514..9c37c9d 100644 --- a/FO/Views/Course/ApplyPay.cshtml +++ b/FO/Views/Course/ApplyPay.cshtml @@ -96,7 +96,8 @@ - @if (Model.PPLog.cshape != 2) { + @if (Model.PPLog.cshape != 2) + {

교육비 환급대상자의 입금방법(중요)

■ 카드결제 시
@@ -114,6 +115,14 @@

} +

결제 시 주의사항

+

+ - 개인카드 결제 시 법인으로 증빙서류 발급이 되지 않습니다.
+ - 계산서 발급을 원하시는 경우 반드시 업체로 신청해주세요.
+ - 카드결제의 경우 계산서 발급이 불가능하며 카드 영수증이 발행 됩니다.
+ - 교육신청이 완료된 이후 에는 결제방식 변경이 불가능 하므로 다시 한번 확인해 주세요.
+

+

결제방법(신용카드 선택 시 계산서 발급불가)

    @if (Model.CM.infee > 0) @@ -128,7 +137,7 @@
+ + - - @Html.HiddenFor(m => m.payno) - @Html.HiddenFor(m => m.exno) - @Html.Hidden("pplno", Model.PPLog.pplno) - - - + + @Html.HiddenFor(m => m.payno) + @Html.HiddenFor(m => m.exno) + @Html.Hidden("pplno", Model.PPLog.pplno) + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + @section scriptsHeader{