diff --git a/Base/Controller/FCommonMy.cs b/Base/Controller/FCommonMy.cs index 8d77df2..6f31f13 100644 --- a/Base/Controller/FCommonMy.cs +++ b/Base/Controller/FCommonMy.cs @@ -119,7 +119,7 @@ namespace NP.Base.Controllers return JsonOK(check * -1); } LogSet(new ActLog() { logtype = 30, logtarget = 21, logdata = u.username, userno = u.userno, uno = SUserInfo.UserNo, uip = GetUserIP() }); - u.savefrontbuy = 1; + u.savefrontbuy = 1; var result = Dao.Save("users.up", u); if (result > 0) { diff --git a/Dao/MyBatis/Maps/User.xml b/Dao/MyBatis/Maps/User.xml index f1cc79d..ff4a152 100644 --- a/Dao/MyBatis/Maps/User.xml +++ b/Dao/MyBatis/Maps/User.xml @@ -238,7 +238,7 @@ ,case when c.refcode='9' then a.ccpositionetc else c.cname end ccpositionname ,case when a.usertype=1 then '교육생' when d.authname is null then '-' else d.authname end usertypestr ,CAST(AES_DECRYPT(UNHEX(a.birthday), ) AS char) birthday - ,a.uduty,a.slevel,a.isacceptmobile,a.vssn,a.ischkatt + ,a.uduty,a.slevel,a.isacceptmobile,a.vssn,a.ischkatt,a.authPlatform ,row_number() over(order by $orderby$a.username) rno ,count(a.cdt) over() pagetotalcount from users a @@ -303,13 +303,13 @@ ,asno,pasname,depart,ccposition,ccpositionetc,fgnoprofile,ccjobs ,userpno,bankname,bankno ,post,address1,address2,introhtml,status,logintime,send335time,pwcalltime,pwcallno,eastereggkey,eetime,kfcfyear,isassignuser,edus - ,isacceptmobile,uduty,slevel,jointype,birthday,snsid,di,ci,vssn,ischkatt,) + ,isacceptmobile,uduty,slevel,jointype,birthday,snsid,di,ci,vssn,ischkatt,authPlatform,) values (#usertype#,#userkind#,#userid#,#userpass#,#username#,#usernameeng# ,gender,HEX(AES_ENCRYPT(#email#, )),#isacceptemail#,HEX(AES_ENCRYPT(#mobile#, )),HEX(AES_ENCRYPT(#telno#, )) ,#asno#,#pasname#,#depart#,#ccposition#,#ccpositionetc#,#fgnoprofile#,#ccjobs# ,HEX(AES_ENCRYPT(#userpno#, )),#bankname#,HEX(AES_ENCRYPT(#bankno#, )) ,#post#,#address1#,#address2#,#introhtml#,#status#,,null,null,null,null,null,#kfcfyear#,#isassignuser#,#edus# - ,#isacceptmobile#,#uduty#,#slevel#,#jointype#,HEX(AES_ENCRYPT(#birthday#, )),#snsid#,#di#,#ci#,#vssn#,#ischkatt#,); + ,#isacceptmobile#,#uduty#,#slevel#,#jointype#,HEX(AES_ENCRYPT(#birthday#, )),#snsid#,#di#,#ci#,#vssn#,#ischkatt#,#authPlatform#,); SELECT LAST_INSERT_ID() @@ -335,22 +335,23 @@ ,userpno =case when #userpno# is not null then HEX(AES_ENCRYPT(#userpno#, )) else null end ,bankname =case when #bankname# is not null then #bankname# else bankname end ,bankno =case when #bankno# is not null then HEX(AES_ENCRYPT(#bankno#, )) else bankno end - ,post =case when #post# is not null then #post# else post end - ,address1 =case when #address1# is not null then #address1# else address1 end - ,address2 =case when #address2# is not null then #address2# else address2 end - ,introhtml =case when #introhtml# is not null then #introhtml# else introhtml end - ,isacceptmobile = #isacceptmobile# - ,uduty = #uduty# - ,slevel = #slevel# - ,jointype =case when #jointype# is not null then #jointype# else jointype end - ,isassignuser = #isassignuser# - ,birthday = case when #birthday# is not null then HEX(AES_ENCRYPT(#birthday#, )) else birthday end + ,post =case when #post# is not null then #post# else post end + ,address1 =case when #address1# is not null then #address1# else address1 end + ,address2 =case when #address2# is not null then #address2# else address2 end + ,introhtml =case when #introhtml# is not null then #introhtml# else introhtml end + ,isacceptmobile = #isacceptmobile# + ,uduty = #uduty# + ,slevel = #slevel# + ,jointype =case when #jointype# is not null then #jointype# else jointype end + ,isassignuser = #isassignuser# + ,birthday = case when #birthday# is not null then HEX(AES_ENCRYPT(#birthday#, )) else birthday end ,kfcfyear =case when #kfcfyear# is not null then #kfcfyear# else kfcfyear end ,isassignuser =#isassignuser#,kfcfyear =#kfcfyear#,edus=#edus# ,status =case when #status# > 0 then #status# else status end ,ischkatt = #ischkatt# + ,authPlatform = case when #authPlatform# > 0 then #authPlatform# else authPlatform end where userno=#userno# diff --git a/FO/Controllers/AccountController.cs b/FO/Controllers/AccountController.cs index 88e6e44..c8b844f 100644 --- a/FO/Controllers/AccountController.cs +++ b/FO/Controllers/AccountController.cs @@ -13,6 +13,7 @@ using Newtonsoft.Json; using OkCert3Com; using XPayClientNet; +using NP.Model.ENUM; namespace NP.FO.Controllers { @@ -68,6 +69,7 @@ namespace NP.FO.Controllers if (Url.IsLocalUrl(returnUrl)){return Redirect(returnUrl);} else {return RedirectToAction(nameof(HomeController.Index), "Home");} } + [HttpPost] public ActionResult Join(VMUser vm) { //if ("Y".Equals(GetConfig("usessl")) && !Request.IsSecureConnection) @@ -75,11 +77,12 @@ namespace NP.FO.Controllers // return Redirect("https://" + Request.Url.Host + Request.Url.PathAndQuery); //} //else - //{ - if(vm.User == null) + //{ + if(string.IsNullOrEmpty(vm.User.username) || string.IsNullOrEmpty(vm.User.ci) || string.IsNullOrEmpty(vm.User.di) || vm.User.authPlatform == AuthPlatform.None) { - vm.User = new Users() { }; + return Redirect("/Account/JoinIdVeri"); } + ViewBag.JoinOK = false; if (GetInt(Request["intval"]) == 1) { diff --git a/FO/Views/Account/CertOk3IPIN.cshtml b/FO/Views/Account/CertOk3IPIN.cshtml index 8003d2b..7c34f98 100644 --- a/FO/Views/Account/CertOk3IPIN.cshtml +++ b/FO/Views/Account/CertOk3IPIN.cshtml @@ -1,4 +1,5 @@ -@{ +@using NP.Model.ENUM +@{ Layout = null; var CP_CD = (ViewBag.result ?? "").Split(':')[0]; var TX_SEQ_NO = (ViewBag.result ?? "").Split(':')[1]; @@ -29,6 +30,7 @@ $(opener.document).find("#mform").find("#User_di").val("@(DI)"); $(opener.document).find("#mform").find("#User_ci").val("@(CI)"); $(opener.document).find("#mform").find("#User_jointype").val(0); + $(opener.document).find("#mform").find("#User_authPlatform").val("@(AuthPlatform.IPIN.GetHashCode().GetHashCode())"); $(opener.document).find("#mform").attr("action", "/Account/Join"); $(opener.document).find("#mform").submit(); self.close(); diff --git a/FO/Views/Account/CertOk3MOBI.cshtml b/FO/Views/Account/CertOk3MOBI.cshtml index 0b37080..45a430b 100644 --- a/FO/Views/Account/CertOk3MOBI.cshtml +++ b/FO/Views/Account/CertOk3MOBI.cshtml @@ -1,4 +1,5 @@ -@{ +@using NP.Model.ENUM +@{ Layout = null; var CP_CD = (ViewBag.result ?? "").Split(':')[0]; var TX_SEQ_NO = (ViewBag.result ?? "").Split(':')[1]; @@ -31,6 +32,7 @@ $(opener.document).find("#mform").find("#User_ci").val("@(CI)"); $(opener.document).find("#mform").find("#intval2").val(1); $(opener.document).find("#mform").find("#User_jointype").val(0); + $(opener.document).find("#mform").find("#User_authPlatform").val("@(AuthPlatform.Mobile.GetHashCode())"); $(opener.document).find("#mform").attr("action", "/Account/Join"); $(opener.document).find("#mform").submit(); self.close(); diff --git a/FO/Views/Account/Join.cshtml b/FO/Views/Account/Join.cshtml index 9211b62..78278bb 100644 --- a/FO/Views/Account/Join.cshtml +++ b/FO/Views/Account/Join.cshtml @@ -1,4 +1,5 @@ -@model NP.Model.VMUser +@using NP.Model.ENUM +@model NP.Model.VMUser @{ var menus = (List)ViewBag.Menus; var em = new NP.Model.MenuPage(); @@ -49,6 +50,7 @@ else @Html.HiddenFor(w => w.intval2) @*가입유형 0:일반회원가입,1:google,2:naver,3:카카오*@ @Html.HiddenFor(w => w.User.jointype) + @Html.HiddenFor(w => w.User.authPlatform) @Html.HiddenFor(w => w.IsSaveOK) @@ -57,11 +59,25 @@ else +

  • ※아래 기재사항은 필수 입니다 빈칸 없이 기재해주세요.

    • +
  • + @if (Model.User.authPlatform == AuthPlatform.IPIN) + { +

    ※[i-PIN 인증] 으로 본인인증을 하였습니다. 학습 시 본인인증도 [i-PIN 인증]으로 본인인증을 진행합니다.

    + } + else if (Model.User.authPlatform == AuthPlatform.Mobile) + { +

    ※[휴대폰 본인인증] 으로 본인인증을 하였습니다. 학습 시 본인인증도 [i-PIN 인증]으로 본인인증을 진행합니다.

    + } +
    • +
  • +

    ※학습 본인인증 수단은 회원가입 후 회원정보수정에서 변경 가능합니다.

    +
  • diff --git a/FO/Views/Account/JoinIdVeri.cshtml b/FO/Views/Account/JoinIdVeri.cshtml index 1e38c4d..4ef9d23 100644 --- a/FO/Views/Account/JoinIdVeri.cshtml +++ b/FO/Views/Account/JoinIdVeri.cshtml @@ -15,6 +15,7 @@ @Html.HiddenFor(w=>w.User.ci) @Html.HiddenFor(w=>w.intval2) @Html.HiddenFor(w=>w.User.jointype) + @Html.HiddenFor(w=>w.User.authPlatform)
    @@ -39,4 +40,4 @@
    *@
    @Html.Partial("./Partial/OkCert3", null, new ViewDataDictionary { }) -

    본인 인증 시 제공되는 정보는 해당 인증기관에서 직접 수집하며, 인증 이외의 용도로 이용 또는 저장하지 않습니다.

    \ No newline at end of file +

    본인 인증 시 제공되는 정보는 해당 인증기관에서 직접 수집하며, 인증 이외의 용도로 이용 또는 저장하지 않습니다.

    \ No newline at end of file diff --git a/Model/ENUM.cs b/Model/ENUM.cs index a47da44..11a6580 100644 --- a/Model/ENUM.cs +++ b/Model/ENUM.cs @@ -92,4 +92,23 @@ namespace NP.Model.ENUM VocaSeq, StringList, } + + /// + /// 인증플랫폼 + /// + public enum AuthPlatform + { + /// + /// 없음 + /// + None, + /// + /// I-PIN 인증 + /// + IPIN, + /// + /// 핸드폰 본인인증 + /// + Mobile + } } diff --git a/Model/Users.cs b/Model/Users.cs index 2df9f07..a99713c 100644 --- a/Model/Users.cs +++ b/Model/Users.cs @@ -1,7 +1,8 @@ -using System; +using NP.Model.ENUM; +using System; using System.CodeDom; using System.Collections.Generic; -using System.Text; +using System.Text; namespace NP.Model { [Serializable] @@ -252,6 +253,7 @@ namespace NP.Model public String ci { get; set; } public String vssn { get; set; } public int ischkatt { get; set; } + public AuthPlatform authPlatform { get; set; } } ///